diff options
Diffstat (limited to 'src/onaptests/steps')
| -rw-r--r-- | src/onaptests/steps/onboard/service.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py index f95cc14..fa21d2c 100644 --- a/src/onaptests/steps/onboard/service.py +++ b/src/onaptests/steps/onboard/service.py @@ -72,8 +72,14 @@ class ServiceOnboardStep(BaseStep): # If service is replayed, no need to try to re-onboard the model # Double check because of: https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk/-/issues/176 if not service.distributed and service.status != onapsdk_const.DISTRIBUTED: - time.sleep(10) - service.checkin() + if service.status == onapsdk_const.DRAFT: + try: + service.checkin() + except (APIError, ResourceNotFound): + # Retry as checkin may be a bit long + # Temp workaround to avoid internal race in SDC + time.sleep(10) + service.checkin() service.onboard() @@ -173,13 +179,14 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep): # If service is replayed, no need to try to re-onboard the model # Double check because of: https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk/-/issues/176 if not service.distributed and service.status != onapsdk_const.DISTRIBUTED: - try: - service.checkin() - except (APIError, ResourceNotFound): - # Retry as checkin may be a bit long - # Temp workaround to avoid internal race in SDC - time.sleep(10) - service.checkin() + if service.status == onapsdk_const.DRAFT: + try: + service.checkin() + except (APIError, ResourceNotFound): + # Retry as checkin may be a bit long + # Temp workaround to avoid internal race in SDC + time.sleep(10) + service.checkin() service.onboard() def declare_resources(self, service: Service) -> None: |