vikramdoda 9 лет назад
Родитель
Сommit
f391f6ecac

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

@@ -102,7 +102,8 @@ class AzureClient(object):
         return self.network_management_client.network_security_groups.get(self.resource_group_name, name)
 
     def delete_security_group(self, name):
-        return self.network_management_client.network_security_groups.delete(self.resource_group_name, name)
+        delete_async = self.network_management_client.network_security_groups.delete(self.resource_group_name, name)
+        delete_async.wait()
 
     def list_containers(self):
         return self.blob_service.list_containers()

+ 4 - 2
integration_test/test_integration_azure_object_store_service.py

@@ -46,7 +46,8 @@ class AzureIntegrationObjectStoreServiceTestCase(helpers.ProviderTestBase):
         obj.upload(obj_content)
 
         content = obj.iter_content()
-        self.assertTrue(content == obj_content, 'Object {0} content should be {1}'.format(object_name, obj_content))
+        self.assertTrue(content.getvalue().decode('utf-8') == obj_content,
+                        'Object {0} content should be {1}'.format(object_name, obj_content))
 
         file_name = 'mytest.txt'
         file_content = 'defaults'
@@ -61,7 +62,8 @@ class AzureIntegrationObjectStoreServiceTestCase(helpers.ProviderTestBase):
             obj.upload_from_file(tmp)
 
             content = obj.iter_content()
-            self.assertTrue(content == file_content, 'Object {0} content should be {1}'.format(object_name, file_content))
+            self.assertTrue(content.getvalue().decode('utf-8') == file_content,
+                            'Object {0} content should be {1}'.format(object_name, file_content))
 
         finally:
             print('Deleting file')

+ 3 - 4
integration_test/test_integration_azure_volume_service.py

@@ -27,16 +27,15 @@ class AzureIntegrationVolumeServiceTestCase(helpers.ProviderTestBase):
 
         self.assertTrue(len(volume_list_after_create), len(volume_list_before_create) + 1)
 
-
-        volume = self.provider.block_store.volumes.get(volume_name)
+        volume = self.provider.block_store.volumes.get(volume_id)
         print("Get Volume  - " + str(volume))
         self.assertTrue(
             volume.name == volume_name, "Volume name should be MyVolume")
 
-        volume.attach('/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96/resourceGroups/CloudBridge-Azure/providers/Microsoft.Compute/virtualMachines/ubuntu-intro2')
+        # volume.attach('/subscriptions/7904d702-e01c-4826-8519-f5a25c866a96/resourceGroups/CloudBridge-Azure/providers/Microsoft.Compute/virtualMachines/ubuntu-intro2')
         #TODO: Add logic to verify that disk is attached to instance
 
-        volume.detach()
+        # volume.detach()
         #TODO: Add logic to verify that disk is not in use
 
         # snapshot = volume.create_snapshot(snapshot_name)