diff options
Diffstat (limited to 'src/onaptests/steps/onboard')
| -rw-r--r-- | src/onaptests/steps/onboard/cds.py | 4 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/clamp.py | 4 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/service.py | 4 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/vf.py | 4 | ||||
| -rw-r--r-- | src/onaptests/steps/onboard/vsp.py | 8 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/onaptests/steps/onboard/cds.py b/src/onaptests/steps/onboard/cds.py index 7f91d56..d6645ef 100644 --- a/src/onaptests/steps/onboard/cds.py +++ b/src/onaptests/steps/onboard/cds.py @@ -214,7 +214,9 @@ class CbaPublishStep(CDSBaseStep): def __init__(self, cleanup=False) -> None: """Initialize CBA publish step.""" super().__init__(cleanup=cleanup) - self.add_step(CbaEnrichStep(cleanup=cleanup)) + """Let's skip enrichment if enriched CBA is already present""" + if Path.is_file(settings.CDS_CBA_UNENRICHED): + self.add_step(CbaEnrichStep(cleanup=cleanup)) @property def description(self) -> str: diff --git a/src/onaptests/steps/onboard/clamp.py b/src/onaptests/steps/onboard/clamp.py index 9d73a8e..72daba2 100644 --- a/src/onaptests/steps/onboard/clamp.py +++ b/src/onaptests/steps/onboard/clamp.py @@ -1,7 +1,7 @@ #!/usr/bin/python # http://www.apache.org/licenses/LICENSE-2.0 """Clamp Onboard service class.""" -from yaml import load +from yaml import load, SafeLoader from onapsdk.sdc.service import Service from onapsdk.sdc.vf import Vf @@ -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: - self._yaml_template: dict = load(yaml_template) + self._yaml_template: dict = load(yaml_template, SafeLoader) return self._yaml_template return self.parent.yaml_template diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py index db1b330..6f1e69f 100644 --- a/src/onaptests/steps/onboard/service.py +++ b/src/onaptests/steps/onboard/service.py @@ -1,6 +1,6 @@ import time from typing import Any, Dict -from yaml import load +from yaml import load, SafeLoader from onapsdk.configuration import settings from onapsdk.exceptions import APIError, ResourceNotFound @@ -117,7 +117,7 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep): elif self.is_root: if not self._yaml_template: with open(settings.SERVICE_YAML_TEMPLATE, "r") as yaml_template: - self._yaml_template: dict = load(yaml_template) + self._yaml_template: dict = load(yaml_template, SafeLoader) return self._yaml_template return self.parent.yaml_template diff --git a/src/onaptests/steps/onboard/vf.py b/src/onaptests/steps/onboard/vf.py index 44c3749..852cb82 100644 --- a/src/onaptests/steps/onboard/vf.py +++ b/src/onaptests/steps/onboard/vf.py @@ -1,10 +1,10 @@ from pathlib import Path -import sys import time from onapsdk.configuration import settings from onapsdk.sdc.vf import Vf from onapsdk.sdc.vsp import Vsp +from onaptests.utils.resources import get_resource_location from ..base import BaseStep, YamlTemplateBaseStep from .vsp import VspOnboardStep, YamlTemplateVspOnboardStep @@ -113,7 +113,7 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep): vf.create() artifact_file_path: Path = Path(vnf["vnf_artifact_file_path"]) if not artifact_file_path.exists(): - artifact_file_path = Path(sys.path[-1], artifact_file_path) + artifact_file_path = Path(get_resource_location(artifact_file_path)) vf.add_deployment_artifact( artifact_type=vnf["vnf_artifact_type"], artifact_name=vnf["vnf_artifact_name"], diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py index 5462c55..f898268 100644 --- a/src/onaptests/steps/onboard/vsp.py +++ b/src/onaptests/steps/onboard/vsp.py @@ -1,7 +1,7 @@ -import sys from onapsdk.configuration import settings from onapsdk.sdc.vendor import Vendor from onapsdk.sdc.vsp import Vsp +from onaptests.utils.resources import get_resource_location from ..base import BaseStep, YamlTemplateBaseStep from .vendor import VendorOnboardStep @@ -105,8 +105,7 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep): vendor: Vendor = Vendor(name=settings.VENDOR_NAME) if "vnfs" in self.yaml_template: for vnf in self.yaml_template["vnfs"]: - with open( - sys.path[-1] + "/" + vnf["heat_files_to_upload"], "rb") as package: + with open(get_resource_location(vnf["heat_files_to_upload"]), "rb") as package: vsp: Vsp = Vsp(name=f"{vnf['vnf_name']}_VSP", vendor=vendor, package=package) @@ -114,8 +113,7 @@ class YamlTemplateVspOnboardStep(YamlTemplateBaseStep): elif "pnfs" in self.yaml_template: for pnf in self.yaml_template["pnfs"]: if "heat_files_to_upload" in pnf: - with open( - sys.path[-1] + "/" + pnf["heat_files_to_upload"], "rb") as package: + with open(get_resource_location(pnf["heat_files_to_upload"]), "rb") as package: vsp: Vsp = Vsp(name=f"{pnf['pnf_name']}_VSP", vendor=vendor, package=package) |