瀏覽代碼

Address review comments on GCEVolume description.

baizhang 9 年之前
父節點
當前提交
e300d1b25c
共有 1 個文件被更改,包括 11 次插入9 次删除
  1. 11 9
      cloudbridge/cloud/providers/gce/resources.py

+ 11 - 9
cloudbridge/cloud/providers/gce/resources.py

@@ -1311,7 +1311,6 @@ class GCEVolume(BaseVolume):
 
 
     @property
     @property
     def description(self):
     def description(self):
-        self.refresh()
         labels = self._volume.get('labels')
         labels = self._volume.get('labels')
         if not labels or 'description' not in labels:
         if not labels or 'description' not in labels:
             return ''
             return ''
@@ -1319,18 +1318,21 @@ class GCEVolume(BaseVolume):
 
 
     @description.setter
     @description.setter
     def description(self, value):
     def description(self, value):
-        self.refresh()
         request_body = {
         request_body = {
             'labels': {'description': value.replace(' ', '_').lower(),},
             'labels': {'description': value.replace(' ', '_').lower(),},
             'labelFingerprint': self._volume.get('labelFingerprint'),
             'labelFingerprint': self._volume.get('labelFingerprint'),
         }
         }
-        response = (self._provider.gce_compute
-                    .disks()
-                    .setLabels(
-                        project=self._provider.project_name,
-                        zone=self._provider.default_zone,
-                        resource=self.name,
-                        body=request_body).execute())
+        try:
+            response = (self._provider.gce_compute
+                        .disks()
+                        .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 volume description: %s', e)
+        self.refresh()
 
 
     @property
     @property
     def size(self):
     def size(self):