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

Network Service base resource methods added.

Venkata.Veera 9 лет назад
Родитель
Сommit
f17ecaa484
2 измененных файлов с 22 добавлено и 12 удалено
  1. 14 12
      azure_test/test_azure_network_service.py
  2. 8 0
      cloudbridge/cloud/providers/azure/resources.py

+ 14 - 12
azure_test/test_azure_network_service.py

@@ -91,27 +91,29 @@ class AzureNetworkServiceTestCase(ProviderTestBase):
 
 
     @helpers.skipIfNoService(['network'])
     @helpers.skipIfNoService(['network'])
     def test_azure_network_service_delete_networkid_exists(self):
     def test_azure_network_service_delete_networkid_exists(self):
-        network = self.provider.network.delete(
+        isdeleted = self.provider.network.delete(
             '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96'
             '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96'
             '/resourceGroups/CLOUDBRIDGE-AZURE/providers'
             '/resourceGroups/CLOUDBRIDGE-AZURE/providers'
             '/Microsoft.Network/virtualNetworks/CloudBridgeNet3')
             '/Microsoft.Network/virtualNetworks/CloudBridgeNet3')
-        print("Delete Network Id exist: " + str(network))
-        self.assertEqual(network, True)
+
+        print("Delete Network Id exist: " + str(isdeleted))
+        self.assertEqual(isdeleted, True)
 
 
     @helpers.skipIfNoService(['network'])
     @helpers.skipIfNoService(['network'])
-    def test_azure_network_service_delete_networkid_doesnotexist(self):
-        network = self.provider.network \
-            .delete('/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96'
-                    '/resourceGroups/CLOUDBRIDGE-AZURE/providers'
-                    '/Microsoft.Network/virtualNetworks/CloudBridgeNet10')
-        print("Delete Network Id does not exist: " + str(network))
-        self.assertEqual(network, False)
+    def test_azure_network_service_delete_networkid_does_not_exist(self):
+        isdeleted = self.provider.network.delete(
+            '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96'
+            '/resourceGroups/CLOUDBRIDGE-AZURE/providers'
+            '/Microsoft.Network/virtualNetworks/CloudBridgeNet10')
+
+        print("Delete Network Id does not exist: " + str(isdeleted))
+        self.assertEqual(isdeleted, True)
 
 
     @helpers.skipIfNoService(['network'])
     @helpers.skipIfNoService(['network'])
     def test_azure_network_service_delete_with_invaid_networkid_throws(self):
     def test_azure_network_service_delete_with_invaid_networkid_throws(self):
         with self.assertRaises(Exception) as context:
         with self.assertRaises(Exception) as context:
-            network = self.provider.network \
+            isdeleted = self.provider.network \
                 .delete('invalidNetworkId')
                 .delete('invalidNetworkId')
-            print("Delete with invalid network id: " + str(network))
+            print("Delete with invalid network id: " + str(isdeleted))
             self.assertTrue(
             self.assertTrue(
                 'Invalid url parameter passed' in context.exception)
                 'Invalid url parameter passed' in context.exception)

+ 8 - 0
cloudbridge/cloud/providers/azure/resources.py

@@ -861,6 +861,14 @@ class AzureNetwork(BaseNetwork):
         except CloudError:
         except CloudError:
             return False
             return False
 
 
+    def subnets(self):
+        raise NotImplementedError('AzureNetworkService '
+                                  'not implemented this property')
+
+    def create_subnet(self, cidr_block, name=None, zone=None):
+        raise NotImplementedError('AzureNetworkService '
+                                  'not implemented this property')
+
 
 
 class AzureRegion(BaseRegion):
 class AzureRegion(BaseRegion):