Merge pull request #836 from QualiSystems/feature/alex_merge_1.5.2_to_dev

alexazarh · web-flow · commit c42b38a03708 · 2017-01-19T12:13:07.000+02:00
alex merge 1.5.2 to dev
diff --git a/deployment_drivers/deploy_clone_from_vm/driver.py b/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
 
@@ -59,4 +59,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)
diff --git a/deployment_drivers/deploy_from_image/driver.py b/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
@@ -50,13 +50,17 @@ def Deploy(self, context, Name=None):
 
 
         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):
         """
diff --git a/deployment_drivers/deploy_from_linked_clone/driver.py b/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
 
@@ -59,4 +59,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)
diff --git a/deployment_drivers/deploy_from_template/driver.py b/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
 
@@ -59,4 +63,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)
diff --git a/package/cloudshell/cp/vcenter/common/cloud_shell/driver_helper.py b/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
+
diff --git a/package/cloudshell/cp/vcenter/common/wrappers/command_wrapper.py b/package/cloudshell/cp/vcenter/common/wrappers/command_wrapper.py
@@ -47,6 +47,7 @@ def __init__(self, pv_service, cloud_shell_helper, resource_model_parser, contex
         # add lock
         self.lock = Lock()
         self.si = None
+        self.connection_details = None
 
     @retry(stop_max_attempt_number=3, wait_fixed=2000, retry_on_exception=retry_if_auth_error)
     def execute_command_with_connection(self, context, command, *args):
@@ -59,8 +60,8 @@ def execute_command_with_connection(self, context, command, *args):
         """
 
         logger = self.context_based_logger_factory.create_logger_for_context(
-            logger_name='vCenterShell',
-            context=context)
+                logger_name='vCenterShell',
+                context=context)
 
         if not command:
             logger.error(COMMAND_CANNOT_BE_NONE)
@@ -88,11 +89,11 @@ def execute_command_with_connection(self, context, command, *args):
             if connection_details:
                 logger.info(INFO_CONNECTING_TO_VCENTER.format(connection_details.host))
                 logger.debug(
-                    DEBUG_CONNECTION_INFO.format(connection_details.host,
-                                                 connection_details.username,
-                                                 connection_details.port))
+                        DEBUG_CONNECTION_INFO.format(connection_details.host,
+                                                     connection_details.username,
+                                                     connection_details.port))
 
-                si = self.get_py_service_connection(connection_details,logger)
+                si = self.get_py_service_connection(connection_details, logger)
             if si:
                 logger.info(CONNECTED_TO_CENTER.format(connection_details.host))
                 command_args.append(si)
@@ -120,18 +121,33 @@ def execute_command_with_connection(self, context, command, *args):
         finally:
             logger.info(LOG_FORMAT.format(END, command_name))
 
-    def get_py_service_connection(self, connection_details, logger):
+    def get_py_service_connection(self, req_connection_details, logger):
         logger.info("get_py_service_connection")
-        if self.si is None:
+        if self.si is None or self.has_connection_details_changed(req_connection_details):
             with self.lock:
-                if self.si is None:
+                if self.si is None or self.has_connection_details_changed(req_connection_details):
                     logger.info("Creating a new connection.")
-                    self.si = self.pv_service.connect(connection_details.host,
-                                                      connection_details.username,
-                                                      connection_details.password,
-                                                      connection_details.port)
+                    self.si = self.pv_service.connect(req_connection_details.host,
+                                                      req_connection_details.username,
+                                                      req_connection_details.password,
+                                                      req_connection_details.port)
+                    self.connection_details = req_connection_details
         return self.si
 
+    def has_connection_details_changed(self, req_connection_details):
+        """
+        :param cloudshell.cp.vcenter.models.VCenterConnectionDetails.VCenterConnectionDetails req_connection_details:
+        :return:
+        """
+        if self.connection_details is None and req_connection_details is None:
+            return False
+        if self.connection_details is None or req_connection_details is None:
+            return True
+        return not all([self.connection_details.host == req_connection_details.host,
+                        self.connection_details.username == req_connection_details.username,
+                        self.connection_details.password == req_connection_details.password,
+                        self.connection_details.port == req_connection_details.port])
+
     @staticmethod
     def _get_domain(context):
         # noinspection PyBroadException
diff --git a/package/version.txt b/package/version.txt
@@ -1 +1 @@
-1.6.0
+1.6.0
diff --git a/vcentershell_driver/drivermetadata.xml b/vcentershell_driver/drivermetadata.xml
@@ -1,10 +1,10 @@
 <Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.6.0">
     <Layout>
         <Category Name="Deployment">
-            <Command Description="" DisplayName="Deploy From Template" Name="deploy_from_template" Tags="allow_unreserved" />
-            <Command Description="" DisplayName="Deploy Clone From VM" Name="deploy_clone_from_vm" Tags="allow_unreserved" />
-            <Command Description="" DisplayName="Deploy from Linked Clone" Name="deploy_from_linked_clone" Tags="allow_unreserved" />
-            <Command Description="" DisplayName="Deploy From Image" Name="deploy_from_image" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Deploy Clone From VM" EnableCancellation="true" Name="deploy_clone_from_vm" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Deploy from Linked Clone" EnableCancellation="true" Name="deploy_from_linked_clone" Tags="allow_unreserved" />
+            <Command Description="" DisplayName="Deploy From Image" EnableCancellation="true" Name="deploy_from_image" Tags="allow_unreserved" />
         </Category>
         <Category Name="Connectivity">
             <Command Description="" DisplayName="Refresh IP" EnableCancellation="true" Name="remote_refresh_ip" Tags="remote_connectivity,allow_shared" />
