Tests passing

cloudbridge/cloud/providers/azure/azure_client.py

@@ -21,7 +21,6 @@ IMAGE_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/'
                      '{resourceGroupName}/providers/Microsoft.Compute/'
                      'images/{imageName}',
                      '{imageName}',
-                     '{publisher}/{offer}/{sku}/{version}',
                      '{publisher}:{offer}:{sku}:{version}']
 NETWORK_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/'
                        '{resourceGroupName}/providers/Microsoft.Network'
@@ -341,7 +340,7 @@ class AzureClient(object):
         self.blob_service.delete_blob(container_name, blob_name)
 
     def get_blob_url(self, container_name, blob_name, expiry_time):
-        expiry_date = datetime.datetime.now() + datetime.timedelta(
+        expiry_date = datetime.datetime.utcnow() + datetime.timedelta(
             seconds=expiry_time)
         sas = self.blob_service.generate_blob_shared_access_signature(
             container_name, blob_name, permission=BlobPermissions.READ,

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',
-                                                'francecentral'))
+                                                'northcentralus'))
         self.resource_group = self._get_config_value(
             'azure_resource_group', os.environ.get('AZURE_RESOURCE_GROUP',
                                                    'cloudbridge'))

cloudbridge/cloud/providers/azure/resources.py

@@ -701,7 +701,7 @@ class AzureMachineImage(BaseMachineImage):
     def resource_id(self):
         if isinstance(self._image, GalleryImageReference):
             reference_dict = self._image.as_dict()
-            return '/'.join([reference_dict['publisher'],
+            return ':'.join([reference_dict['publisher'],
                              reference_dict['offer'],
                              reference_dict['sku'],
                              reference_dict['version']])
@@ -1300,7 +1300,12 @@ class AzureInstance(BaseInstance):
         """
         Get the image ID for this instance.
         """
-        return self._vm.storage_profile.image_reference.id
+        # Not tested for resource group images
+        reference_dict = self._vm.storage_profile.image_reference.as_dict()
+        return ':'.join([reference_dict['publisher'],
+                         reference_dict['offer'],
+                         reference_dict['sku'],
+                         reference_dict['version']])
 
     @property
     def zone_id(self):

docs/getting_started.rst

@@ -77,7 +77,7 @@ Azure:
               'azure_secret': 'REPLACE WITH ACTUAL VALUE',
               'azure_tenant': ' REPLACE WITH ACTUAL VALUE'}
     provider = CloudProviderFactory().create_provider(ProviderList.AZURE, config)
-    image_id = 'Canonical/UbuntuServer/16.04.0-LTS/latest'  # Ubuntu 16.04
+    image_id = 'Canonical:UbuntuServer:16.04.0-LTS:latest'  # Ubuntu 16.04
 
 
 List some resources

setup.py

@@ -54,6 +54,7 @@ setup(
     author='Galaxy and GVL Projects',
     author_email='help@genome.edu.au',
     url='http://cloudbridge.cloudve.org/',
+    setup_requires=['nose>=1.0'],
     install_requires=REQS_FULL,
     extras_require={
         ':python_version<"3.3"': ['ipaddress'],

test/helpers/__init__.py

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