Merge pull request #828 from QualiSystems/release/v1.5.0

Release/v1.5.2

Author: alexazarh

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_clone_from_vm/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.4.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.2">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_clone_from_vm/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.4.0,<1.5.0
+cloudshell-cp-vcenter>=1.5.0,<1.6.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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_image/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.4.0">
+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.5.2">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_image/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.4.0,<1.5.0
+cloudshell-cp-vcenter>=1.5.0,<1.6.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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_linked_clone/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.4.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.2">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_linked_clone/requirements.txt

@@ -1,4 +1,4 @@
 jsonpickle==0.9.3
 cloudshell-automation-api>=7.1.0.0,<7.2.0.0
-cloudshell-cp-vcenter>=1.4.0,<1.5.0
+cloudshell-cp-vcenter>=1.5.0,<1.6.0
 cloudshell-shell-core>=2.0.0,<2.1.0

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)