diff options
| author |   andreasgeissler <andreas-geissler@telekom.de> | 2020-09-09 18:01:12 +0200 |
|---|---|---|
| committer | andreasgeissler <andreas-geissler@telekom.de> | 2020-09-10 17:49:24 +0200 |
| commit | a5c39a3409a795fb0709b952e15ac2746364358b (patch) | |
| tree | fb887c560ce1699543d54572279207830c92ef31 /src/onaptests/steps/instantiate/vf_module_ala_carte.py | |
| parent | 80e8e99d9b33fc5929c253aba84d330ae68f01de (diff) | |
Updated yaml-based instantiation and MultiCloud registry
Correction for linter and updated run script
Issue-ID: TEST-256
Signed-off-by: andreasgeissler <andreas-geissler@telekom.de>
Change-Id: Ia1f6f41f8fc6ed74c836ea7aa987f10487f377a6
Diffstat (limited to 'src/onaptests/steps/instantiate/vf_module_ala_carte.py')
| -rw-r--r-- | src/onaptests/steps/instantiate/vf_module_ala_carte.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/onaptests/steps/instantiate/vf_module_ala_carte.py b/src/onaptests/steps/instantiate/vf_module_ala_carte.py index fd4b368..b4ff002 100644 --- a/src/onaptests/steps/instantiate/vf_module_ala_carte.py +++ b/src/onaptests/steps/instantiate/vf_module_ala_carte.py @@ -22,6 +22,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): """ super().__init__(cleanup=cleanup) self._yaml_template: dict = None + self._service_instance_name: str = None self.add_step(YamlTemplateVnfAlaCarteInstantiateStep(cleanup)) @property @@ -67,7 +68,9 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): """ if self.is_root: - return f"{self.service_name}-{str(uuid4())}" + if not self._service_instance_name: + self._service_instance_name: str = f"{self.service_name}-{str(uuid4())}" + return self._service_instance_name return self.parent.service_instance_name def get_vnf_parameters(self, vnf_name: str) -> Iterable[VnfParameter]: @@ -80,6 +83,9 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): Iterator[Iterable[VnfParameter]]: VNF parameter """ + + # workaround, as VNF name differs from model name (added " 0") + vnf_name=vnf_name.split()[0] for vnf in self.yaml_template[self.service_name]["vnfs"]: if vnf["vnf_name"] == vnf_name: for vnf_parameter in vnf["vnf_parameters"]: @@ -105,7 +111,7 @@ class YamlTemplateVfModuleAlaCarteInstantiateStep(YamlTemplateBaseStep): for vnf_instance in service_instance.vnf_instances: vf_module_instantiation = vnf_instance.add_vf_module( vnf_instance.vnf.vf_module, - vnf_parameters= self.get_vnf_parameters(vnf_instance.vnf.vnf_name)) + vnf_parameters= self.get_vnf_parameters(vnf_instance.vnf.name)) while not vf_module_instantiation.finished: time.sleep(10) if vf_module_instantiation.failed: |