diff options
Diffstat (limited to 'src/onaptests/steps/onboard')
| -rw-r--r-- | src/onaptests/steps/onboard/cds.py | 2 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/clamp.py | 18 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/cps.py | 6 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/service.py | 7 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/vf.py | 11 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/vsp.py | 12 |
6 files changed, 31 insertions, 25 deletions
diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py index e489145..b9cc458 100644 --- a/src/onaptests/steps/onboard/cds.py +++ b/src/onaptests/steps/onboard/cds.py @@ -129,7 +129,7 @@ class CbaPublishStep(CDSBaseStep): def __init__(self) -> None: """Initialize CBA publish step.""" super().__init__(cleanup=BaseStep.HAS_NO_CLEANUP) - """Let's skip enrichment if enriched CBA is already present""" + # Let's skip enrichment if enriched CBA is already present if Path.is_file(settings.CDS_CBA_UNENRICHED): self.add_step(CbaEnrichStep()) elif settings.EXPOSE_SERVICES_NODE_PORTS: diff --git a/src/onaptests/steps/onboard/clamp.py b/src/onaptests/steps/onboard/clamp.py index 22783c6..c2fe191 100644 --- a/src/onaptests/steps/onboard/clamp.py +++ b/src/onaptests/steps/onboard/clamp.py @@ -49,7 +49,7 @@ class OnboardClampStep(YamlTemplateBaseStep): """ if self.is_root: if not self._yaml_template: - with open(settings.SERVICE_YAML_TEMPLATE, "r") as yaml_template: + with open(settings.SERVICE_YAML_TEMPLATE, "r", encoding="utf-8") as yaml_template: self._yaml_template: dict = load(yaml_template, SafeLoader) return self._yaml_template return self.parent.yaml_template @@ -79,14 +79,14 @@ class OnboardClampStep(YamlTemplateBaseStep): # we add the artifact to the first VNF self._logger.info("Try to add blueprint to %s", vf.name) - payload_file = open(settings.CONFIGURATION_PATH + 'tca-microservice.yaml', 'rb') - data = payload_file.read() - self._logger.info("DCAE INVENTORY BLUEPRINT file retrieved") - service.add_artifact_to_vf(vnf_name=vf.name, - artifact_type="DCAE_INVENTORY_BLUEPRINT", - artifact_name="tca-microservice.yaml", - artifact=data) - payload_file.close() + with open(settings.CONFIGURATION_PATH + 'tca-microservice.yaml', + 'rb') as payload_file: + data = payload_file.read() + self._logger.info("DCAE INVENTORY BLUEPRINT file retrieved") + service.add_artifact_to_vf(vnf_name=vf.name, + artifact_type="DCAE_INVENTORY_BLUEPRINT", + artifact_name="tca-microservice.yaml", + artifact=data) service.checkin() service.onboard() self._logger.info("DCAE INVENTORY BLUEPRINT ADDED") diff --git a/src/onaptests/steps/onboard/cps.py b/src/onaptests/steps/onboard/cps.py index f5820c7..04471c2 100644 --- a/src/onaptests/steps/onboard/cps.py +++ b/src/onaptests/steps/onboard/cps.py @@ -254,6 +254,8 @@ class CheckPostgressDataBaseConnectionStep(CpsBaseStep): def __init__(self) -> None: """Initialize step.""" super().__init__(cleanup=BaseStep.HAS_NO_CLEANUP) + self.login = None + self.password = None @property def description(self) -> str: @@ -261,6 +263,8 @@ class CheckPostgressDataBaseConnectionStep(CpsBaseStep): return "Establish connection with Postgress and execute the query" def get_database_credentials(self): + """Resolve CPS datbase credentials from k8s secret.""" + if settings.IN_CLUSTER: config.load_incluster_config() else: @@ -286,6 +290,8 @@ class CheckPostgressDataBaseConnectionStep(CpsBaseStep): raise EnvironmentPreparationException("Error accessing secret") from e def connect_to_postgress(self): + """Connect to CPS database and execute select query.""" + self.get_database_credentials() if self.login and self.password: db_params = { diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py index bcf153f..d2391b3 100644 --- a/src/onaptests/steps/onboard/service.py +++ b/src/onaptests/steps/onboard/service.py @@ -147,9 +147,9 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep): """ if settings.MODEL_YAML_TEMPLATE: return self.model_yaml_template - elif self.is_root: + if self.is_root: if not self._yaml_template: - with open(settings.SERVICE_YAML_TEMPLATE, "r") as yaml_template: + with open(settings.SERVICE_YAML_TEMPLATE, "r", encoding="utf-8") as yaml_template: self._yaml_template: dict = load(yaml_template, SafeLoader) return self._yaml_template return self.parent.yaml_template @@ -166,7 +166,8 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep): """ if self.is_root: if not self._model_yaml_template: - with open(settings.MODEL_YAML_TEMPLATE, "r") as model_yaml_template: + with open(settings.MODEL_YAML_TEMPLATE, "r", + encoding="utf-8") as model_yaml_template: self._model_yaml_template: dict = load(model_yaml_template, SafeLoader) return self._model_yaml_template return self.parent.model_yaml_template diff --git a/src/onaptests/steps/onboard/vf.py b/src/onaptests/steps/onboard/vf.py index 3fc7443..0c68835 100644 --- a/src/onaptests/steps/onboard/vf.py +++ b/src/onaptests/steps/onboard/vf.py @@ -104,8 +104,7 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep): """ if settings.MODEL_YAML_TEMPLATE: return self.model_yaml_template - else: - return self.parent.yaml_template[self.parent.service_name] + return self.parent.yaml_template[self.parent.service_name] @property def model_yaml_template(self) -> dict: @@ -128,10 +127,10 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep): vsp: Vsp = Vsp(name=f"{vnf['vnf_name']}_VSP") vf: Vf = Vf(name=vnf['vnf_name'], vsp=vsp) if not vf.created(): - if all([x in vnf for x in ["vnf_artifact_type", - "vnf_artifact_name", - "vnf_artifact_label", - "vnf_artifact_file_path"]]): + if all(x in vnf for x in ["vnf_artifact_type", + "vnf_artifact_name", + "vnf_artifact_label", + "vnf_artifact_file_path"]): vf.create() artifact_file_path: Path = Path(vnf["vnf_artifact_file_path"]) if not artifact_file_path.exists(): diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py index 06e0fa2..36e78df 100644 --- a/src/onaptests/steps/onboard/vsp.py +++ b/src/onaptests/steps/onboard/vsp.py @@ -48,10 +48,11 @@ class VspOnboardStep(BaseStep): """ super().execute() vendor: Vendor = Vendor(name=settings.VENDOR_NAME) - vsp: Vsp = Vsp(name=settings.VSP_NAME, - vendor=vendor, - package=open(settings.VSP_FILE_PATH, "rb")) - vsp.onboard() + with open(settings.VSP_FILE_PATH, "rb") as vsp_file: + vsp: Vsp = Vsp(name=settings.VSP_NAME, + vendor=vendor, + package=vsp_file) + vsp.onboard() @BaseStep.store_state(cleanup=True) def cleanup(self): @@ -103,8 +104,7 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep): """ if settings.MODEL_YAML_TEMPLATE: return self.model_yaml_template - else: - return self.parent.yaml_template + return self.parent.yaml_template @property def model_yaml_template(self) -> dict: |