Add tests for pod startup times with multiple resources

tests/conftest.py

@@ -11,6 +11,8 @@
     DEFAULT_SERVICE,
     DEFAULT_DEPLOYMENT_TYPE,
     NUM_REPLICAS,
+    BATCH_START,
+    BATCH_RESOURCES,
 )
 from suite.resources_utils import get_first_pod_name
 
@@ -80,6 +82,18 @@ def pytest_addoption(parser) -> None:
         default="no",
         help="Show IC logs in stdout on test failure",
     )
+    parser.addoption(
+        "--batch-start",
+        action="store",
+        default=BATCH_START,
+        help="Run tests for pods restarts with multiple resources deployed (Ingress/VS): True/False",
+    )
+    parser.addoption(
+        "--batch-resources",
+        action="store",
+        default=BATCH_RESOURCES,
+        help="Number of VS/Ingress resources to deploy",
+    )
 
 
 # import fixtures into pytest global namespace
@@ -110,6 +124,11 @@ def pytest_collection_modifyitems(config, items) -> None:
         for item in items:
             if "appprotect" in item.keywords:
                 item.add_marker(appprotect)
+    if  str(config.getoption("--batch-start")) != "True":
+        batch_start = pytest.mark.skip(reason="Skipping pod restart test with multiple resources")
+        for item in items:
+            if "batch_start" in item.keywords:
+                item.add_marker(batch_start)
 
 
 @pytest.hookimpl(tryfirst=True, hookwrapper=True)

tests/data/appprotect/appprotect-ingress.yaml

@@ -3,13 +3,13 @@ kind: Ingress
 metadata:
   name: appprotect-ingress
   annotations:
-    kubernetes.io/ingress.class: "nginx"
     appprotect.f5.com/app-protect-policy: "test-namespace/example-policy"
     appprotect.f5.com/app-protect-enable: "True"
     appprotect.f5.com/app-protect-security-log-enable: "True"
     appprotect.f5.com/app-protect-security-log: "test-namespace/logconf"
     appprotect.f5.com/app-protect-security-log-destination: "syslog:server=<IP>:<PORT>"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - appprotect.example.com

tests/data/smoke/standard/smoke-ingress.yaml

@@ -2,9 +2,9 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   annotations:
-    kubernetes.io/ingress.class: "nginx"
   name: smoke-ingress
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - smoke.example.com

tests/settings.py

@@ -15,6 +15,9 @@
 ALLOWED_SERVICE_TYPES = ["nodeport", "loadbalancer"]
 DEFAULT_DEPLOYMENT_TYPE = "deployment"
 ALLOWED_DEPLOYMENT_TYPES = ["deployment", "daemon-set"]
+BATCH_START = "False"
+# Number of Ingress/VS resources to deploy based on BATCH_START value
+BATCH_RESOURCES = 1
 # Time in seconds to ensure reconfiguration changes in cluster
 RECONFIGURATION_DELAY = 3
 NGINX_API_VERSION = 4

tests/suite/resources_utils.py

@@ -197,7 +197,7 @@ def create_deployment_with_name(apps_v1_api: AppsV1Api, namespace, name) -> str:
         return create_deployment(apps_v1_api, namespace, dep)
 
 
-def scale_deployment(v1:CoreV1Api, apps_v1_api: AppsV1Api, name, namespace, value) -> int:
+def scale_deployment(v1: CoreV1Api, apps_v1_api: AppsV1Api, name, namespace, value) -> int:
     """
     Scale a deployment.
 
@@ -220,11 +220,9 @@ def scale_deployment(v1:CoreV1Api, apps_v1_api: AppsV1Api, name, namespace, valu
         print(f"All pods came up in {int(later-now)} seconds")
 
     elif value is 0:
-            replica_num = (apps_v1_api.read_namespaced_deployment_scale(name, namespace)).spec.replicas
-            while(replica_num is not None):
-                replica_num = (apps_v1_api.read_namespaced_deployment_scale(name, namespace)).spec.replicas
-                time.sleep(1)
-                print("Number of replicas is not 0, retrying...")
+            while get_pods_amount(v1, namespace) is not 0:
+                print(f"Number of replicas not 0, retrying...")
+                wait_before_test()
 
     else:
         pytest.fail("wrong argument")
@@ -262,13 +260,9 @@ def wait_until_all_pods_are_ready(v1: CoreV1Api, namespace) -> None:
     :return:
     """
     print("Start waiting for all pods in a namespace to be ContainersReady")
-    counter = 0
-    while not are_all_pods_in_ready_state(v1, namespace) and counter < 50:
-        print("There are pods that are not ContainerReady. Wait for 4 sec...")
-        time.sleep(4)
-        counter = counter + 1
-    if counter >= 50:
-        raise PodNotReadyException()
+    while not are_all_pods_in_ready_state(v1, namespace):
+        print("There are pods that are not ContainersReady. Wait for 1 sec...")
+        time.sleep(1)
     print("All pods are ContainersReady")
 
 

tests/suite/test_app_protect_integration.py

@@ -418,9 +418,6 @@ def test_ap_pod_startup(
         ns = ingress_controller_prerequisites.namespace
 
         scale_deployment(kube_apis.v1, kube_apis.apps_v1_api, "nginx-ingress", ns, 0)
-        while get_pods_amount(kube_apis.v1, ns) is not 0:
-            print(f"Number of replicas not 0, retrying...")
-            wait_before_test()
         num = scale_deployment(kube_apis.v1, kube_apis.apps_v1_api, "nginx-ingress", ns, 1)
         delete_items_from_yaml(kube_apis, src_ing_yaml, test_namespace)
         delete_items_from_yaml(kube_apis, src_syslog_yaml, test_namespace)