diff options
author | morganrol <morgan.richomme@orange.com> | 2021-04-27 17:08:34 +0200 |
---|---|---|
committer | Morgan Richomme <morgan.richomme@orange.com> | 2021-04-28 09:02:23 +0000 |
commit | 44c4437d52355a4ba371f80ce68a12a7967b2cb4 (patch) | |
tree | 911909a4d16e0ee9c9c5a82320faf88e7d8c23e7 /src/onaptests/steps/onboard | |
parent | ea75b7596605a2bb7e5f51aa39ca6e5a962c59db (diff) |
[CLAMP] Update clamp to allow re-play of the test
Today a docker restart is failing
because we try to enrich a certified artifacts
Like for other basic_* tests, if the service is already distributed
we may just consider creating the loop (bypass the model onboarding part)
so we can run the test as a replay and use it for parallel tests
Issue-ID: TEST-334
Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I5f353488e64b420fa94303695311a473682a5fa1
(cherry picked from commit 227f55ed67caec8e67a037bc3e901caf54617c4c)
Diffstat (limited to 'src/onaptests/steps/onboard')
-rw-r--r-- | src/onaptests/steps/onboard/clamp.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/onaptests/steps/onboard/clamp.py b/src/onaptests/steps/onboard/clamp.py index 1fc8ae0..afbd7cb 100644 --- a/src/onaptests/steps/onboard/clamp.py +++ b/src/onaptests/steps/onboard/clamp.py @@ -84,18 +84,19 @@ class OnboardClampStep(YamlTemplateBaseStep): service.create() self._logger.info(" Service %s created", service) - service.add_resource(vf) - - # 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() - service.checkin() - service.onboard() - self._logger.info("DCAE INVENTORY BLUEPRINT ADDED") + if not service.distributed: + service.add_resource(vf) + + # 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() + service.checkin() + service.onboard() + self._logger.info("DCAE INVENTORY BLUEPRINT ADDED") |