Improved metadata handling GCE labels

cloudbridge/cloud/providers/gce/resources.py

@@ -6,6 +6,7 @@ import calendar
 import hashlib
 import inspect
 import io
+import logging
 import math
 import re
 import time
@@ -58,6 +59,8 @@ try:
 except NameError:
     from sets import Set as set
 
+log = logging.getLogger(__name__)
+
 
 class GCEKeyPair(BaseKeyPair):
 
@@ -509,6 +512,11 @@ class GCEVMFirewall(BaseVMFirewall):
         for rule in self._rule_container:
             rule.delete()
         self._rule_container.dummy_rule.force_delete()
+        # Remove label
+        tag_name = "_".join(["firewall", self.name, "label"])
+        if not helpers.remove_metadata_item(self._provider, tag_name):
+            log.warning('No label was found associated with this firewall '
+                        '"{}" when deleted.'.format(self.name))
 
     def to_json(self):
         attr = inspect.getmembers(self, lambda a: not(inspect.isroutine(a)))
@@ -1428,53 +1436,6 @@ class GCENetwork(BaseNetwork):
         tag_name = "_".join(["network", self.name, "label"])
         helpers.modify_or_add_metadata_item(self._provider, tag_name, value)
 
-    # @property
-    # def label(self):
-    #     return self._network.get('description')
-
-    # @label.setter
-    # # pylint:disable=arguments-differ
-    # def label(self, value):
-    #     self.assert_valid_resource_label(value)
-    #     body = {'description': value}
-    #     response = (self._provider
-    #                 .gce_compute
-    #                 .networks()
-    #                 .patch(project=self._provider.project_name,
-    #                        network=self.name,
-    #                        body=body)
-    #                 .execute())
-    #     self._provider.wait_for_operation(response)
-    #     self._network['description'] = value
-
-#     @property
-#     def label(self):
-#         labels = self._network.get('labels')
-#         return labels.get('cblabel', '') if labels else ''
-#
-#     @label.setter
-#     # pylint:disable=arguments-differ
-#     def label(self, value):
-#         request_body = {
-#             'labels': {'cblabel': value.replace(' ', '_').lower()},
-#             'labelFingerprint': self._network.get('labelFingerprint'),
-#         }
-#         try:
-#             (self._provider
-#                  .gce_compute
-#                  .networks()
-#                  .setLabels(project=self._provider.project_name,
-#                             zone=self._provider.default_zone,
-#                             resource=self.name,
-#                             body=request_body)
-#                  .execute())
-#         except Exception as e:
-#             cb.log.warning('Exception while setting network label: %s. '
-#                            'Check for invalid characters in label. '
-#                            'Should conform to RFC1035.', e)
-#             raise e
-#         self.refresh()
-
     @property
     def external(self):
         """
@@ -1676,32 +1637,14 @@ class GCERouter(BaseRouter):
 
     @property
     def label(self):
-        return self._router.get('description')
+        tag_name = "_".join(["router", self.name, "label"])
+        return helpers.get_metadata_item_value(self._provider, tag_name)
 
     @label.setter
-    # pylint:disable=arguments-differ
     def label(self, value):
         self.assert_valid_resource_label(value)
-        request_body = {
-            'description': value.replace(' ', '_').lower()
-        }
-        try:
-            response = (self._provider
-                        .gce_compute
-                        .routers()
-                        .patch(project=self._provider.project_name,
-                               region=self.region_name,
-                               router=self.name,
-                               body=request_body)
-                        .execute())
-            self._provider.wait_for_operation(response,
-                                              region=self.region_name)
-        except Exception as e:
-            cb.log.warning('Exception while setting router label: %s. '
-                           'Check for invalid characters in label. '
-                           'Should conform to RFC1035.', e)
-            raise e
-        self.refresh()
+        tag_name = "_".join(["router", self.name, "label"])
+        helpers.modify_or_add_metadata_item(self._provider, tag_name, value)
 
     @property
     def region_name(self):
@@ -1738,13 +1681,19 @@ class GCERouter(BaseRouter):
         return network.subnets
 
     def delete(self):
-        (self._provider
-         .gce_compute
-         .routers()
-         .delete(project=self._provider.project_name,
-                 region=self.region_name,
-                 router=self.name)
-         .execute())
+        operation = (self._provider
+                     .gce_compute
+                     .routers()
+                     .delete(project=self._provider.project_name,
+                             region=self.region_name,
+                             router=self.name)
+                     .execute())
+        self._provider.wait_for_operation(operation, region=self.region_name)
+        # Remove label
+        tag_name = "_".join(["router", self.name, "label"])
+        if not helpers.remove_metadata_item(self._provider, tag_name):
+            log.warning('No label was found associated with this router '
+                        '"{}" when deleted.'.format(self.name))
 
     def attach_subnet(self, subnet):
         if not isinstance(subnet, GCESubnet):

cloudbridge/cloud/providers/gce/services.py

@@ -675,7 +675,9 @@ class GCERouterService(BaseRouterService):
         super(GCERouterService, self).__init__(provider)
 
     def get(self, router_id):
-        return self._get_in_region(router_id)
+        router = self.provider.get_resource(
+            'routers', router_id, region=self.provider.region_name)
+        return GCERouter(self.provider, router) if router else None
 
     def find(self, **kwargs):
         obj_list = self
@@ -720,11 +722,12 @@ class GCERouterService(BaseRouterService):
                         .insert(project=self.provider.project_name,
                                 region=region_name,
                                 body={'name': name,
-                                      'network': network_url,
-                                      'description': label})
+                                      'network': network_url})
                         .execute())
         self.provider.wait_for_operation(response, region=region_name)
-        return self._get_in_region(name, region_name)
+        cb_router = self.get(name)
+        cb_router.label = label
+        return cb_router
 
     def delete(self, router):
         region_name = self.provider.region_name
@@ -859,6 +862,11 @@ class GCESubnetService(BaseSubnetService):
                             subnetwork=subnet.name)
                     .execute())
         self.provider.wait_for_operation(response, region=subnet.region_name)
+        # Remove label
+        tag_name = "_".join(["subnet", subnet.name, "label"])
+        if not helpers.remove_metadata_item(self._provider, tag_name):
+            log.warning('No label was found associated with this subnet '
+                        '"{}" when deleted.'.format(subnet.name))
 
     def _zone_to_region_name(self, zone):
         if zone: