Преглед изворни кода

Make sure to iterate across all objects and not just the first page

Nuwan Goonasekera пре 8 година
родитељ
комит
6b70274cdb
1 измењених фајлова са 3 додато и 3 уклоњено
  1. 3 3
      cloudbridge/cloud/providers/openstack/services.py

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

@@ -532,7 +532,7 @@ class OpenStackRegionService(BaseRegionService):
 
 
     def get(self, region_id):
     def get(self, region_id):
         log.debug("Getting OpenStack Region with the id: %s", region_id)
         log.debug("Getting OpenStack Region with the id: %s", region_id)
-        region = (r for r in self.list() if r.id == region_id)
+        region = (r for r in self if r.id == region_id)
         return next(region, None)
         return next(region, None)
 
 
     def list(self, limit=None, marker=None):
     def list(self, limit=None, marker=None):
@@ -846,7 +846,7 @@ class OpenStackSubnetService(BaseSubnetService):
         if network:
         if network:
             network_id = (network.id if isinstance(network, OpenStackNetwork)
             network_id = (network.id if isinstance(network, OpenStackNetwork)
                           else network)
                           else network)
-            subnets = [subnet for subnet in self.list() if network_id ==
+            subnets = [subnet for subnet in self if network_id ==
                        subnet.network_id]
                        subnet.network_id]
         else:
         else:
             subnets = [OpenStackSubnet(self.provider, subnet) for subnet in
             subnets = [OpenStackSubnet(self.provider, subnet) for subnet in
@@ -900,7 +900,7 @@ class OpenStackSubnetService(BaseSubnetService):
                      else subnet)
                      else subnet)
         self.provider.neutron.delete_subnet(subnet_id)
         self.provider.neutron.delete_subnet(subnet_id)
         # Adhere to the interface docs
         # Adhere to the interface docs
-        if subnet_id not in self.list():
+        if subnet_id not in self:
             return True
             return True
         return False
         return False