Browse Source

OSBucketObjectService find fixed

almahmoud 7 years ago
parent
commit
7939473c21

+ 1 - 1
cloudbridge/cloud/base/services.py

@@ -48,7 +48,7 @@ class BaseCloudService(CloudService):
         return self._provider
 
     def _generate_event_name(self, func_name):
-        return ".".join((self.service_name, func_name))
+        return ".".join((self._service_event_name, func_name))
 
     def subscribe(self, func_name, priority, callback,
                   result_callback=False):

+ 3 - 2
cloudbridge/cloud/providers/openstack/services.py

@@ -506,9 +506,10 @@ class OpenStackBucketObjectService(BaseBucketObjectService):
 
     def find(self, bucket, **kwargs):
         _, obj_list = self.provider.swift.get_container(bucket.name)
+        cb_objs = [OpenStackBucketObject(self.provider, bucket, obj)
+                   for obj in obj_list]
         filters = ['name']
-        matches = cb_helpers.generic_find(filters, kwargs, obj_list)
-        self.set_bucket(None)
+        matches = cb_helpers.generic_find(filters, kwargs, cb_objs)
         return ClientPagedResultList(self.provider, list(matches))
 
     def create(self, bucket, object_name):