diff --git a/test/case/infix_containers/container_basic/test.py b/test/case/infix_containers/container_basic/test.py index d95059d7..4415a902 100755 --- a/test/case/infix_containers/container_basic/test.py +++ b/test/case/infix_containers/container_basic/test.py @@ -20,7 +20,7 @@ from infamy.util import until def _verify(server): - # Should really use mDNS here.... + # TODO: Should really use mDNS here.... url = infamy.Furl(f"http://[{server}]:91/index.html") return url.check("It works") @@ -49,7 +49,7 @@ with infamy.Test() as test: "container": [ { "name": f"{NAME}", - "image": f"oci-archive:{infamy.Container.IMAGE}", + "image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}", "command": "/usr/sbin/httpd -f -v -p 91", "network": { "host": True diff --git a/test/case/infix_containers/container_bridge/test.py b/test/case/infix_containers/container_bridge/test.py index ea4ebd37..2bf97aee 100755 --- a/test/case/infix_containers/container_bridge/test.py +++ b/test/case/infix_containers/container_bridge/test.py @@ -20,7 +20,6 @@ from infamy.util import until with infamy.Test() as test: NAME = "web-docker0" - IMAGE = "curios-httpd-edge.tar.gz" DUTIP = "10.0.0.2" OURIP = "10.0.0.1" BODY = "

Kilroy was here

" @@ -67,7 +66,7 @@ with infamy.Test() as test: "container": [ { "name": f"{NAME}", - "image": f"oci-archive:{infamy.Container.IMAGE}", + "image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}", "command": "/usr/sbin/httpd -f -v -p 91", "mount": [ { diff --git a/test/case/infix_containers/container_phys/test.py b/test/case/infix_containers/container_phys/test.py index 63001e54..08256649 100755 --- a/test/case/infix_containers/container_phys/test.py +++ b/test/case/infix_containers/container_phys/test.py @@ -15,7 +15,6 @@ from infamy.util import until with infamy.Test() as test: NAME = "web-phys" - IMAGE = "curios-httpd-edge.tar.gz" DUTIP = "10.0.0.2" OURIP = "10.0.0.1" URL = f"http://{DUTIP}:91/index.html" @@ -51,7 +50,7 @@ with infamy.Test() as test: "container": [ { "name": f"{NAME}", - "image": f"oci-archive:{infamy.Container.IMAGE}", + "image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}", "command": "/usr/sbin/httpd -f -v -p 91", "network": { "interface": [ diff --git a/test/case/infix_containers/container_veth/Readme.adoc b/test/case/infix_containers/container_veth/Readme.adoc index 8fb69568..57aea0e5 100644 --- a/test/case/infix_containers/container_veth/Readme.adoc +++ b/test/case/infix_containers/container_veth/Readme.adoc @@ -5,7 +5,7 @@ regular bridge, a VETH pair connects the container to the bridge. .... .-------------. .---------------. .--------. - | | tgt |---------| mgmt | | | web- | + | | mgmt |---------| mgmt | | | web- | | host | data |---------| data | target | | server | '-------------' '---------------' '--------' | / diff --git a/test/case/infix_containers/container_veth/test.py b/test/case/infix_containers/container_veth/test.py index 09600be8..f67319c1 100755 --- a/test/case/infix_containers/container_veth/test.py +++ b/test/case/infix_containers/container_veth/test.py @@ -11,7 +11,7 @@ regular bridge, a VETH pair connects the container to the bridge. .... .-------------. .---------------. .--------. - | | tgt |---------| mgmt | | | web- | + | | mgmt |---------| mgmt | | | web- | | host | data |---------| data | target | | server | '-------------' '---------------' '--------' | / @@ -26,7 +26,6 @@ from infamy.util import until with infamy.Test() as test: NAME = "web-br0-veth" - IMAGE = "curios-httpd-edge.tar.gz" DUTIP = "10.0.0.2" OURIP = "10.0.0.1" URL = f"http://{DUTIP}:91/index.html" @@ -85,7 +84,7 @@ with infamy.Test() as test: "container": [ { "name": f"{NAME}", - "image": f"oci-archive:{infamy.Container.IMAGE}", + "image": f"oci-archive:{infamy.Container.HTTPD_IMAGE}", "command": "/usr/sbin/httpd -f -v -p 91", "network": { "interface": [ diff --git a/test/infamy/container.py b/test/infamy/container.py index 21b7de89..e5a1e9a2 100644 --- a/test/infamy/container.py +++ b/test/infamy/container.py @@ -5,7 +5,7 @@ from infamy.util import warn class Container: """Helper methods""" - IMAGE = "curios-httpd-v24.05.0.tar.gz" + HTTPD_IMAGE = "curios-httpd-v24.05.0.tar.gz" def __init__(self, target): self.system = target