fix potential TypeError
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 17:09:14 +0000 (13:09 -0400)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 22 Jun 2012 17:09:21 +0000 (13:09 -0400)
sfa/openstack/osaggregate.py

index 5d96c51..90fd003 100644 (file)
@@ -146,7 +146,9 @@ class OSAggregate:
     def get_aggregate_nodes(self):
         zones = self.get_availability_zones()
         # available sliver/instance/vm types
-        instances = self.driver.shell.db.instance_type_get_all().values()
+        instances = self.driver.shell.db.instance_type_get_all()
+        if isinstance(instances, dict):
+            instances = instances.values()
         # available images
         image_manager = ImageManager(self.driver)
         disk_images = image_manager.get_available_disk_images()