Azure renaming

cloudbridge/cloud/providers/azure/resources.py

@@ -59,7 +59,7 @@ class AzureVMFirewall(BaseVMFirewall):
 
     @label.setter
     def label(self, value):
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._vm_firewall.tags.update(Label=value)
         self._provider.azure_client.update_vm_firewall_tags(
             self.id, self._vm_firewall.tags)
@@ -469,7 +469,7 @@ class AzureVolume(BaseVolume):
         """
         Set the volume label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._volume.tags.update(Label=value)
         self._provider.azure_client. \
             update_disk_tags(self.id,
@@ -626,7 +626,7 @@ class AzureSnapshot(BaseSnapshot):
         """
         Set the snapshot label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._snapshot.tags.update(Label=value)
         self._provider.azure_client. \
             update_snapshot_tags(self.id,
@@ -750,7 +750,7 @@ class AzureMachineImage(BaseMachineImage):
         Set the image label when it is a private image.
         """
         if not self.is_gallery_image:
-            self.assert_valid_resource_name(value)
+            self.assert_valid_resource_label(value)
             self._image.tags.update(Label=value)
             self._provider.azure_client. \
                 update_image_tags(self.id, self._image.tags)
@@ -896,7 +896,7 @@ class AzureNetwork(BaseNetwork):
         """
         Set the network label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._network.tags.update(Label=value)
         self._provider.azure_client. \
             update_network_tags(self.id, self._network)
@@ -1037,7 +1037,7 @@ class AzureFloatingIP(BaseFloatingIP):
         """
         Set the floating IP label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._ip.tags.update(Label=value)
         self._provider.azure_client. \
             update_fip_tags(self.id, self._ip)
@@ -1284,7 +1284,7 @@ class AzureInstance(BaseInstance):
         """
         Set the instance label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._vm.tags.update(Label=value)
         self._provider.azure_client. \
             update_vm_tags(self.id, self._vm)
@@ -1416,7 +1416,7 @@ class AzureInstance(BaseInstance):
         CloudBridge interface to pass the private key file path
         """
 
-        self.assert_valid_resource_name(name)
+        self.assert_valid_resource_label(name)
 
         if not self._state == 'VM generalized':
             if not self._state == 'VM running':
@@ -1688,7 +1688,7 @@ class AzureRouter(BaseRouter):
         """
         Set the router label.
         """
-        self.assert_valid_resource_name(value)
+        self.assert_valid_resource_label(value)
         self._route_table.tags.update(Label=value)
         self._provider.azure_client. \
             update_route_table_tags(self._route_table.name,

cloudbridge/cloud/providers/azure/services.py

@@ -69,7 +69,7 @@ class AzureVMFirewallService(BaseVMFirewallService):
     def create(self, label=None, description=None, network_id=None):
         parameters = {"location": self.provider.region_name}
         if label:
-            AzureVMFirewall.assert_valid_resource_name(label)
+            AzureVMFirewall.assert_valid_resource_label(label)
             parameters.update({'tags': {'Label': label}})
         else:
             label = "cb-fw"
@@ -175,7 +175,7 @@ class AzureKeyPairService(BaseKeyPairService):
                                      matches if matches else [])
 
     def create(self, name, public_key_material=None):
-        AzureKeyPair.assert_valid_resource_name(name)
+        AzureKeyPair.assert_valid_resource_label(name)
 
         key_pair = self.get(name)
 
@@ -243,7 +243,7 @@ class AzureBucketService(BaseBucketService):
         """
         Create a new bucket.
         """
-        AzureBucket.assert_valid_resource_name(name)
+        AzureBucket.assert_valid_resource_label(name)
         bucket = self.provider.azure_client.create_container(name.lower())
         return AzureBucket(self.provider, bucket)
 
@@ -309,14 +309,14 @@ class AzureVolumeService(BaseVolumeService):
         return ClientPagedResultList(self.provider, cb_vols,
                                      limit=limit, marker=marker)
 
-    def create(self, size, label=None, description=None,
-               zone=None, snapshot=None):
+    def create(self, size, zone=None, label=None, description=None,
+               snapshot=None):
         """
         Creates a new volume.
         """
-        AzureVolume.assert_valid_resource_name(label)
+        AzureVolume.assert_valid_resource_label(label)
         if label:
-            AzureVolume.assert_valid_resource_name(label)
+            AzureVolume.assert_valid_resource_label(label)
             tags = {'Label': label}
         else:
             label = "cb-vol"
@@ -417,7 +417,7 @@ class AzureSnapshotService(BaseSnapshotService):
                   if isinstance(volume, str) else volume)
 
         if label:
-            AzureSnapshot.assert_valid_resource_name(label)
+            AzureSnapshot.assert_valid_resource_label(label)
             tags = {'Label': label}
         else:
             label = "cb-snap"
@@ -486,7 +486,7 @@ class AzureInstanceService(BaseInstanceService):
 
         instance_name = "{0}-{1}".format(prefix, uuid.uuid4().hex[:6])
 
-        AzureInstance.assert_valid_resource_name(instance_name)
+        AzureInstance.assert_valid_resource_label(instance_name)
 
         image = (image if isinstance(image, AzureMachineImage) else
                  self.provider.compute.images.get(image))
@@ -1037,7 +1037,7 @@ class AzureSubnetService(BaseSubnetService):
             if isinstance(network, Network) else network
 
         if prefix:
-            AzureSubnet.assert_valid_resource_name(prefix)
+            AzureSubnet.assert_valid_resource_label(prefix)
 
         else:
             prefix = "cb-sn"
@@ -1118,7 +1118,7 @@ class AzureRouterService(BaseRouterService):
                                      limit=limit, marker=marker)
 
     def create(self, network, label=None):
-        AzureRouter.assert_valid_resource_name(label)
+        AzureRouter.assert_valid_resource_label(label)
         parameters = {"location": self.provider.region_name}
         if label:
             parameters.update(tags={'Label': label})

docs/getting_started.rst

@@ -202,7 +202,6 @@ listed in order to help map each resource with the service that handles it.
     # Key Pair
     kp = provider.security.key_pairs.get('keypair ID')
     kp_list = provider.security.key_pairs.find(name='cloudbridge_intro')
-    kp_list = provider.security.key_pairs.find(label='cloudbridge_intro')
     kp = kp_list[0]
 
     # Network