Tests for SG Create and SG rules create and delete added

cloudbridge/cloud/providers/azure/azure_client.py

@@ -182,6 +182,9 @@ class AzureClient(object):
     def get_disk(self, disk_name):
         return self.compute_client.disks.get(self.resource_group_name, disk_name)
 
+    def list_disks(self):
+        return self.compute_client.disks.list()
+
 
 # TODO: find out a better way.
 class FilterList(list):

cloudbridge/cloud/providers/azure/mock_azure_client.py

@@ -69,7 +69,7 @@ class MockAzureClient:
     rg.name = "testResourceGroup"
 
     volume1 = Disk(location='eastus', creation_data=None)
-    volume1.id = 'Volume1'
+    volume1.id = '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96/resourceGroups/CLOUDBRIDGE-AZURE/providers/Microsoft.Compute/disks/Volume1'
     volume1.name = "Volume1"
     volume1.disk_size_gb = 1
     volume1.creation_data = CreationData(create_option=DiskCreateOption.empty)
@@ -77,7 +77,7 @@ class MockAzureClient:
     volume1.owner_id = 'ubuntu-intro1'
 
     volume2 = Disk(location='eastus', creation_data=None)
-    volume2.id = 'Volume2'
+    volume2.id = '/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96/resourceGroups/CLOUDBRIDGE-AZURE/providers/Microsoft.Compute/disks/Volume2'
     volume2.name = "Volume2"
     volume2.disk_size_gb = 1
     volume2.creation_data = CreationData(create_option=DiskCreateOption.empty)
@@ -202,3 +202,6 @@ class MockAzureClient:
             if volume.name == disk_name:
                 return volume
         return None
+
+    def list_disks(self):
+        return self.volumes

cloudbridge/cloud/providers/azure/services.py

@@ -163,7 +163,10 @@ class AzureVolumeService(BaseVolumeService):
         raise NotImplementedError('AzureVolumeService not imeplemented this method')
 
     def list(self, limit=None, marker=None):
-        raise NotImplementedError('AzureVolumeService not imeplemented this method')
+        azure_vols = self.provider.azure_client.list_disks()
+        cb_vols = [AzureVolume(self.provider, vol) for vol in azure_vols]
+        return ClientPagedResultList(self.provider, cb_vols,
+                                     limit=limit, marker=marker)
 
     def create(self, name, size, zone=None, snapshot=None, description=None):
         zone_id = zone.id if isinstance(zone, PlacementZone) else zone

integration_test/test_integration_azure_volume_service.py

@@ -16,17 +16,17 @@ class AzureIntegrationVolumeServiceTestCase(helpers.ProviderTestBase):
         volume_name = '{0}'.format(uuid.uuid4())
         snapshot_name = '{0}'.format(uuid.uuid4())
 
-        # volumes_count1 = len(self.provider.block_store.volumes.list())
+        volume_list_before_create = self.provider.block_store.volumes.list()
+        print(str(len(volume_list_before_create)))
 
         volume = self.provider.block_store.volumes.create(volume_name, 1)
         volume_id= volume.id
-        self.assertTrue(volume is not None , 'Volume {0} not created'.format(volume_name))
 
-        # volumes_count2 = len(self.provider.block_store.volumes.list())
-        # self.assertTrue(volumes_count2 > volumes_count1, 'Volume {0} not present in list'.format(volume_name))
+        volume_list_after_create = self.provider.block_store.volumes.list()
+        print(str(len(volume_list_after_create)))
+
+        self.assertTrue(len(volume_list_after_create), len(volume_list_before_create) + 1)
 
-        # find_volume = self.provider.block_store.volumes.find(volume_name)
-        # self.assertTrue(len(find_volume) == 1, 'Volume {0} not found'.format(volume_name))
 
         volume = self.provider.block_store.volumes.get(volume_name)
         print("Get Volume  - " + str(volume))
@@ -45,6 +45,12 @@ class AzureIntegrationVolumeServiceTestCase(helpers.ProviderTestBase):
         volume.refresh()
         self.assertTrue(volume.id == volume_id, 'Volume id should match on refresh')
 
+        volume_list_before_delete = self.provider.block_store.volumes.list()
+        print(str(len(volume_list_before_delete)))
+
         volume.delete()
-        # deleted_volume = self.provider.block_store.volumes.get(volume.id)
-        # self.assertTrue(deleted_volume is None, 'Volume {0} not deleted'.format(volume_name))
+
+        volume_list_after_delete = self.provider.block_store.volumes.list()
+        print(str(len(volume_list_after_delete)))
+
+        self.assertTrue(len(volume_list_after_delete), len(volume_list_before_delete) - 1)