ovn-tester: Move tests into CMS plugin.

The test cases in `ovn-tester/tests` are all CMS specific. Now that we have CMS plugins, relocate the test code along with them. Signed-off-by: Frode Nordahl <[email protected]>
ovn-org · Sep 21, 2023 · bc24b19 · bc24b19
1 parent b67096a
commit bc24b19
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 3 deletions.
diff --git a/ovn-tester/tests/base_cluster_bringup.py → ..._kubernetes/tests/base_cluster_bringup.py b/ovn-tester/tests/base_cluster_bringup.py → ..._kubernetes/tests/base_cluster_bringup.py
diff --git a/ovn-tester/tests/cluster_density.py → ...s/ovn_kubernetes/tests/cluster_density.py b/ovn-tester/tests/cluster_density.py → ...s/ovn_kubernetes/tests/cluster_density.py
diff --git a/ovn-tester/tests/density_heavy.py → ...cms/ovn_kubernetes/tests/density_heavy.py b/ovn-tester/tests/density_heavy.py → ...cms/ovn_kubernetes/tests/density_heavy.py
diff --git a/ovn-tester/tests/density_light.py → ...cms/ovn_kubernetes/tests/density_light.py b/ovn-tester/tests/density_light.py → ...cms/ovn_kubernetes/tests/density_light.py
diff --git a/ovn-tester/tests/netpol.py → ...tester/cms/ovn_kubernetes/tests/netpol.py b/ovn-tester/tests/netpol.py → ...tester/cms/ovn_kubernetes/tests/netpol.py
diff --git a/ovn-tester/tests/netpol_cross_ns.py → ...s/ovn_kubernetes/tests/netpol_cross_ns.py b/ovn-tester/tests/netpol_cross_ns.py → ...s/ovn_kubernetes/tests/netpol_cross_ns.py
diff --git a/ovn-tester/tests/netpol_large.py → .../cms/ovn_kubernetes/tests/netpol_large.py b/ovn-tester/tests/netpol_large.py → .../cms/ovn_kubernetes/tests/netpol_large.py
@@ -1,4 +1,4 @@
-from tests.netpol import NetPol
+from cms.ovn_kubernetes.tests.netpol import NetPol
 
 
 class NetpolLarge(NetPol):

diff --git a/ovn-tester/tests/netpol_multitenant.py → ...vn_kubernetes/tests/netpol_multitenant.py b/ovn-tester/tests/netpol_multitenant.py → ...vn_kubernetes/tests/netpol_multitenant.py
diff --git a/ovn-tester/tests/netpol_small.py → .../cms/ovn_kubernetes/tests/netpol_small.py b/ovn-tester/tests/netpol_small.py → .../cms/ovn_kubernetes/tests/netpol_small.py
@@ -1,4 +1,4 @@
-from tests.netpol import NetPol
+from cms.ovn_kubernetes.tests.netpol import NetPol
 
 
 class NetpolSmall(NetPol):

diff --git a/ovn-tester/tests/service_route.py → ...cms/ovn_kubernetes/tests/service_route.py b/ovn-tester/tests/service_route.py → ...cms/ovn_kubernetes/tests/service_route.py
diff --git a/ovn-tester/ovn_tester.py b/ovn-tester/ovn_tester.py
@@ -173,7 +173,9 @@ def configure_tests(yaml, central_node, worker_nodes, global_cfg):
         if section in RESERVED:
             continue
 
-        mod = importlib.import_module(f'tests.{section}')
+        mod = importlib.import_module(
+            f'cms.{global_cfg.cms_name}.tests.{section}'
+        )
         class_name = ''.join(s.title() for s in section.split('_'))
         cls = getattr(mod, class_name)
         tests.append(cls(yaml, central_node, worker_nodes, global_cfg))