From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 19 Jun 2012 01:09:24 +0000 (-0400)
Subject: 'zone_get_all()' has been replaced by 'dnsdomain_list()' in essex release
X-Git-Tag: sfa-2.1-12~51^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=72be71cd34362cc588cd803526ef545c71a02ab8;p=sfa.git

'zone_get_all()' has been replaced by 'dnsdomain_list()' in essex release
---

diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py
index 19a91e89..493c7080 100644
--- a/sfa/openstack/osaggregate.py
+++ b/sfa/openstack/osaggregate.py
@@ -83,7 +83,13 @@ class OSAggregate:
         return rspec.toxml()
 
     def get_availability_zones(self):
-        zones = self.driver.shell.db.zone_get_all()
+        try:
+            # pre essex releases 
+            zones = self.driver.shell.db.zone_get_all()
+        except:
+            # essex release
+            zones = self.driver.shell.db.dnsdomain_list()
+
         if not zones:
             zones = ['cloud']
         else: