scripts updated

open-traffic-generator · Jan 30, 2024 · 4f75e71 · 4f75e71
1 parent 227221c
commit 4f75e71
Show file tree

Hide file tree

Showing 15 changed files with 595 additions and 156 deletions.
diff --git a/tests/out.log b/tests/out.log
diff --git a/tests/py/default/test_b2b_default_config.py b/tests/py/default/test_b2b_default_config.py
diff --git a/tests/py/default/test_liveness_custom_config.py b/tests/py/default/test_liveness_custom_config.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_liveness_custom_config():
     """
     Deploy b2b kne topology with default version,
@@ -13,11 +13,11 @@ def test_liveness_custom_config():
     - custom liveness parameters for protocol engines
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'ixia_c_default_config.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     container_extensions = [
         '-protocol-engine',
@@ -36,8 +36,6 @@ def test_liveness_custom_config():
         utils.check_liveness_data('gnmi', expected_pods[0], namespace1, False)
         utils.check_liveness_data(expected_pods[1]+container_extensions[0], expected_pods[1], namespace1, True, 12, 10, 6)
         utils.check_liveness_data(expected_pods[1]+container_extensions[1], expected_pods[1], namespace1, True, 1, 5, 6)
-        utils.check_liveness_data(expected_pods[2]+container_extensions[0], expected_pods[2], namespace1, True, 12, 10, 6)
-        utils.check_liveness_data(expected_pods[2]+container_extensions[1], expected_pods[2], namespace1, True, 1, 5, 6)
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
         print("[Namespace:{}]Deleting KNE topology".format(
@@ -46,6 +44,7 @@ def test_liveness_custom_config():
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
+        utils.reset_configmap()
 
     finally:
         utils.delete_kne_config(namespace1_config, namespace1)

diff --git a/tests/py/default/test_liveness_default_config.py b/tests/py/default/test_liveness_default_config.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_liveness_default_config():
     """
     Deploy b2b kne topology with default version,
@@ -14,22 +14,20 @@ def test_liveness_default_config():
     - no flakiness for default deployment of all components
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'ixia_c_default_config.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     container_extensions = [
         '-protocol-engine',
         '-traffic-engine'
     ]
-    lic_path = 'docker-local-athena.artifactory.it.keysight.com/keng-license-server'
-    lic_tag = '0.0.1-32'
-    count = 30
+    count = 3
     try:
         op_rscount = utils.get_operator_restart_count()
-        utils.load_license_configmap("", lic_path, lic_tag)
+
         for iter in range(count):
             print("Iteration: {}".format(iter))
             print("[Namespace:{}]Deploying KNE topology".format(
@@ -42,8 +40,6 @@ def test_liveness_default_config():
             utils.check_liveness_data('license-server', expected_pods[0], namespace1, True, 1, 10, 6)
             utils.check_liveness_data(expected_pods[1]+container_extensions[0], expected_pods[1], namespace1, True, 1, 10, 6)
             utils.check_liveness_data(expected_pods[1]+container_extensions[1], expected_pods[1], namespace1, True, 1, 10, 6)
-            utils.check_liveness_data(expected_pods[2]+container_extensions[0], expected_pods[2], namespace1, True, 1, 10, 6)
-            utils.check_liveness_data(expected_pods[2]+container_extensions[1], expected_pods[2], namespace1, True, 1, 10, 6)
             op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
             print("[Namespace:{}]Deleting KNE topology".format(
@@ -59,7 +55,6 @@ def test_liveness_default_config():
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
     finally:
-        utils.reset_configmap()
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
 

diff --git a/tests/py/default/test_liveness_disabled_config.py b/tests/py/default/test_liveness_disabled_config.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_liveness_disabled_config():
     """
     Deploy b2b kne topology with default version,
@@ -13,11 +13,11 @@ def test_liveness_disabled_config():
     - disabled liveness parameters for protocol engines
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'ixia_c_default_config.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     container_extension = '-traffic-engine'
     probe_params = {'traffic-engine':{'liveness-enable': False}}
@@ -30,7 +30,6 @@ def test_liveness_disabled_config():
         utils.create_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, expected_pods)
         utils.check_liveness_data(expected_pods[1]+container_extension, expected_pods[1], namespace1, False)
-        utils.check_liveness_data(expected_pods[2]+container_extension, expected_pods[2], namespace1, False)
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
         print("[Namespace:{}]Deleting KNE topology".format(
@@ -39,6 +38,7 @@ def test_liveness_disabled_config():
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
+        utils.reset_configmap()
 
     finally:
         utils.delete_kne_config(namespace1_config, namespace1)

diff --git a/tests/py/default/test_min_resource_custom_config.py b/tests/py/default/test_min_resource_custom_config.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_min_resource_custom_config():
     """
     Deploy b2b kne topology with default version,
@@ -13,11 +13,11 @@ def test_min_resource_custom_config():
     - default minimum resource for all components
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'ixia_c_default_config.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     container_extensions = [
         '-protocol-engine',
@@ -36,8 +36,6 @@ def test_min_resource_custom_config():
         utils.check_min_resource_data('gnmi', expected_pods[0], namespace1, '90Mi', '70m')
         utils.check_min_resource_data(expected_pods[1]+container_extensions[0], expected_pods[1], namespace1, '50Mi', '300m')
         utils.check_min_resource_data(expected_pods[1]+container_extensions[1], expected_pods[1], namespace1, '170Mi', '50m')
-        utils.check_min_resource_data(expected_pods[2]+container_extensions[0], expected_pods[2], namespace1, '50Mi', '300m')
-        utils.check_min_resource_data(expected_pods[2]+container_extensions[1], expected_pods[2], namespace1, '170Mi', '50m')
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
         print("[Namespace:{}]Deleting KNE topology".format(
@@ -46,6 +44,7 @@ def test_min_resource_custom_config():
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
+        utils.reset_configmap()
 
     finally:
         utils.delete_kne_config(namespace1_config, namespace1)

diff --git a/tests/py/default/test_min_resource_default_config.py b/tests/py/default/test_min_resource_default_config.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_min_resource_default_config():
     """
     Deploy b2b kne topology with default version,
@@ -13,11 +13,11 @@ def test_min_resource_default_config():
     - default minimum resource for all components
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'ixia_c_default_config.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     container_extensions = [
         '-protocol-engine',
@@ -34,8 +34,6 @@ def test_min_resource_default_config():
         utils.check_min_resource_data('gnmi', expected_pods[0], namespace1, '15Mi', '10m')
         utils.check_min_resource_data(expected_pods[1]+container_extensions[0], expected_pods[1], namespace1, '350Mi', '200m')
         utils.check_min_resource_data(expected_pods[1]+container_extensions[1], expected_pods[1], namespace1, '60Mi', '200m')
-        utils.check_min_resource_data(expected_pods[2]+container_extensions[0], expected_pods[2], namespace1, '350Mi', '200m')
-        utils.check_min_resource_data(expected_pods[2]+container_extensions[1], expected_pods[2], namespace1, '60Mi', '200m')
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
 
         print("[Namespace:{}]Deleting KNE topology".format(

diff --git a/tests/py/lag/test_lag_min_resource.py b/tests/py/lag/test_lag_min_resource.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_lag_min_resource():
     """
     Deploy lag kne topology,

diff --git a/tests/py/lag/test_lag_single_namespace.py b/tests/py/lag/test_lag_single_namespace.py
@@ -2,7 +2,7 @@
 import pytest
 from deepdiff import DeepDiff
 
-
+@pytest.mark.sanity
 def test_lag_single_namespace():
     """
     Deploy lag kne topology,

diff --git a/tests/py/lag/test_two_lag_single_namespace.py b/tests/py/lag/test_two_lag_single_namespace.py
@@ -2,7 +2,7 @@
 import pytest
 from deepdiff import DeepDiff
 
-
+@pytest.mark.sanity
 def test_two_lag_single_namespace():
     """
     Deploy two lag kne topology,

diff --git a/tests/py/mislaneous/test_args_cmd_env_override.py b/tests/py/mislaneous/test_args_cmd_env_override.py
@@ -1,7 +1,7 @@
 import pytest
 import utils
 
-
+@pytest.mark.sanity
 def test_args_cmd_env_override():
     """
     Deploy b2b kne topology with default version, but custom args, cmd and env
@@ -14,19 +14,18 @@ def test_args_cmd_env_override():
     - individual pod description
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'b2b_ixia_c_namespace.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_svcs = [
-        'service-https-otg-controller',
         'service-gnmi-otg-controller',
         'service-grpc-otg-controller',
         'service-otg-port-eth1',
-        'service-otg-port-eth2'
+        'service-arista1',
     ]
 
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     try:
         op_rscount = utils.get_operator_restart_count()
@@ -48,9 +47,7 @@ def test_args_cmd_env_override():
         utils.ixia_c_services_ok(namespace1, [])
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
         utils.reset_configmap()
-        return
     finally:
-        print("Done")
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
         utils.ixia_c_services_ok(namespace1, [])

diff --git a/tests/py/mislaneous/test_init_container.py b/tests/py/mislaneous/test_init_container.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_init_container():
     """
     Deploy neg-vm kne topology,
@@ -14,11 +14,11 @@ def test_init_container():
     - operator pod health
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'b2b_ixia_c_namespace.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
     try:
         op_rscount = utils.get_operator_restart_count()
@@ -36,7 +36,7 @@ def test_init_container():
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])
         op_rscount = utils.ixia_c_operator_ok(op_rscount)
-
+        utils.reset_configmap()
     finally:
         utils.delete_kne_config(namespace1_config, namespace1)
         utils.ixia_c_pods_ok(namespace1, [])

diff --git a/tests/py/performance/test_create_delete_ixia_c_performance.py b/tests/py/performance/test_create_delete_ixia_c_performance.py
@@ -2,7 +2,7 @@
 import utils
 import time
 
-
+@pytest.mark.sanity
 def test_create_delete_ixia_c_performance():
     """
     Deploy one arm kne topology,
@@ -20,19 +20,18 @@ def test_create_delete_ixia_c_performance():
     - operator pod health
     """
     namespace1 = 'ixia-c'
-    namespace1_config = 'b2b_ixia_c_namespace.txt'
+    namespace1_config = 'ixia_c_pd_topology.yaml'
     expected_svcs = [
-        'service-http-otg-controller',
         'service-gnmi-otg-controller',
         'service-grpc-otg-controller',
         'service-otg-port-eth1',
-        'service-otg-port-eth2'
+        'service-arista1'
     ]
 
     expected_pods = [
         'otg-controller',
         'otg-port-eth1',
-        'otg-port-eth2'
+        'arista1'
     ]
 
     ixia_c_pod_exp_creation_time = 25