Merge pull request #779 from QualiSystems/feature/fix_failing_tests

Feature/fix failing tests

Author: GilGald

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

@@ -318,21 +318,16 @@ def refresh_ip(self, context, cancellation_context, ports):
         :param cancellation_context:
         :param list[string] ports: the ports of the connection between the remote resource and the local resource, NOT IN USE!!!
         """
-        self.do_not_run_on_static_vm(context)
-
         resource_details = self._parse_remote_model(context)
         # execute command
         res = self.command_wrapper.execute_command_with_connection(context,
                                                                    self.refresh_ip_command.refresh_ip,
                                                                    resource_details.vm_uuid,
                                                                    resource_details.fullname,
-                                                                   cancellation_context)
+                                                                   cancellation_context,
+                                                                   context.remote_endpoints[0].app_context.app_request_json)
         return set_command_result(result=res, unpicklable=False)
 
-    def do_not_run_on_static_vm(self, context):
-        if context.resource.app_context.deployed_app_json == '' or context.resource.app_context.deployed_app_json == None:
-            raise ValueError('This command cannot be executed on a Static VM.')
-
     # remote command
     def power_off(self, context, ports):
         """

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

@@ -15,7 +15,11 @@ def __init__(self, pyvmomi_service, resource_model_parser, ip_manager):
         self.resource_model_parser = resource_model_parser
         self.ip_manager = ip_manager
 
-    def refresh_ip(self, si, logger, session, vcenter_data_model, vm_uuid, resource_name, cancellation_context):
+    def _do_not_run_on_static_vm(self, app_request_json):
+        if app_request_json == '' or app_request_json is None:
+            raise ValueError('This command cannot be executed on a Static VM.')
+
+    def refresh_ip(self, si, logger, session, vcenter_data_model, vm_uuid, resource_name, cancellation_context,app_request_json):
         """
         Refreshes IP address of virtual machine and updates Address property on the resource
 
@@ -27,7 +31,10 @@ def refresh_ip(self, si, logger, session, vcenter_data_model, vm_uuid, resource_
         :param VMwarevCenterResourceModel vcenter_data_model: the vcenter data model attributes
         :param cancellation_context:
         """
-        default_network = VMLocation.combine([vcenter_data_model.default_datacenter, vcenter_data_model.holding_network])
+        self._do_not_run_on_static_vm(app_request_json=app_request_json)
+
+        default_network = VMLocation.combine(
+            [vcenter_data_model.default_datacenter, vcenter_data_model.holding_network])
 
         resource = session.GetResourceDetails(resource_name)
 
@@ -79,5 +86,3 @@ def _get_custom_param(resource, custom_param_name):
         if custom_param_values:
             return custom_param_values[0]
         return None
-
-

package/cloudshell/tests/test_commands/test_command_orchestrator.py

@@ -38,7 +38,7 @@ def setUp(self):
         self.connection_details = Mock()
         self.context.resource = self.resource
         self.context.resource.app_context = Mock()
-        self.context.resource.app_context.deployed_app_json = "some json"
+        self.context.remote_endpoints = Mock()
         self.context.remote_endpoints = [self.resource]
         self.command_orchestrator = CommandOrchestrator()
         self.command_orchestrator.command_wrapper.execute_command_with_connection = Mock(return_value=True)
@@ -118,13 +118,6 @@ def test_refresh_ip(self):
         # assert
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)
 
-    def test_refresh_ip_should_fail_static_vm(self):
-        # act
-        self.context.resource.app_context.deployed_app_json = None
-        cancellation_context = object()
-        # assert
-        self.assertRaises(ValueError, self.command_orchestrator.refresh_ip,self.context, cancellation_context, self.ports)
-
     def test_get_uuid(self):
         self.command_orchestrator.get_vm_uuid_by_name(self.context, 'Name')
         self.assertTrue(self.command_orchestrator.command_wrapper.execute_command_with_connection.called)

package/cloudshell/tests/test_commands/test_refresh_ip.py

@@ -8,7 +8,6 @@
 
 
 class TestRefreshIpCommand(TestCase):
-
     def test_refresh_ip(self):
         nic1 = Mock()
         nic1.network = 'A Network'
@@ -53,11 +52,12 @@ def test_refresh_ip(self):
         # Act
         refresh_ip_command.refresh_ip(si=si,
                                       session=session,
-                                      vcenter_data_model= center_resource_model,
+                                      vcenter_data_model=center_resource_model,
                                       vm_uuid='machine1',
                                       resource_name='default_network',
                                       cancellation_context=cancellation_context,
-                                      logger=Mock())
+                                      logger=Mock(),
+                                      app_request_json=Mock())
 
         # Assert
         self.assertTrue(session.UpdateResourceAddress.called_with('machine1', '192.168.1.1'))
@@ -119,7 +119,8 @@ def test_refresh_ip_choose_ipv4(self):
             vm_uuid='machine1',
             resource_name='default_network',
             cancellation_context=cancellation_context,
-            logger=Mock())
+            logger=Mock(),
+            app_request_json=Mock())
 
         # Assert
         self.assertTrue(session.UpdateResourceAddress.called_with('machine1', '192.168.1.1'))
@@ -173,7 +174,15 @@ def test_refresh_ip_choose_ip_by_regex(self):
             vm_uuid='machine1',
             resource_name='default_network',
             cancellation_context=cancellation_context,
-            logger=Mock())
+            logger=Mock(),
+            app_request_json=Mock())
 
         # Assert
         self.assertTrue(session.UpdateResourceAddress.called_with('machine1', '192.168.1.1'))
+
+    def test_refresh_ip_should_fail_static_vm(self):
+        # Act
+        refresh_ip_command = RefreshIpCommand(Mock(), Mock(), Mock())
+        # assert
+        self.assertRaises(ValueError, refresh_ip_command.refresh_ip, Mock(), Mock(), Mock(), Mock(), Mock(), Mock(),
+                          Mock(), None)