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

Ignore all errors when querying AWS resource state

Nuwan Goonasekera 8 лет назад
Родитель
Сommit
6942455dc2
1 измененных файлов с 12 добавлено и 6 удалено
  1. 12 6
      cloudbridge/cloud/providers/aws/resources.py

+ 12 - 6
cloudbridge/cloud/providers/aws/resources.py

@@ -108,7 +108,8 @@ class AWSMachineImage(BaseMachineImage):
         try:
         try:
             return AWSMachineImage.IMAGE_STATE_MAP.get(
             return AWSMachineImage.IMAGE_STATE_MAP.get(
                 self._ec2_image.state, MachineImageState.UNKNOWN)
                 self._ec2_image.state, MachineImageState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return MachineImageState.UNKNOWN
             return MachineImageState.UNKNOWN
 
 
     def refresh(self):
     def refresh(self):
@@ -327,7 +328,8 @@ class AWSInstance(BaseInstance):
         try:
         try:
             return AWSInstance.INSTANCE_STATE_MAP.get(
             return AWSInstance.INSTANCE_STATE_MAP.get(
                 self._ec2_instance.state['Name'], InstanceState.UNKNOWN)
                 self._ec2_instance.state['Name'], InstanceState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return InstanceState.UNKNOWN
             return InstanceState.UNKNOWN
 
 
     def refresh(self):
     def refresh(self):
@@ -441,7 +443,8 @@ class AWSVolume(BaseVolume):
         try:
         try:
             return AWSVolume.VOLUME_STATE_MAP.get(
             return AWSVolume.VOLUME_STATE_MAP.get(
                 self._volume.state, VolumeState.UNKNOWN)
                 self._volume.state, VolumeState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return VolumeState.UNKNOWN
             return VolumeState.UNKNOWN
 
 
     def refresh(self):
     def refresh(self):
@@ -508,7 +511,8 @@ class AWSSnapshot(BaseSnapshot):
         try:
         try:
             return AWSSnapshot.SNAPSHOT_STATE_MAP.get(
             return AWSSnapshot.SNAPSHOT_STATE_MAP.get(
                 self._snapshot.state, SnapshotState.UNKNOWN)
                 self._snapshot.state, SnapshotState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return SnapshotState.UNKNOWN
             return SnapshotState.UNKNOWN
 
 
     def refresh(self):
     def refresh(self):
@@ -899,7 +903,8 @@ class AWSNetwork(BaseNetwork):
         try:
         try:
             return AWSNetwork._NETWORK_STATE_MAP.get(
             return AWSNetwork._NETWORK_STATE_MAP.get(
                 self._vpc.state, NetworkState.UNKNOWN)
                 self._vpc.state, NetworkState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return NetworkState.UNKNOWN
             return NetworkState.UNKNOWN
 
 
     @property
     @property
@@ -974,7 +979,8 @@ class AWSSubnet(BaseSubnet):
         try:
         try:
             return self._SUBNET_STATE_MAP.get(
             return self._SUBNET_STATE_MAP.get(
                 self._subnet.state, SubnetState.UNKNOWN)
                 self._subnet.state, SubnetState.UNKNOWN)
-        except AttributeError:
+        except Exception:
+            # Ignore all exceptions when querying state
             return SubnetState.UNKNOWN
             return SubnetState.UNKNOWN
 
 
     def refresh(self):
     def refresh(self):