diff options
| author |   Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> | 2023-05-18 18:03:27 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-05-18 18:03:27 +0000 |
| commit | deb99c7b3c7caaf9704e6316f7eba062a54b04fc (patch) | |
| tree | 28d08d0d83b71f9d89dfc7c38de69cfaece71692 | |
| parent | f8a9dce09d2a7f6755a04dfc03d248c2dcb173e4 (diff) | |
| parent | bd23b8b477205413499bb5cc68dbc343747a4291 (diff) | |
Merge ""Configure ONAP Python tests to not expose services""
| -rw-r--r-- | src/onaptests/configuration/settings.py | 1 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/cds.py | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/onaptests/configuration/settings.py b/src/onaptests/configuration/settings.py index 7561ebc..74bc840 100644 --- a/src/onaptests/configuration/settings.py +++ b/src/onaptests/configuration/settings.py @@ -51,3 +51,4 @@ 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 13e6203..0bad0cb 100644 --- a/src/onaptests/steps/onboard/cds.py +++ b/src/onaptests/steps/onboard/cds.py @@ -13,7 +13,8 @@ from onapsdk.cds.blueprint_processor import Blueprintprocessor from onapsdk.configuration import settings import urllib3 -from ..base import BaseStep +from onaptests.steps.base import BaseStep + from onaptests.utils.exceptions import OnapTestException @@ -68,6 +69,7 @@ class ExposeCDSBlueprintprocessorNodePortStep(CDSBaseStep): Use settings values: - K8S_CONFIG, - K8S_ONAP_NAMESPACE. + - EXPOSE_SERVICES_NODE_PORTS """ super().execute() @@ -131,7 +133,8 @@ class BootstrapBlueprintprocessor(CDSBaseStep): - ExposeCDSBlueprintprocessorNodePortStep. """ super().__init__(cleanup=cleanup) - self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup)) + if settings.EXPOSE_SERVICES_NODE_PORTS: + self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup)) @property def description(self) -> str: @@ -217,7 +220,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)) - else: + elif settings.EXPOSE_SERVICES_NODE_PORTS: self.add_step(ExposeCDSBlueprintprocessorNodePortStep(cleanup=cleanup)) @property |