Alex 7 лет назад
Родитель
Сommit
5e30f2e86c

+ 1 - 1
cloudbridge/cloud/providers/azure/azure_client.py

@@ -3,6 +3,7 @@ import logging
 from io import BytesIO
 
 from azure.common.credentials import ServicePrincipalCredentials
+from azure.cosmosdb.table.tableservice import TableService
 from azure.mgmt.compute import ComputeManagementClient
 from azure.mgmt.devtestlabs.models import GalleryImageReference
 from azure.mgmt.network import NetworkManagementClient
@@ -11,7 +12,6 @@ from azure.mgmt.resource.subscriptions import SubscriptionClient
 from azure.mgmt.storage import StorageManagementClient
 from azure.storage.blob import BlobPermissions
 from azure.storage.blob import BlockBlobService
-from azure.storage.table import TableService
 
 from . import helpers as azure_helpers
 

+ 1 - 1
cloudbridge/cloud/providers/azure/provider.py

@@ -34,7 +34,7 @@ class AzureCloudProvider(BaseCloudProvider):
         # optional config values
         self.region_name = self._get_config_value(
             'azure_region_name', os.environ.get('AZURE_REGION_NAME',
-                                                'westuk'))
+                                                'francecentral'))
         self.resource_group = self._get_config_value(
             'azure_resource_group', os.environ.get('AZURE_RESOURCE_GROUP',
                                                    'cloudbridge'))

+ 1 - 9
setup.py

@@ -24,15 +24,7 @@ REQS_BASE = [
     'tenacity>=4.12.0'
 ]
 REQS_AWS = ['boto3']
-REQS_AZURE = ['msrest>=0.4.7',
-              'msrestazure>=0.4.7',
-              'azure-common>=1.1.5',
-              'azure-mgmt-devtestlabs>=1.0.0',
-              'azure-mgmt-resource>=1.0.0rc1',
-              'azure-mgmt-compute>=1.0.0rc1',
-              'azure-mgmt-network>=1.0.0rc1',
-              'azure-mgmt-storage>=1.0.0rc1',
-              'azure-storage>=0.34.0',
+REQS_AZURE = ['azure>=3.0.0',
               'pysftp>=0.2.9']
 REQS_OPENSTACK = [
     'openstacksdk>=0.12.0',

+ 1 - 1
test/helpers/__init__.py

@@ -92,7 +92,7 @@ TEST_DATA_CONFIG = {
     },
     "AzureCloudProvider": {
         "placement":
-            os.environ.get('CB_PLACEMENT_AZURE', 'westuk'),
+            os.environ.get('CB_PLACEMENT_AZURE', 'francecentral'),
         "image":
             os.environ.get('CB_IMAGE_AZURE',
                            'Canonical/UbuntuServer/16.04.0-LTS/latest'),