More misc. fixes to support labels

cloudbridge/cloud/providers/gce/resources.py

@@ -758,8 +758,7 @@ class GCEMachineImage(BaseMachineImage):
                  .gce_compute
                  .images()
                  .setLabels(project=self._provider.project_name,
-                            zone=self._provider.default_zone,
-                            image=self.name,
+                            resource=self.name,
                             body=request_body)
                  .execute())
         except Exception as e:
@@ -1640,6 +1639,7 @@ class GCERouter(BaseRouter):
                  .gce_compute
                  .routers()
                  .patch(project=self._provider.project_name,
+                        region=self.region_name,
                         router=self.name,
                         body=request_body)
                  .execute())

cloudbridge/cloud/providers/gce/services.py

@@ -416,13 +416,13 @@ class GCEImageService(BaseImageService):
                 return public_image
         return None
 
-    def find(self, name, limit=None, marker=None):
+    def find(self, label, limit=None, marker=None):
         """
         Searches for an image by a given list of attributes
         """
-        filters = {'name': name}
+        filters = {'label': label}
         # Retrieve all available images by setting limit to sys.maxsize
-        images = [image for image in self if image.name == filters['name']]
+        images = [image for image in self if image.label == filters['label']]
         return ClientPagedResultList(self.provider, images,
                                      limit=limit, marker=marker)