Removing NotImplementedError for Labels in Azure

cloudbridge/cloud/providers/azure/resources.py

@@ -184,10 +184,6 @@ class AzureVMFirewallRule(BaseVMFirewallRule):
     def name(self):
         return self._rule.name
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure Firewall Rules do not support labels")
-
     @property
     def direction(self):
         return (TrafficDirection.INBOUND if self._rule.direction == "Inbound"
@@ -249,10 +245,6 @@ class AzureBucketObject(BaseBucketObject):
     def name(self):
         return self._key.name
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure Bucket Objects do not support labels")
-
     @property
     def size(self):
         """
@@ -344,10 +336,6 @@ class AzureBucket(BaseBucket):
         """
         return self._bucket.name
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure Buckets do not support labels")
-
     def delete(self, delete_contents=True):
         """
         Delete this bucket.
@@ -1123,11 +1111,6 @@ class AzurePlacementZone(BasePlacementZone):
         """
         return self._azure_region
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure Placement Zones do not support "
-                                  "labels")
-
     @property
     def region_name(self):
         """
@@ -1606,10 +1589,6 @@ class AzureVMType(BaseVMType):
     def name(self):
         return self._vm_type.name
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure VMTypes do not support labels")
-
     @property
     def family(self):
         """
@@ -1664,10 +1643,6 @@ class AzureKeyPair(BaseKeyPair):
     def name(self):
         return self._key_pair.Name
 
-    @property
-    def label(self):
-        raise NotImplementedError("Azure Key Pairs do not support labels")
-
     def delete(self):
         self._provider.azure_client.delete_public_key(self._key_pair)
 

cloudbridge/cloud/providers/azure/services.py

@@ -993,7 +993,7 @@ class AzureSubnetService(BaseSubnetService):
                         net.id
                     ))
                 except CloudError as cloud_error:
-                    if cloud_error.error.error == "ResourceNotFound":
+                    if "NotFound" in cloud_error.error.error:
                         log.exception(cloud_error)
                     else:
                         raise cloud_error