fixing bug that prevents si singleton to recreate connection when credentials or host change

Author: Alex Azarh

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.5.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.1">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

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.5.0">
+<Driver Description="Deploy App From Image" MainClass="driver.DeployFromImage" Name="VM Deployment From Image" Version="1.5.1">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

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.5.0">
+<Driver Description="Deploy App From VM" MainClass="driver.DeployCloneFromVMDriver" Name="Deploy Clone From VM Driver" Version="1.5.1">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

deployment_drivers/deploy_from_template/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.5.0">
+<Driver Description="Deploy App From Template" MainClass="driver.DeployFromTemplateDriver" Name="VM Deployment From Template" Version="1.5.1">
     <Layout>
         <Category Name="App Management">
             <Command Description="" DisplayName="Deploy" Name="Deploy" Tags="allow_shared" />

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)
@@ -121,18 +122,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

package/version.txt

@@ -1 +1 @@
-1.5.0
+1.5.1

vcentershell_driver/drivermetadata.xml

@@ -1,4 +1,4 @@
-<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.5.0">
+<Driver Description="this driver manage all the commands that runs at the vcenter context" MainClass="driver.VCenterShellDriver" Name="VCenter Driver" Version="1.5.1">
     <Layout>
         <Category Name="Deployment">
             <Command Description="" DisplayName="Deploy From Template" EnableCancellation="true" Name="deploy_from_template" Tags="allow_unreserved" />

version.txt

@@ -1 +1 @@
-1.5.0
+1.5.1