2 files changed, 35 insertions, 10 deletions
diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py
index 73f298c..f137adb 100644
--- a/src/onaptests/steps/onboard/cds.py
+++ b/src/onaptests/steps/onboard/cds.py
@@ -3,6 +3,7 @@
 
 from abc import ABC
 from pathlib import Path
+from typing import Optional
 
 from kubernetes import client, config
 from onapsdk.cds import Blueprint, DataDictionarySet
@@ -24,6 +25,12 @@ class CDSBaseStep(BaseStep, ABC):
 class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
     """Expose CDS blueprintsprocessor port."""
 
+    def __init__(self, cleanup: bool) -> None:
+        """Initialize step."""
+        super().__init__(cleanup=cleanup)
+        self.service_name: str = "cds-blueprints-processor-http"
+        self.client: Optional[client.CoreV1Api] = None
+
     @property
     def description(self) -> str:
         """Step description."""
@@ -40,13 +47,36 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
         """
         super().execute()
         config.load_kube_config(settings.K8S_CONFIG)
-        k8s_client = client.CoreV1Api()
-        k8s_client.patch_namespaced_service(
-            "cds-blueprints-processor-http",
+        self.k8s_client = client.CoreV1Api()
+        self.k8s_client.patch_namespaced_service(
+            self.service_name,
             settings.K8S_NAMESPACE,
             {"spec": {"ports": [{"port": 8080, "nodePort": 30449}], "type": "NodePort"}}
         )
 
+    def cleanup(self) -> None:
+        """Step cleanup.
+
+        Restore CDS blueprintprocessor service.
+
+        """
+        self.k8s_client.patch_namespaced_service(
+            self.service_name,
+            settings.K8S_NAMESPACE,
+            [
+                {
+                    "op": "remove",
+                    "path": "/spec/ports/0/nodePort"
+                },
+                {
+                    "op": "replace",
+                    "path": "/spec/type",
+                    "value": "ClusterIP"
+                }
+            ]
+        )
+        return super().cleanup()
+
 
 class BootstrapBlueprintprocessor(CDSBaseStep):
     """Bootstrap blueprintsprocessor."""
diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py
index b591f8d..6300a43 100644
--- a/src/onaptests/steps/onboard/service.py
+++ b/src/onaptests/steps/onboard/service.py
@@ -69,13 +69,8 @@ class ServiceOnboardStep(BaseStep):
         # checkin is done if needed
         # If service is replayed, no need to try to re-onboard the model
         if not service.distributed:
-            try:
-                service.checkin()
-            except (APIError, ResourceNotFound):
-                # Retry as checkin may be a bit long
-                # Temp workaround to avoid internal race in SDC
-                time.sleep(5)
-                service.checkin()
+            time.sleep(30)
+            service.checkin()
             service.onboard()