host_no_sdn_controller: do not fail, but reconfigure the host.

when a 'no-sdn-controller' host is required (for test_vif_allowed_ip.py for example),
do not fail if sdn-controller is active, but disable it for the test (and restore it after).

we get the sdn-controller configuration to reapply it after the test, and reconfigure the ovs bridges to accept
both OpenFlow10 and OpenFlow11 versions. OpenFlow11 is usual used for sdn-controller (xapi-plugin) and OpenFlow10
for allowed-ip (see xen-api ocaml/xenopsd/scripts/setup-vif-rules).

Signed-off-by: Sebastien Rodot <sebastien.rodot@vates.tech>

Author: semarie

tests/network/conftest.py

@@ -5,18 +5,55 @@
 import logging
 
 from data import HOST_FREE_NICS
-from lib.common import PackageManagerEnum
+from lib.common import PackageManagerEnum, safe_split
 from lib.host import Host
 from lib.network import Network
 from lib.vm import VM
 
 from typing import Generator
 
 @pytest.fixture(scope='package')
-def host_no_sdn_controller(host: Host) -> None:
+def host_no_sdn_controller(host: Host) -> Generator[Host, None, None]:
     """ An XCP-ng with no SDN controller. """
-    if host.xe('sdn-controller-list', minimal=True):
-        pytest.fail("This test requires an XCP-ng with no SDN controller")
+    sdn_configured = []
+
+    uuids = safe_split(host.xe('sdn-controller-list', minimal=True), ',')
+    if len(uuids) > 0:
+        for uuid in uuids:
+            logging.info(f"Forgetting sdn-controller: {uuid}")
+
+            sdn_configured.append({
+                'protocol': host.xe('sdn-controller-param-get', {'uuid': uuid, 'param-name': 'protocol'}),
+                'address': host.xe('sdn-controller-param-get', {'uuid': uuid, 'param-name': 'address'}),
+                'port': host.xe('sdn-controller-param-get', {'uuid': uuid, 'param-name': 'port'}),
+            })
+
+            host.xe('sdn-controller-forget', {'uuid': uuid})
+
+        # when using sdn-controller, we are usually using OpenFlow11 only
+        # but allow-id is using OpenFlow10 and it fails to sets rules if OpenFlow11 is enabled only.
+        host.ssh("ovs-vsctl list-br "
+                 "| xargs -n1 -d '\n' -r -I{} ovs-vsctl add bridge {} protocols OpenFlow10")
+
+    assert len(safe_split(host.xe('sdn-controller-list', minimal=True), ',')) == 0
+
+    yield host
+
+    if len(uuids) > 0:
+        host.ssh("ovs-vsctl list-br "
+                 "| xargs -n1 -d '\n' -r -I{} ovs-vsctl remove bridge {} protocols OpenFlow10")
+
+    for cfg in sdn_configured:
+        args: dict[str, str | bool | dict[str, str]] = {}
+        if cfg.get('protocol') is not None:
+            args['protocol'] = cfg.get('protocol', '')
+        if cfg.get('address') is not None:
+            args['address'] = cfg.get('address', '')
+        if cfg.get('port') is not None:
+            args['tcp-port'] = cfg.get('port', '0')
+
+        logging.info("Re-introducing sdn-controller")
+        host.xe('sdn-controller-introduce', args)
 
 # a clone of imported_vm in which we've added tcpdump
 # not to be used by tests directly