From e18ddcf0c88c1639bd46cdc5a89833c4665b9152 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 8 Apr 2024 23:55:34 +0200
Subject: [PATCH] test: disable web server for container tests

The container tests utilize the bundled curios-httpd, which clashes with
the new web services provided by nginx.  So we need to disable it while
testing all the containers.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 test/case/infix_containers/container_basic.py  | 5 +++++
 test/case/infix_containers/container_bridge.py | 5 +++++
 test/case/infix_containers/container_phys.py   | 5 +++++
 test/case/infix_containers/container_veth.py   | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/test/case/infix_containers/container_basic.py b/test/case/infix_containers/container_basic.py
index 10dff28b..60256181 100755
--- a/test/case/infix_containers/container_basic.py
+++ b/test/case/infix_containers/container_basic.py
@@ -23,6 +23,11 @@ with infamy.Test() as test:
         addr = target.address()
 
     with test.step(f"Create {NAME} container from bundled OCI image"):
+        target.put_config_dict("infix-services", {
+            "web": {
+                "enabled": False
+            }
+        })
         target.put_config_dict("infix-containers", {
             "containers": {
                 "container": [
diff --git a/test/case/infix_containers/container_bridge.py b/test/case/infix_containers/container_bridge.py
index 3b8553d5..9e7f95b8 100755
--- a/test/case/infix_containers/container_bridge.py
+++ b/test/case/infix_containers/container_bridge.py
@@ -25,6 +25,11 @@ with infamy.Test() as test:
         _, ifname = env.ltop.xlate("target", "data")
         enc = base64.b64encode(BODY.encode('utf-8'))
 
+        target.put_config_dict("infix-services", {
+            "web": {
+                "enabled": False
+            }
+        })
         target.put_config_dict("ietf-interfaces", {
             "interfaces": {
                 "interface": [
diff --git a/test/case/infix_containers/container_phys.py b/test/case/infix_containers/container_phys.py
index 1d9051cf..51794b35 100755
--- a/test/case/infix_containers/container_phys.py
+++ b/test/case/infix_containers/container_phys.py
@@ -22,6 +22,11 @@ with infamy.Test() as test:
     with test.step(f"Create {NAME} container from bundled OCI image"):
         _, ifname = env.ltop.xlate("target", "data")
 
+        target.put_config_dict("infix-services", {
+            "web": {
+                "enabled": False
+            }
+        })
         target.put_config_dict("ietf-interfaces", {
             "interfaces": {
                 "interface": [
diff --git a/test/case/infix_containers/container_veth.py b/test/case/infix_containers/container_veth.py
index 930c5b92..7f24143b 100755
--- a/test/case/infix_containers/container_veth.py
+++ b/test/case/infix_containers/container_veth.py
@@ -22,6 +22,11 @@ with infamy.Test() as test:
     with test.step(f"Create {NAME} container from bundled OCI image"):
         _, ifname = env.ltop.xlate("target", "data")
 
+        target.put_config_dict("infix-services", {
+            "web": {
+                "enabled": False
+            }
+        })
         target.put_config_dict("ietf-interfaces", {
             "interfaces": {
                 "interface": [