upgraded cloudshell-shell-core to 3.1

Author: noamwegner

package/cloudshell/cp/vcenter/commands/command_orchestrator.py

@@ -19,12 +19,10 @@
 from cloudshell.cp.vcenter.commands.restore_snapshot import SnapshotRestoreCommand
 from cloudshell.cp.vcenter.commands.save_snapshot import SaveSnapshotCommand
 from cloudshell.cp.vcenter.commands.retrieve_snapshots import RetrieveSnapshotsCommand
-from cloudshell.cp.vcenter.common.cloud_shell.driver_helper import CloudshellDriverHelper
 from cloudshell.cp.vcenter.common.cloud_shell.resource_remover import CloudshellResourceRemover
 from cloudshell.cp.vcenter.common.model_factory import ResourceModelParser
 from cloudshell.cp.vcenter.common.utilites.command_result import set_command_result, get_result_from_command_output
 from cloudshell.cp.vcenter.common.utilites.common_name import generate_unique_name
-from cloudshell.cp.vcenter.common.utilites.common_utils import back_slash_to_front_converter
 from cloudshell.cp.vcenter.common.utilites.context_based_logger_factory import ContextBasedLoggerFactory
 from cloudshell.cp.vcenter.common.vcenter.ovf_service import OvfImageDeployerService
 from cloudshell.cp.vcenter.common.vcenter.task_waiter import SynchronousTaskWaiter
@@ -50,16 +48,13 @@
 from cloudshell.cp.vcenter.vm.vnic_to_network_mapper import VnicToNetworkMapper
 from cloudshell.cp.vcenter.models.DeployFromTemplateDetails import DeployFromTemplateDetails
 
-
 class CommandOrchestrator(object):
     def __init__(self):
         """
         Initialize the driver session, this function is called everytime a new instance of the driver is created
         in here the driver is going to be bootstrapped
 
-        :param context: models.QualiDriverModels.InitCommandContext
         """
-        self.cs_helper = CloudshellDriverHelper()
         synchronous_task_waiter = SynchronousTaskWaiter()
         pv_service = pyVmomiService(connect=SmartConnect, disconnect=Disconnect, task_waiter=synchronous_task_waiter)
         self.resource_model_parser = ResourceModelParser()
@@ -74,7 +69,6 @@ def __init__(self):
         vm_deployer = VirtualMachineDeployer(pv_service=pv_service,
                                              name_generator=generate_unique_name,
                                              ovf_service=ovf_service,
-                                             cs_helper=self.cs_helper,
                                              resource_model_parser=ResourceModelParser())
 
         dv_port_group_creator = DvPortGroupCreator(pyvmomi_service=pv_service,
@@ -89,7 +83,6 @@ def __init__(self):
                                                                               virtual_machine_port_group_configurer)
         # Command Wrapper
         self.command_wrapper = CommandWrapper(pv_service=pv_service,
-                                              cloud_shell_helper=self.cs_helper,
                                               resource_model_parser=self.resource_model_parser,
                                               context_based_logger_factory=ContextBasedLoggerFactory())
         # Deploy Command
@@ -261,6 +254,7 @@ def disconnect_all(self, context, ports):
         :param models.QualiDriverModels.ResourceRemoteCommandContext context: the context the command runs on
         :param list[string] ports: the ports of the connection between the remote resource and the local resource, NOT IN USE!!!
         """
+
         resource_details = self._parse_remote_model(context)
         # execute command
         res = self.command_wrapper.execute_command_with_connection(

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

@@ -2,28 +2,24 @@
 
 
 class ResourceConnectionDetailsRetriever:
-    def __init__(self, qualipy_helpers):
-        """
-        :param qualipy.scripts.cloudshell_scripts_helpers qualipy_helpers:
-        :param cs_retriever_service:
-        :return:
-        """
-        self.qualipy_helpers = qualipy_helpers
 
-    def connection_details(self):
-        """ Retrieves connection details to vCenter from specified resource
+    @staticmethod
+    def get_connection_details(session, vcenter_resource_model, resource_context):
+        """
+        Methods retrieves the connection details from the vcenter resource model attributes.
 
-        :param resource_name: Resource name to get connection details from
-        :rtype VCenterConnectionDetails:
+        :param CloudShellAPISession session:
+        :param VMwarevCenterResourceModel vcenter_resource_model: Instance of VMwarevCenterResourceModel
+        :param ResourceContextDetails resource_context: the context of the command
         """
-        # gets the vcenter resource context to connect. We assume this will only run on a cloud prodvider resource
-        session = self.qualipy_helpers.get_api_session()
-        resource_context = self.qualipy_helpers.get_resource_context_details()
+
+        session = session
+        resource_context = resource_context
 
         # get vCenter connection details from vCenter resource
-        user = resource_context.attributes["User"]
-        encrypted_pass = resource_context.attributes["Password"]
+        user = vcenter_resource_model.user
         vcenter_url = resource_context.address
-        password = session.DecryptPassword(encrypted_pass).Value
+        password = session.DecryptPassword(vcenter_resource_model.password).Value
 
         return VCenterConnectionDetails(vcenter_url, user, password)
+

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

@@ -7,12 +7,12 @@
 from cloudshell.cp.vcenter.models.QualiDriverModels import AutoLoadDetails, AutoLoadAttribute
 from cloudshell.cp.vcenter.models.VCenterConnectionDetails import VCenterConnectionDetails
 
-from cloudshell.cp.vcenter.common.cloud_shell.driver_helper import CloudshellDriverHelper
+
 from cloudshell.cp.vcenter.common.model_factory import ResourceModelParser
 from cloudshell.cp.vcenter.common.vcenter.vmomi_service import pyVmomiService
 
 from cloudshell.cp.vcenter.common.vcenter.task_waiter import SynchronousTaskWaiter
-from cloudshell.cp.vcenter.common.utilites.io import get_path_and_name
+from cloudshell.shell.core.session.cloudshell_session import CloudShellSessionContext
 
 DOMAIN = 'Global'
 ADDRESS = 'address'
@@ -35,7 +35,6 @@ class VCenterAutoModelDiscovery(object):
     def __init__(self):
         self.parser = ResourceModelParser()
         self.pv_service = pyVmomiService(SmartConnect, Disconnect, SynchronousTaskWaiter())
-        self.cs_helper = CloudshellDriverHelper()
         self.context_based_logger_factory = ContextBasedLoggerFactory()
 
     def _get_logger(self, context):
@@ -52,15 +51,15 @@ def validate_and_discover(self, context):
         """
         logger = self._get_logger(context)
         logger.info('Autodiscovery started')
+        si = None
+        resource = None
 
-        session = self.cs_helper.get_session(context.connectivity.server_address,
-                                             context.connectivity.admin_auth_token,
-                                             DOMAIN)
-        self._check_if_attribute_not_empty(context.resource, ADDRESS)
-        resource = context.resource
-        auto_attr = []
-        si = self._check_if_vcenter_user_pass_valid(context, session, resource.attributes)
+        with CloudShellSessionContext(context) as cloudshell_session:
+            self._check_if_attribute_not_empty(context.resource, ADDRESS)
+            resource = context.resource
+            si = self._check_if_vcenter_user_pass_valid(context, cloudshell_session, resource.attributes)
 
+        auto_attr = []
         if not si:
             error_message = 'Could not connect to the vCenter: {0}, with given credentials'\
                 .format(context.resource.address)

package/cloudshell/cp/vcenter/common/vcenter/model_auto_discovery.py

@@ -4,9 +4,9 @@
 from retrying import retry
 
 from cloudshell.cp.vcenter.common.model_factory import ResourceModelParser
-from cloudshell.cp.vcenter.common.cloud_shell.driver_helper import CloudshellDriverHelper
 from cloudshell.cp.vcenter.common.vcenter.vmomi_service import pyVmomiService, VCenterAuthError
-from cloudshell.cp.vcenter.models.VMwarevCenterResourceModel import VMwarevCenterResourceModel
+from cloudshell.shell.core.session.cloudshell_session import CloudShellSessionContext
+from cloudshell.cp.vcenter.common.cloud_shell.conn_details_retriever import ResourceConnectionDetailsRetriever
 
 DISCONNCTING_VCENERT = 'disconnecting from vcenter: {0}'
 COMMAND_ERROR = 'error has occurred while executing command: {0}'
@@ -30,7 +30,7 @@ def retry_if_auth_error(ex):
 
 
 class CommandWrapper:
-    def __init__(self, pv_service, cloud_shell_helper, resource_model_parser, context_based_logger_factory):
+    def __init__(self, pv_service, resource_model_parser, context_based_logger_factory):
         """
 
         :param pv_service:
@@ -41,7 +41,6 @@ def __init__(self, pv_service, cloud_shell_helper, resource_model_parser, contex
         :return:
         """
         self.pv_service = pv_service  # type: pyVmomiService
-        self.cs_helper = cloud_shell_helper  # type: CloudshellDriverHelper
         self.resource_model_parser = resource_model_parser  # type: ResourceModelParser
         self.context_based_logger_factory = context_based_logger_factory  # type ContextBasedLoggerFactory
         # add lock
@@ -78,11 +77,11 @@ def execute_command_with_connection(self, context, command, *args):
 
             # get connection details
             if context:
-                session = self.cs_helper.get_session(server_address=context.connectivity.server_address,
-                                                     token=context.connectivity.admin_auth_token,
-                                                     reservation_domain=self._get_domain(context))
+                with CloudShellSessionContext(context) as cloudshell_session:
+                    session = cloudshell_session
+
                 vcenter_data_model = self.resource_model_parser.convert_to_vcenter_model(context.resource)
-                connection_details = self.cs_helper.get_connection_details(session=session,
+                connection_details = ResourceConnectionDetailsRetriever.get_connection_details(session=session,
                                                                            vcenter_resource_model=vcenter_data_model,
                                                                            resource_context=context.resource)
 

package/cloudshell/cp/vcenter/common/wrappers/command_wrapper.py

@@ -3,25 +3,23 @@
 from cloudshell.cp.vcenter.vm.ovf_image_params import OvfImageParams
 from cloudshell.cp.vcenter.vm.vcenter_details_factory import VCenterDetailsFactory
 from cloudshell.cp.vcenter.common.vcenter.vm_location import VMLocation
-
+from cloudshell.cp.vcenter.common.cloud_shell.conn_details_retriever import ResourceConnectionDetailsRetriever
 
 class VirtualMachineDeployer(object):
-    def __init__(self, pv_service, name_generator, ovf_service, cs_helper, resource_model_parser):
+    def __init__(self, pv_service, name_generator, ovf_service, resource_model_parser):
         """
 
         :param pv_service:
         :type pv_service: cloudshell.cp.vcenter.common.vcenter.vmomi_service.pyVmomiService
         :param name_generator:
         :param ovf_service:
         :type ovf_service: cloudshell.cp.vcenter.common.vcenter.ovf_service.OvfImageDeployerService
-        :param cs_helper:
         :type resource_model_parser: ResourceModelParser
         :return:
         """
         self.pv_service = pv_service
         self.name_generator = name_generator
         self.ovf_service = ovf_service  # type common.vcenter.ovf_service.OvfImageDeployerService
-        self.cs_helper = cs_helper  # type CloudshellDriverHelper
         self.resource_model_parser = resource_model_parser  # type ResourceModelParser
 
     def deploy_from_linked_clone(self, si, logger, data_holder, vcenter_data_model, reservation_id):
@@ -125,7 +123,7 @@ def _deploy_a_clone(self, si, logger, app_name, template_name, other_params, vce
     def deploy_from_image(self, si, logger, session, vcenter_data_model, data_holder, resource_context, reservation_id):
         vm_name = self.name_generator(data_holder.app_name, reservation_id)
 
-        connection_details = self.cs_helper.get_connection_details(session=session,
+        connection_details = ResourceConnectionDetailsRetriever.get_connection_details(session=session,
                                                                    vcenter_resource_model=vcenter_data_model,
                                                                    resource_context=resource_context)
 

package/cloudshell/cp/vcenter/vm/deploy.py

@@ -73,9 +73,6 @@ def setUp(self):
         self.context.remote_endpoints = [self.resource]
         self.command_orchestrator = CommandOrchestrator()
         self.command_orchestrator.command_wrapper.execute_command_with_connection = Mock(return_value=True)
-        self.command_orchestrator.cs_helper = Mock()
-        self.command_orchestrator.cs_helper.get_session = Mock(return_value=session)
-        self.command_orchestrator.cs_helper.get_connection_details = Mock(return_value=self.connection_details)
         self.ports = [Mock()]
         self.command_orchestrator._parse_remote_model = Mock(return_value=remote_resource)
 

package/cloudshell/tests/test_commands/test_command_orchestrator.py

@@ -1,27 +1,25 @@
 from unittest import TestCase
-
 from mock import Mock
-
 from cloudshell.cp.vcenter.common.cloud_shell.conn_details_retriever import ResourceConnectionDetailsRetriever
-
+from  cloudshell.cp.vcenter.models.VMwarevCenterResourceModel import VMwarevCenterResourceModel
 
 class TestConnectionDetailRetriever(TestCase):
     def test_connection_detail_retriever(self):
-        helpers = Mock()
         session = Mock()
         decrypted_password = Mock()
         decrypted_password.Value = 'decrypted password'
         session.DecryptPassword = Mock(return_value=decrypted_password)
         resource_context = Mock()
-        resource_context.attributes = {'User': 'uzer', 'Password': 'password'}
         resource_context.address = '192.168.1.1'
 
-        helpers.get_resource_context_details = Mock(return_value=resource_context)
-        helpers.get_api_session = Mock(return_value=session)
+        vcenter_data_model = VMwarevCenterResourceModel()
+        vcenter_data_model.user = 'uzer'
+        vcenter_data_model.password = 'password'
 
-        retriever = ResourceConnectionDetailsRetriever(helpers)
+        connection_details = ResourceConnectionDetailsRetriever.get_connection_details(session=session,
+                                                                                       vcenter_resource_model=vcenter_data_model,
+                                                                                       resource_context=resource_context)
 
-        connection_details = retriever.connection_details()
 
         self.assertEqual(connection_details.host, '192.168.1.1')
         self.assertEqual(connection_details.username, 'uzer')