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

Unit Tests for Resource Group Create and Get
Reformatted Code
execute.py removed
py27, pypy added to tox.ini
Security Group test issue resolved.

jatin 9 лет назад
Родитель
Сommit
4516c66a5b

+ 9 - 3
cloudbridge/cloud/providers/azure/mock_azure_client.py

@@ -1,5 +1,6 @@
 from azure.mgmt.network.models import NetworkSecurityGroup
 from azure.storage.blob.models import Container
+from azure.mgmt.resource.resources.models import ResourceGroup
 
 class MockAzureClient:
     sec_gr1 = NetworkSecurityGroup()
@@ -19,17 +20,22 @@ class MockAzureClient:
     container2.name = "container2"
     containers = [container1, container2]
 
+    rg = ResourceGroup(location='westus')
+    rg.name = "testResourceGroup"
+
     def __init__(self, provider):
         self._provider = provider
 
-    def list_security_group(self, resource_group_name):
+    def list_security_group(self):
         return self.security_groups
 
     def get_resource_group(self, resource_group_name):
-        return 'Cloudbridge'
+        return self.rg
 
     def create_resource_group(self, resource_group_name, params):
-        return resource_group_name
+        rg = ResourceGroup(location='westus')
+        rg.name = resource_group_name
+        return rg
 
     def get_container(self, container_name):
         for container in self.containers:

+ 0 - 13
execute.py

@@ -1,13 +0,0 @@
-from cloudbridge.cloud.factory import CloudProviderFactory, ProviderList
-
-config = {'azure_subscription_id': '7904d702-e01c-4826-8519-f5a25c866a96',
-          'azure_client_Id': '69621fe1-f59f-43de-8799-269007c76b95',
-          'azure_secret': 'Orcw9U5Kd4cUDntDABg0dygN32RQ4FGBYyLRaJ/BlrM=',
-          'azure_tenant': '75ec242e-054d-4b22-98a9-a4602ebb6027'
-          }
-
-provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
-
-containers = provider.object_store.find('vhds')
-#new_container = provider.object_store.create('mysharedfiles')
-print(len(containers))

+ 2 - 2
test/test_azure_object_store_service.py

@@ -7,6 +7,7 @@ from cloudbridge.cloud.interfaces import TestMockHelperMixin
 from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
+
 class AzureObjectStoreServiceTestCase(ProviderTestBase):
     def __init__(self, methodName, provider):
         super(AzureObjectStoreServiceTestCase, self).__init__(
@@ -28,7 +29,6 @@ class AzureObjectStoreServiceTestCase(ProviderTestBase):
             str(container) == "[<CB-AzureBucket: container1>]",
             "Object find returned value should be container1")
 
-
     @helpers.skipIfNoService(['object_store'])
     def test_azure_bucket_get(self):
-        pass
+        pass

+ 1 - 2
test/test_azure_security_service.py

@@ -7,6 +7,7 @@ from cloudbridge.cloud.interfaces import TestMockHelperMixin
 from test.helpers import ProviderTestBase
 import test.helpers as helpers
 
+
 class AzureSecurityServiceTestCase(ProviderTestBase):
     def __init__(self, methodName, provider):
         super(AzureSecurityServiceTestCase, self).__init__(
@@ -37,5 +38,3 @@ class AzureSecurityServiceTestCase(ProviderTestBase):
         self.assertTrue(
             sgl == None,
             "Security group does not exist. Should return None.")
-
-