Added the support for cancellation output command.

Author: igor-olikh

deployment_drivers/deploy_clone_from_vm/driver.py

@@ -1,5 +1,5 @@
 import jsonpickle
-from cloudshell.api.cloudshell_api import InputNameValue
+from cloudshell.api.cloudshell_api import InputNameValue, CommandExecutionCancelledResultInfo
 from cloudshell.cp.vcenter.models.DeployFromTemplateDetails import DeployFromTemplateDetails
 from cloudshell.cp.vcenter.models.vCenterCloneVMFromVMResourceModel import vCenterCloneVMFromVMResourceModel
 
@@ -50,4 +50,5 @@ def Deploy(self, context, Name=None):
                                         params,
                                         False)
 
-        return result.Output
+        return self.cs_helper.proceed_command_execution_result(reservation_id=reservation_id, result=result,
+                                                               context=context)

deployment_drivers/deploy_from_image/driver.py

@@ -1,5 +1,5 @@
 import jsonpickle
-from cloudshell.api.cloudshell_api import InputNameValue
+from cloudshell.api.cloudshell_api import InputNameValue, CommandExecutionCancelledResultInfo
 from cloudshell.shell.core.resource_driver_interface import ResourceDriverInterface
 
 from cloudshell.cp.vcenter.models.DeployDataHolder import DeployDataHolder
@@ -40,13 +40,17 @@ def Deploy(self, context, Name=None):
             Name = jsonpickle.decode(context.resource.app_context.app_request_json)['name']
 
         deployment_info = self._get_deployment_info(vcenter_image_resource_model, Name)
+
+        reservation_id = context.reservation.reservation_id
         result = session.ExecuteCommand(context.reservation.reservation_id,
                                         vcenter_res,
                                         "Resource",
                                         "deploy_from_image",
                                         self._get_command_inputs_list(deployment_info),
                                         False)
-        return result.Output
+
+        return self.cs_helper.proceed_command_execution_result(reservation_id=reservation_id, result=result,
+                                                               context=context)
 
     def _get_deployment_info(self, image_model, name):
         """

deployment_drivers/deploy_from_linked_clone/driver.py

@@ -1,5 +1,5 @@
 import jsonpickle
-from cloudshell.api.cloudshell_api import InputNameValue
+from cloudshell.api.cloudshell_api import InputNameValue, CommandExecutionCancelledResultInfo
 from cloudshell.cp.vcenter.models.DeployFromTemplateDetails import DeployFromTemplateDetails
 from cloudshell.cp.vcenter.models.VCenterDeployVMFromLinkedCloneResourceModel import VCenterDeployVMFromLinkedCloneResourceModel
 
@@ -50,4 +50,5 @@ def Deploy(self, context, Name=None):
                                         params,
                                         False)
 
-        return result.Output
+        return self.cs_helper.proceed_command_execution_result(reservation_id=reservation_id, result=result,
+                                                               context=context)

deployment_drivers/deploy_from_template/driver.py

@@ -1,5 +1,9 @@
+from distutils import config
+
 import jsonpickle
-from cloudshell.api.cloudshell_api import InputNameValue
+from cloudshell.api.cloudshell_api import InputNameValue, CommandExecutionCancelledResultInfo
+
+from cloudshell.cp.vcenter.common.utilites.context_based_logger_factory import ContextBasedLoggerFactory
 from cloudshell.cp.vcenter.models.DeployFromTemplateDetails import DeployFromTemplateDetails
 from cloudshell.cp.vcenter.models.vCenterVMFromTemplateResourceModel import vCenterVMFromTemplateResourceModel
 
@@ -50,4 +54,5 @@ def Deploy(self, context, Name=None):
                                         params,
                                         False)
 
-        return result.Output
+        return self.cs_helper.proceed_command_execution_result(reservation_id=reservation_id, result=result,
+                                                               context=context)

package/cloudshell/cp/vcenter/common/cloud_shell/driver_helper.py

@@ -1,5 +1,6 @@
-from cloudshell.api.cloudshell_api import CloudShellAPISession
+from cloudshell.api.cloudshell_api import CloudShellAPISession, CommandExecutionCancelledResultInfo
 
+from cloudshell.cp.vcenter.common.utilites.context_based_logger_factory import ContextBasedLoggerFactory
 from cloudshell.cp.vcenter.models.VCenterConnectionDetails import VCenterConnectionDetails
 
 
@@ -39,3 +40,13 @@ def get_connection_details(self, session, vcenter_resource_model, resource_conte
 
         return VCenterConnectionDetails(vcenter_url, user, password)
 
+    def proceed_command_execution_result(self, reservation_id, result, context):
+        if isinstance(result, CommandExecutionCancelledResultInfo):
+            logger_factory = ContextBasedLoggerFactory()
+            logger = logger_factory.create_logger_for_context(logger_name='vCenterShell',
+                                                              context=context)
+            logger.info("Deploy from template for reservation '{0}': {1}".format(reservation_id, result.Message))
+            return result.Message
+        else:
+            return result.Output
+