From 2919c23fde0b1f101250eaed0a2b6499fdada8b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Walstr=C3=B6m?= Date: Sat, 15 Jun 2024 22:32:17 +0200 Subject: [PATCH] tests: containers: Adapt tests to work with restconf Move the web port used in containers from 80 -> 91 this to not collide with nginx which is required for restconf. --- test/case/infix_containers/container_basic.py | 3 ++- test/case/infix_containers/container_bridge.py | 3 ++- test/case/infix_containers/container_phys.py | 3 ++- test/case/infix_containers/container_veth.py | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/case/infix_containers/container_basic.py b/test/case/infix_containers/container_basic.py index 5c0fbcd3..4de99377 100755 --- a/test/case/infix_containers/container_basic.py +++ b/test/case/infix_containers/container_basic.py @@ -11,7 +11,7 @@ import infamy from infamy.util import until def _verify(server): - url = infamy.Furl(f"http://[{server}]/index.html") + url = infamy.Furl(f"http://[{server}]:91/index.html") return url.check("It works") with infamy.Test() as test: @@ -29,6 +29,7 @@ with infamy.Test() as test: { "name": f"{NAME}", "image": f"oci-archive:{infamy.Container.IMAGE}", + "command": "/usr/sbin/httpd -f -v -p 91", "network": { "host": True } diff --git a/test/case/infix_containers/container_bridge.py b/test/case/infix_containers/container_bridge.py index cc4febc0..473f5419 100755 --- a/test/case/infix_containers/container_bridge.py +++ b/test/case/infix_containers/container_bridge.py @@ -56,6 +56,7 @@ with infamy.Test() as test: { "name": f"{NAME}", "image": f"oci-archive:{infamy.Container.IMAGE}", + "command": "/usr/sbin/httpd -f -v -p 91", "mount": [ { "name": "index.html", @@ -67,7 +68,7 @@ with infamy.Test() as test: "interface": [ { "name": "docker0" } ], - "publish": [ "8080:80" ] + "publish": [ "8080:91" ] } } ] diff --git a/test/case/infix_containers/container_phys.py b/test/case/infix_containers/container_phys.py index 6be93934..852379ce 100755 --- a/test/case/infix_containers/container_phys.py +++ b/test/case/infix_containers/container_phys.py @@ -13,7 +13,7 @@ with infamy.Test() as test: IMAGE = "curios-httpd-edge.tar.gz" DUTIP = "10.0.0.2" OURIP = "10.0.0.1" - URL = f"http://{DUTIP}/index.html" + URL = f"http://{DUTIP}:91/index.html" with test.step("Initialize"): env = infamy.Env(infamy.std_topology("1x2")) @@ -44,6 +44,7 @@ with infamy.Test() as test: { "name": f"{NAME}", "image": f"oci-archive:{infamy.Container.IMAGE}", + "command": "/usr/sbin/httpd -f -v -p 91", "network": { "interface": [ { "name": f"{ifname}" } diff --git a/test/case/infix_containers/container_veth.py b/test/case/infix_containers/container_veth.py index b7a9860f..20efca4b 100755 --- a/test/case/infix_containers/container_veth.py +++ b/test/case/infix_containers/container_veth.py @@ -13,7 +13,7 @@ with infamy.Test() as test: IMAGE = "curios-httpd-edge.tar.gz" DUTIP = "10.0.0.2" OURIP = "10.0.0.1" - URL = f"http://{DUTIP}/index.html" + URL = f"http://{DUTIP}:91/index.html" with test.step("Initialize"): env = infamy.Env(infamy.std_topology("1x2")) @@ -67,6 +67,7 @@ with infamy.Test() as test: { "name": f"{NAME}", "image": f"oci-archive:{infamy.Container.IMAGE}", + "command": "/usr/sbin/httpd -f -v -p 91", "network": { "interface": [ { "name": f"{NAME}" }