Using 'provider' prefix for all providers

cloudbridge/cloud/providers/aws/services.py

@@ -309,7 +309,7 @@ class AWSBucketService(BaseBucketService):
                                  cb_resource=AWSBucket,
                                  boto_collection_name='buckets')
 
-    @implement(event_pattern="aws.storage.buckets.get",
+    @implement(event_pattern="provider.storage.buckets.get",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
@@ -339,12 +339,12 @@ class AWSBucketService(BaseBucketService):
         # For all other responses, it's assumed that the bucket does not exist.
         return None
 
-    @implement(event_pattern="aws.storage.buckets.list",
+    @implement(event_pattern="provider.storage.buckets.list",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         return self.svc.list(limit=limit, marker=marker)
 
-    @implement(event_pattern="aws.storage.buckets.create",
+    @implement(event_pattern="provider.storage.buckets.create",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location):
         AWSBucket.assert_valid_resource_name(name)
@@ -379,7 +379,7 @@ class AWSBucketService(BaseBucketService):
                 else:
                     raise
 
-    @implement(event_pattern="aws.storage.buckets.delete",
+    @implement(event_pattern="provider.storage.buckets.delete",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         bucket = self._get(bucket_id)

cloudbridge/cloud/providers/azure/services.py

@@ -396,7 +396,7 @@ class AzureBucketService(BaseBucketService):
     def __init__(self, provider):
         super(AzureBucketService, self).__init__(provider)
 
-    @implement(event_pattern="azure.storage.buckets.get",
+    @implement(event_pattern="provider.storage.buckets.get",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
@@ -410,7 +410,7 @@ class AzureBucketService(BaseBucketService):
             log.exception(error)
             return None
 
-    @implement(event_pattern="azure.storage.buckets.list",
+    @implement(event_pattern="provider.storage.buckets.list",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         buckets = [AzureBucket(self.provider, bucket)
@@ -418,7 +418,7 @@ class AzureBucketService(BaseBucketService):
         return ClientPagedResultList(self.provider, buckets,
                                      limit=limit, marker=marker)
 
-    @implement(event_pattern="azure.storage.buckets.create",
+    @implement(event_pattern="provider.storage.buckets.create",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location=None):
         """
@@ -428,7 +428,7 @@ class AzureBucketService(BaseBucketService):
         bucket = self.provider.azure_client.create_container(name)
         return AzureBucket(self.provider, bucket)
 
-    @implement(event_pattern="azure.storage.buckets.delete",
+    @implement(event_pattern="provider.storage.buckets.delete",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         """

cloudbridge/cloud/providers/gce/services.py

@@ -1131,7 +1131,7 @@ class GCSBucketService(BaseBucketService):
     def __init__(self, provider):
         super(GCSBucketService, self).__init__(provider)
 
-    @implement(event_pattern="gce.storage.buckets.get",
+    @implement(event_pattern="provider.storage.buckets.get",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
@@ -1142,7 +1142,7 @@ class GCSBucketService(BaseBucketService):
         bucket = self.provider.get_resource('buckets', bucket_id)
         return GCSBucket(self.provider, bucket) if bucket else None
 
-    @implement(event_pattern="gce.storage.buckets.find",
+    @implement(event_pattern="provider.storage.buckets.find",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _find(self, name, limit=None, marker=None):
         """
@@ -1152,7 +1152,7 @@ class GCSBucketService(BaseBucketService):
         return ClientPagedResultList(self.provider, buckets, limit=limit,
                                      marker=marker)
 
-    @implement(event_pattern="gce.storage.buckets.list",
+    @implement(event_pattern="provider.storage.buckets.list",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit=None, marker=None):
         """
@@ -1176,7 +1176,7 @@ class GCSBucketService(BaseBucketService):
                                      response.get('nextPageToken'),
                                      False, data=buckets)
 
-    @implement(event_pattern="gce.storage.buckets.create",
+    @implement(event_pattern="provider.storage.buckets.create",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location=None):
         GCSBucket.assert_valid_resource_name(name)
@@ -1203,7 +1203,7 @@ class GCSBucketService(BaseBucketService):
             else:
                 raise
 
-    @implement(event_pattern="gce.storage.buckets.delete",
+    @implement(event_pattern="provider.storage.buckets.delete",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         """

cloudbridge/cloud/providers/openstack/services.py

@@ -411,7 +411,7 @@ class OpenStackBucketService(BaseBucketService):
     def __init__(self, provider):
         super(OpenStackBucketService, self).__init__(provider)
 
-    @implement(event_pattern="openstack.storage.buckets.get",
+    @implement(event_pattern="provider.storage.buckets.get",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _get(self, bucket_id):
         """
@@ -428,7 +428,7 @@ class OpenStackBucketService(BaseBucketService):
             log.debug("Bucket %s was not found.", bucket_id)
             return None
 
-    @implement(event_pattern="openstack.storage.buckets.find",
+    @implement(event_pattern="provider.storage.buckets.find",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _find(self, **kwargs):
         name = kwargs.pop('name', None)
@@ -443,7 +443,7 @@ class OpenStackBucketService(BaseBucketService):
                       if name in c.get("name")]
         return oshelpers.to_server_paged_list(self.provider, cb_buckets)
 
-    @implement(event_pattern="openstack.storage.buckets.list",
+    @implement(event_pattern="provider.storage.buckets.list",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _list(self, limit, marker):
         _, container_list = self.provider.swift.get_account(
@@ -453,7 +453,7 @@ class OpenStackBucketService(BaseBucketService):
                       for c in container_list]
         return oshelpers.to_server_paged_list(self.provider, cb_buckets, limit)
 
-    @implement(event_pattern="openstack.storage.buckets.create",
+    @implement(event_pattern="provider.storage.buckets.create",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _create(self, name, location):
         OpenStackBucket.assert_valid_resource_name(name)
@@ -466,7 +466,7 @@ class OpenStackBucketService(BaseBucketService):
             self.provider.swift.put_container(name)
             return self.get(name)
 
-    @implement(event_pattern="openstack.storage.buckets.delete",
+    @implement(event_pattern="provider.storage.buckets.delete",
                priority=BaseBucketService.STANDARD_EVENT_PRIORITY)
     def _delete(self, bucket_id):
         self.provider.swift.delete_container(bucket_id)