diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-08-05 11:46:23 +0200 |
|---|---|---|
| committer | Paul Holzinger <pholzing@redhat.com> | 2022-09-05 13:13:40 +0200 |
| commit | 9576179b51ba7e0e33f5eee798fee40b433ca978 (patch) | |
| tree | bcf00507a4fd218b3eadcf50dd51aabcb6699e46 /test/200-bridge-firewalld.bats | |
| parent | b136b047e90c2d9811ced2da8b83a487e06c8604 (diff) | |
rework aardvark setup
The driver already has all information so the aardvark code should not
have to pass it again. This simplifies the code and creates smaller
aardvark config files since it does not duplicate the contianer id and
names just to set more then one ip.
This does not touch the aardvark teardown logic.
Requires https://github.com/containers/aardvark-dns/pull/183
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'test/200-bridge-firewalld.bats')
| -rw-r--r-- | test/200-bridge-firewalld.bats | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/200-bridge-firewalld.bats b/test/200-bridge-firewalld.bats index 3a638f2..cc410dc 100644 --- a/test/200-bridge-firewalld.bats +++ b/test/200-bridge-firewalld.bats @@ -164,9 +164,8 @@ function teardown() { # check aardvark config and running run_helper cat "$NETAVARK_TMPDIR/config/aardvark-dns/podman1" assert "${lines[0]}" =~ "10.89.3.1,fd10:88:a::1" "aardvark set to listen to all IPs" - assert "${lines[1]}" =~ "[0-9a-f]* 10.89.3.2 somename" "aardvark config's container ipv4" - assert "${lines[2]}" =~ "[0-9a-f]* fd10:88:a::2 somename" "aardvark config's container ipv6" - assert "${#lines[@]}" = 3 "too many liness in aardvark config" + assert "${lines[1]}" =~ "^[0-9a-f]{64} 10.89.3.2 fd10:88:a::2 somename$" "aardvark config's container" + assert "${#lines[@]}" = 2 "too many lines in aardvark config" aardvark_pid=$(cat "$NETAVARK_TMPDIR/config/aardvark-dns/aardvark.pid") assert "$ardvark_pid" =~ "[0-9]*" "aardvark pid not found" |