Updated CB tests for azure

azure_integration_test/helpers.py

@@ -89,6 +89,14 @@ TEST_DATA_CONFIG = {
                                 '842b949c-ea76-48df-998d-8a41f2626243'),
         "instance_type": os.environ.get('CB_INSTANCE_TYPE_OS', 'm1.tiny'),
         "placement": os.environ.get('CB_PLACEMENT_OS', 'nova'),
+    },
+    "AzureCloudProvider": {
+        "placement":
+            os.environ.get('CB_PLACEMENT_AZURE', 'eastus'),
+        "image":
+            os.environ.get('CB_IMAGE_AZURE', 'CbTest-Img'),
+        "instance_type":
+            os.environ.get('CB_INSTANCE_TYPE_AZURE', 'Standard_A0'),
     }
 }
 
@@ -98,6 +106,8 @@ def get_provider_test_data(provider, key):
         return TEST_DATA_CONFIG.get("AWSCloudProvider").get(key)
     elif "OpenStackCloudProvider" in provider.name:
         return TEST_DATA_CONFIG.get("OpenStackCloudProvider").get(key)
+    elif "AzureCloudProvider" in provider.name:
+        return TEST_DATA_CONFIG.get("AzureCloudProvider").get(key)
     return None
 
 
@@ -191,15 +201,26 @@ class ProviderTestBase(unittest.TestCase):
             return 1
 
     def create_provider_instance(self):
-        provider_name = os.environ.get("CB_TEST_PROVIDER", "aws")
+        provider_name = os.environ.get("CB_TEST_PROVIDER", "azure")
         use_mock_drivers = parse_bool(
             os.environ.get("CB_USE_MOCK_PROVIDERS", "False"))
         factory = CloudProviderFactory()
         provider_class = factory.get_provider_class(provider_name,
                                                     get_mock=use_mock_drivers)
-        config = {
-            'default_wait_interval':
-                self.get_provider_wait_interval(provider_class)}
+        config = {'default_wait_interval':
+                  self.get_provider_wait_interval(provider_class),
+                  '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',
+                  'azure_resource_group': 'CB-TEST-RG',
+                  'azure_storage_account': 'cbtestsa',
+                  'azure_vm_default_user_name': 'cbtestuser'
+                  }
         return provider_class(config)
 
     @property

cloudbridge/cloud/providers/azure/azure_client.py

@@ -18,7 +18,7 @@ class AzureClient(object):
         self._config = config
         self.subscription_id = config.get('azure_subscription_id')
         self._credentials = ServicePrincipalCredentials(
-            client_id=config.get('azure_client_Id'),
+            client_id=config.get('azure_client_id'),
             secret=config.get('azure_secret'),
             tenant=config.get('azure_tenant')
         )

cloudbridge/cloud/providers/azure/provider.py

@@ -27,7 +27,7 @@ class AzureCloudProvider(BaseCloudProvider):
             _get_config_value('azure_subscription_id',
                               os.environ.get('AZURE_SUBSCRIPTION_ID', None))
         self.client_Id = self._get_config_value(
-            'azure_client_Id', os.environ.get('AZURE_CLIENT_ID', None))
+            'azure_client_id', os.environ.get('AZURE_CLIENT_ID', None))
         self.secret = self._get_config_value(
             'azure_secret', os.environ.get('AZURE_SECRET', None))
         self.tenant = self._get_config_value(
@@ -88,7 +88,7 @@ class AzureCloudProvider(BaseCloudProvider):
 
             provider_config = {
                 'azure_subscription_id': self.subscription_id,
-                'azure_client_Id': self.client_Id,
+                'azure_client_id': self.client_Id,
                 'azure_secret': self.secret,
                 'azure_tenant': self.tenant,
                 'azure_region_name': self.region_name,

test/helpers.py

@@ -87,8 +87,12 @@ TEST_DATA_CONFIG = {
         "placement": os.environ.get('CB_PLACEMENT_OS', 'nova'),
     },
     "AzureCloudProvider": {
-        "placement": "eastus",
-        "instance_type": "Standard_DS1_v2"
+        "placement":
+            os.environ.get('CB_PLACEMENT_AZURE', 'eastus'),
+        "image":
+            os.environ.get('CB_IMAGE_AZURE', 'CbTest-Img'),
+        "instance_type":
+            os.environ.get('CB_INSTANCE_TYPE_AZURE', 'Standard_DS1_v2'),
     }
 }
 
@@ -193,14 +197,26 @@ class ProviderTestBase(unittest.TestCase):
             return 1
 
     def create_provider_instance(self):
-        provider_name = os.environ.get("CB_TEST_PROVIDER", "aws")
+        provider_name = os.environ.get("CB_TEST_PROVIDER", "azure")
         use_mock_drivers = parse_bool(
-            os.environ.get("CB_USE_MOCK_PROVIDERS", "True"))
+            os.environ.get("CB_USE_MOCK_PROVIDERS", "False"))
         factory = CloudProviderFactory()
         provider_class = factory.get_provider_class(provider_name,
                                                     get_mock=use_mock_drivers)
         config = {'default_wait_interval':
-                  self.get_provider_wait_interval(provider_class)}
+                  self.get_provider_wait_interval(provider_class),
+                  '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',
+                  'azure_resource_group': 'CB-TEST-RG',
+                  'azure_storage_account': 'cbtestsa',
+                  'azure_vm_default_user_name': 'cbtestuser'
+                  }
         return provider_class(config)
 
     @property