Merge lp:~vishvananda/nova/lp723938 into lp:~hudson-openstack/nova/trunk

[Vish Ishaya]

Fixes the describe_availability_zones to use an elevated context when getting services and the db calls to pass parameters correctly so is_admin check works.

[lp:~vishvananda/nova/lp723938]

721. By Vish Ishaya on 2011-02-23

fix describe_availability_zones

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'nova/api/ec2/cloud.py'
--- nova/api/ec2/cloud.py	2011-02-23 19:26:38 +0000
+++ nova/api/ec2/cloud.py	2011-02-23 20:57:34 +0000
@@ -198,8 +198,9 @@
             return self._describe_availability_zones(context, **kwargs)
 
     def _describe_availability_zones(self, context, **kwargs):
-        enabled_services = db.service_get_all(context)
-        disabled_services = db.service_get_all(context, True)
+        ctxt = context.elevated()
+        enabled_services = db.service_get_all(ctxt)
+        disabled_services = db.service_get_all(ctxt, True)
         available_zones = []
         for zone in [service.availability_zone for service
                      in enabled_services]:
 
=== modified file 'nova/db/api.py'
--- nova/db/api.py	2011-02-17 22:14:07 +0000
+++ nova/db/api.py	2011-02-23 20:57:34 +0000
@@ -85,8 +85,8 @@
 
 
 def service_get_all(context, disabled=False):
-    """Get all service."""
-    return IMPL.service_get_all(context, None, disabled)
+    """Get all services."""
+    return IMPL.service_get_all(context, disabled)
 
 
 def service_get_all_by_topic(context, topic):
 
=== modified file 'nova/db/sqlalchemy/api.py'
--- nova/db/sqlalchemy/api.py	2011-02-23 18:11:35 +0000
+++ nova/db/sqlalchemy/api.py	2011-02-23 20:57:34 +0000
@@ -136,15 +136,12 @@
 
 
 @require_admin_context
-def service_get_all(context, session=None, disabled=False):
-    if not session:
-        session = get_session()
-
-    result = session.query(models.Service).\
+def service_get_all(context, disabled=False):
+    session = get_session()
+    return session.query(models.Service).\
                    filter_by(deleted=can_read_deleted(context)).\
                    filter_by(disabled=disabled).\
                    all()
-    return result
 
 
 @require_admin_context