Merge branch 'develop' into feature/apiddubny_27_28_deployed_app_mode…

…l_vm_credentionals
QualiSystems · Nov 3, 2016 · 0422e56 · 0422e56
2 parents 3d1d77b + f68850e
commit 0422e56
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 177 deletions.
diff --git a/package/cloudshell/cp/azure/azure_shell.py.orig b/package/cloudshell/cp/azure/azure_shell.py.orig
diff --git a/package/cloudshell/cp/azure/common/operations_helper.py b/package/cloudshell/cp/azure/common/operations_helper.py
@@ -3,8 +3,6 @@
 
 
 class OperationsHelper:
-    def __init__(self):
-        pass
 
     @staticmethod
     def generate_name(name, length=24):

diff --git a/package/tests/test_cp/test_azure/test_common/__init__.py b/package/tests/test_cp/test_azure/test_common/__init__.py
diff --git a/package/tests/test_operations/test_prepare_connectivity.py b/package/tests/test_operations/test_prepare_connectivity.py
@@ -50,7 +50,6 @@ def test_prepare_connectivity(self, operation_helper_class):
         self.storage_service.create_storage_account = MagicMock()
         self.vm_service.create_resource_group = MagicMock()
         self.network_service.get_virtual_networks = MagicMock()
-        self.network_service.create_subnet = MagicMock()
 
         req = MagicMock()
         action = MagicMock()
@@ -61,13 +60,18 @@ def test_prepare_connectivity(self, operation_helper_class):
         req.actions = [action]
         prepare_connectivity_request = req
         # Act
+        result = Mock()
+        result.wait=Mock()
+
+        network_client = MagicMock()
+        network_client.subnets.create_or_update = Mock(return_value=result)
 
         self.prepare_connectivity_operation.prepare_connectivity(
             reservation=MagicMock(),
             cloud_provider_model=MagicMock(),
             storage_client=MagicMock(),
             resource_client=MagicMock(),
-            network_client=MagicMock(),
+            network_client=network_client,
             logger=self.logger,
             request=prepare_connectivity_request)
 
@@ -82,7 +86,7 @@ def test_prepare_connectivity(self, operation_helper_class):
         # key pair created
         self.assertTrue(TestHelper.CheckMethodCalledXTimes(self.key_pair_service.save_key_pair))
         self.assertTrue(TestHelper.CheckMethodCalledXTimes(self.network_service.get_virtual_networks))
-        self.assertTrue(TestHelper.CheckMethodCalledXTimes(self.network_service.create_subnet))
+        self.assertTrue(TestHelper.CheckMethodCalledXTimes(network_client.subnets.create_or_update))
 
     def test_extract_cidr_throws_error(self):
         action = MagicMock()