Просмотр исходного кода

Review comments

Also removed the wait_for_global_operation method, since the more general
wait_for_operation method is used everywhere.
Ehsan Chiniforooshan 9 лет назад
Родитель
Сommit
dad1f84f0d

+ 0 - 6
cloudbridge/cloud/providers/gce/provider.py

@@ -230,12 +230,6 @@ class GCECloudProvider(BaseCloudProvider):
         response = request.execute()
         return response
 
-    def wait_for_global_operation(self, operation):
-        while True:
-            self.gce_compute.globalOperations().get(
-                project=self.project_name,
-                operation=operation['name']).execute()
-
     def _connect_gcp_storage(self):
         return discovery.build('storage', 'v1', credentials=self._credentials)
 

+ 5 - 1
cloudbridge/cloud/providers/gce/services.py

@@ -735,7 +735,7 @@ class GCENetworkService(BaseNetworkService):
                             .execute())
             if 'error' in response:
                 return None
-            self.provider.wait_for_opeartion(response, region=region)
+            self.provider.wait_for_operation(response, region=region)
             routers = self.routers()
             for router in routers:
                 if router.id == response['targetId']:
@@ -1046,6 +1046,10 @@ class GCSObjectStoreService(BaseObjectStoreService):
             if 'error' in response:
                 # response['error']['code'] is 404 if the bucket does not exist
                 # and 403 if the user does not have permission to access it.
+                if response['error']['code'] not in (403, 404):
+                    cb.log.warning('Unexpected error code (%d) when accessing '
+                                   'bucket %s', response['error']['code'],
+                                   bucket_id)
                 return None
             return GCSBucket(self.provider, response)
         except: