Azure with gallery images

cloudbridge/cloud/providers/azure/azure_client.py

@@ -36,14 +36,17 @@ PUBLIC_IP_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups' \
                          '{publicIpAddressName}']
 SNAPSHOT_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/' \
                         '{resourceGroupName}/providers/Microsoft.Compute/' \
-                        'snapshots/{snapshotName}', '{snapshotName}']
+                        'snapshots/{snapshotName}',
+                        '{snapshotName}']
 SUBNET_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/' \
                       '{resourceGroupName}/providers/Microsoft.Network' \
                       '/virtualNetworks/{virtualNetworkName}/subnets' \
-                      '/{subnetName}', '{subnetName}']
+                      '/{subnetName}',
+                      '{virtualNetworkName}/{subnetName}']
 VM_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/' \
                   '{resourceGroupName}/providers/Microsoft.Compute/' \
-                  'virtualMachines/{vmName}', '{vmName}']
+                  'virtualMachines/{vmName}',
+                  '{vmName}']
 VM_FIREWALL_RESOURCE_ID = ['/subscriptions/{subscriptionId}/' \
                            'resourceGroups/{resourceGroupName}/' \
                            'providers/Microsoft.Network/' \
@@ -59,7 +62,8 @@ VM_FIREWALL_RULE_RESOURCE_ID = ['/subscriptions/{subscriptionId}/' \
                                 '{securityRuleName}']
 VOLUME_RESOURCE_ID = ['/subscriptions/{subscriptionId}/resourceGroups/' \
                       '{resourceGroupName}/providers/Microsoft.Compute/' \
-                      'disks/{diskName}', '{diskName}']
+                      'disks/{diskName}',
+                      '{diskName}']
 
 IMAGE_NAME = 'imageName'
 NETWORK_NAME = 'virtualNetworkName'
@@ -72,6 +76,12 @@ VM_FIREWALL_NAME = 'networkSecurityGroupName'
 VM_FIREWALL_RULE_NAME = 'securityRuleName'
 VOLUME_NAME = 'diskName'
 
+# Listing possible somewhat through:
+# azure.mgmt.devtestlabs.operations.GalleryImageOperations
+gallery_image_references = \
+['Canonical/UbuntuServer/16.04.0-LTS/latest',
+'Canonical/UbuntuServer/14.04.5-LTS/latest']
+
 
 class AzureClient(object):
     """
@@ -374,13 +384,14 @@ class AzureClient(object):
     def delete_image(self, image_id):
         url_params = azure_helpers.parse_url(IMAGE_RESOURCE_ID,
                                              image_id)
-        if len(url_params) < 3:
+        if len(url_params) <= 3:
             name = url_params.get(IMAGE_NAME)
             self.compute_client.images.delete(self.resource_group, name).wait()
 
     def list_images(self):
         return self.compute_client.images. \
-            list_by_resource_group(self.resource_group)
+            list_by_resource_group(self.resource_group) \
+            + gallery_image_references
 
     def get_image(self, image_id):
         url_params = azure_helpers.parse_url(IMAGE_RESOURCE_ID,
@@ -441,7 +452,7 @@ class AzureClient(object):
 
     def get_network_id_for_subnet(self, subnet_id):
         url_params = azure_helpers.parse_url(SUBNET_RESOURCE_ID, subnet_id)
-        network_id = NETWORK_RESOURCE_ID
+        network_id = NETWORK_RESOURCE_ID[0]
         for key, val in url_params.items():
             network_id = network_id.replace("{" + key + "}", val)
         return network_id

cloudbridge/cloud/providers/azure/resources.py

@@ -681,7 +681,7 @@ class AzureMachineImage(BaseMachineImage):
         else:
             self._state = 'AVAILABLE'
 
-        if not isinstance(image, dict) and not self._image.tags:
+        if not isinstance(self._image, dict) and not self._image.tags:
             self._image.tags = {}
 
     @property
@@ -794,6 +794,13 @@ class AzureMachineImage(BaseMachineImage):
                 # image no longer exists
                 self._state = "unknown"
 
+    def isgalleryimage(self):
+        """
+        Returns true if the image is a public reference and false if it
+        is a private image in the resource group.
+        """
+        return isinstance(self._image, dict)
+
 
 class AzureGatewayContainer(BaseGatewayContainer):
     def __init__(self, provider, network):

cloudbridge/cloud/providers/azure/services.py

@@ -603,15 +603,31 @@ class AzureInstanceService(BaseInstanceService):
     def _create_storage_profile(self, image, launch_config, instance_name,
                                 zone_id):
 
-        storage_profile = {
-            'image_reference': {
-                'id': image.resource_id
-            },
-            "os_disk": {
-                "name": instance_name + '_os_disk',
-                "create_option": DiskCreateOption.from_image
-            },
-        }
+        if image.isgalleryimage:
+            reference = image._image
+            storage_profile = {
+                'image_reference': {
+                    'publisher': reference['publisher'],
+                    'offer': reference['offer'],
+                    'sku': reference['sku'],
+                    'version': reference['version']
+                },
+                "os_disk": {
+                    "name": instance_name + '_os_disk',
+                    "create_option": DiskCreateOption.from_image
+                },
+            }
+
+        else:
+            storage_profile = {
+                'image_reference': {
+                    'id': image.resource_id
+                },
+                "os_disk": {
+                    "name": instance_name + '_os_disk',
+                    "create_option": DiskCreateOption.from_image
+                },
+            }
 
         if launch_config:
             data_disks, root_disk_size = self._process_block_device_mappings(