Просмотр исходного кода

Network delete test case and comments included.

Venkata.Veera 9 лет назад
Родитель
Сommit
4e91b3e77d

+ 10 - 0
azure_test/test_azure_network_service.py

@@ -99,6 +99,16 @@ class AzureNetworkServiceTestCase(ProviderTestBase):
         print("Delete Network Id exist: " + str(isdeleted))
         self.assertEqual(isdeleted, True)
 
+        # Calling get network to make sure network was actually deleted
+        network = self.provider.network \
+            .get('/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96'
+                 '/resourceGroups/CLOUDBRIDGE-AZURE/providers'
+                 '/Microsoft.Network/virtualNetworks/CloudBridgeNet3')
+        print("get does not exist: " + str(network))
+
+        self.assertEqual(
+            str(network), 'None')
+
     @helpers.skipIfNoService(['network'])
     def test_azure_network_service_delete_networkid_does_not_exist(self):
         isdeleted = self.provider.network.delete(

+ 4 - 2
cloudbridge/cloud/providers/azure/mock_azure_client.py

@@ -306,11 +306,13 @@ class MockAzureClient:
                 return network
 
     def delete_network(self, network_name):
+        # Delete network method always returns True
+        # for both the scenarios if network exist or not
         for network in self.networks:
             if network.name == network_name:
                 self.networks.remove(network)
-                return True
-        return False
+
+        return True
 
     def create_resource_group(self, resource_group_name, params):
         rg = ResourceGroup(location='westus')