From 0f537c1ffb79c16038b3b23603539dbeb12122be Mon Sep 17 00:00:00 2001 From: Smruti Ranjan Senapati Date: Mon, 24 Jul 2023 22:40:22 +0530 Subject: [PATCH] fix(deployment): sets dependent deployment ready phase to PROVISIONING --- riocli/deployment/model.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/riocli/deployment/model.py b/riocli/deployment/model.py index 5352fc8b..b4744776 100644 --- a/riocli/deployment/model.py +++ b/riocli/deployment/model.py @@ -71,12 +71,11 @@ def create_object(self, client: Client, **kwargs) -> typing.Any: retry_interval = int(kwargs.get('retry_interval')) if 'runtime' in self.spec and runtime != self.spec.runtime: - click.secho( - '>> runtime mismatch => ' + - 'deployment:{}.runtime !== package:{}.runtime '.format( + msg = '>> runtime mismatch => deployment:{}.runtime !== package:{}.runtime '.format( self.metadata.name, pkg['packageName'] - ), fg=Colors.RED) - return + ) + click.secho(msg, fg=Colors.RED) + raise Exception(msg) provision_config = pkg.get_provision_configuration(plan_id) @@ -97,7 +96,9 @@ def create_object(self, client: Client, **kwargs) -> typing.Any: dep_guid, dep = self.rc.find_depends(item) if dep is None and dep_guid: dep = client.get_deployment(dep_guid) - provision_config.add_dependent_deployment(dep) + provision_config.add_dependent_deployment(dep, ready_phases=[ + DeploymentPhaseConstants.PROVISIONING.value, + DeploymentPhaseConstants.SUCCEEDED.value]) # Add Network if 'rosNetworks' in self.spec: @@ -224,7 +225,8 @@ def create_object(self, client: Client, **kwargs) -> typing.Any: deployment = pkg.provision(self.metadata.name, provision_config) try: - deployment.poll_deployment_till_ready(retry_count=retry_count, sleep_interval=retry_interval, ready_phases=[DeploymentPhaseConstants.PROVISIONING.value]) + deployment.poll_deployment_till_ready(retry_count=retry_count, sleep_interval=retry_interval, ready_phases=[DeploymentPhaseConstants.PROVISIONING.value, + DeploymentPhaseConstants.SUCCEEDED.value]) except DeploymentNotRunningException as e: raise Exception(process_deployment_errors(e)) from e except Exception as e: