Enis Afgan %!s(int64=6) %!d(string=hai) anos
pai
achega
88bcb50b02
Modificáronse 1 ficheiros con 11 adicións e 6 borrados
  1. 11 6
      cloudbridge/providers/openstack/provider.py

+ 11 - 6
cloudbridge/providers/openstack/provider.py

@@ -293,25 +293,30 @@ class OpenStackCloudProvider(BaseCloudProvider):
         if "networking" in service_name:
             if self.networking.service_zone_name:
                 return self.networking.service_zone_name
-            elif isinstance(self.zone_name, dict) and self.zone_name.get("networking_zone"):
+            elif (isinstance(self.zone_name, dict) and
+                  self.zone_name.get("networking_zone")):
                 return self.zone_name.get("networking_zone")
         elif "security" in service_name:
             if self.security.service_zone_name:
                 return self.security.service_zone_name
-            elif isinstance(self.zone_name, dict) and self.zone_name.get("security_zone"):
+            elif (isinstance(self.zone_name, dict) and
+                  self.zone_name.get("security_zone")):
                 return self.zone_name.get("security_zone")
         elif "compute" in service_name:
             if self.compute.service_zone_name:
                 return self.compute.service_zone_name
-            elif isinstance(self.zone_name, dict) and self.zone_name.get("compute_zone"):
+            elif (isinstance(self.zone_name, dict) and
+                  self.zone_name.get("compute_zone")):
                 return self.zone_name.get("compute_zone")
         elif "storage" in service_name:
             if self.storage.service_zone_name:
                 return self.storage.service_zone_name
-            elif isinstance(self.zone_name, dict) and self.zone_name.get("storage_zone"):
+            elif (isinstance(self.zone_name, dict) and
+                  self.zone_name.get("storage_zone")):
                 return self.zone_name.get("storage_zone")
-        elif isinstance(self.zone_name, dict) and self.zone_name.get("default_zone"):
-                return self.zone_name.get("default_zone")
+        elif (isinstance(self.zone_name, dict) and
+              self.zone_name.get("default_zone")):
+            return self.zone_name.get("default_zone")
         elif isinstance(self.zone_name, str):
             return self.zone_name
         else: