Revert "Configure ONAP Python tests to not expose services"

Changed name of setting value

Issue-ID: INT-2234
Change-Id: I22f35a4cdff076862f086cb15d06e3d0101c883a
Signed-off-by: pawel.denst <pawel.denst@external.t-mobile.pl>

diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py
index 74bc840..7561ebc 100644 (file)
--- a/src/onaptests/configuration/settings.py
+++ b/src/onaptests/configuration/settings.py
@@ -51,4 +51,3 @@ K8S_ADDITIONAL_RESOURCES_NAMESPACE = K8S_ONAP_NAMESPACE  # Resources created on
 ORCHESTRATION_REQUEST_TIMEOUT = 60.0 * 15  # 15 minutes in seconds
 SERVICE_DISTRIBUTION_NUMBER_OF_TRIES = 30
 SERVICE_DISTRIBUTION_SLEEP_TIME = 60
-EXPOSE_SERVICES_NODE_PORTS = True
\ No newline at end of file

diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py
index 0bad0cb..13e6203 100644 (file)
--- a/src/onaptests/steps/onboard/cds.py
+++ b/src/onaptests/steps/onboard/cds.py
@@ -13,8 +13,7 @@ from onapsdk.cds.blueprint_processor import Blueprintprocessor
 from onapsdk.configuration import settings
 import urllib3
 
-from onaptests.steps.base import BaseStep
-
+from ..base import BaseStep
 from onaptests.utils.exceptions import OnapTestException
 
 
@@ -69,7 +68,6 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep):
         Use settings values:
          - K8S_CONFIG,
          - K8S_ONAP_NAMESPACE.
-         - EXPOSE_SERVICES_NODE_PORTS
 
         """
         super().execute()
@@ -133,8 +131,7 @@ class BootstrapBlueprintprocessor(CDSBaseStep):
             - ExposeCDSBlueprintprocessorNodePortStep.
         """
         super().__init__(cleanup=cleanup)
-        if settings.EXPOSE_SERVICES_NODE_PORTS:
-            self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup))
+        self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup))
 
     @property
     def description(self) -> str:
@@ -220,7 +217,7 @@ class CbaPublishStep(CDSBaseStep):
         """Let's skip enrichment if enriched CBA is already present"""
         if Path.is_file(settings.CDS_CBA_UNENRICHED):
             self.add_step(CbaEnrichStep(cleanup=cleanup))
-        elif settings.EXPOSE_SERVICES_NODE_PORTS:
+        else:
             self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup))
 
     @property