From 2f4e7b732d5cafd09a5a73cbc01583503b8ba105 Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 18 Jan 2011 10:25:40 -0500
Subject: Docstrings aren't guaranteed to exist, so split() can't automatically
 be called on a method without first checking for the method docstring's
 existence. Fixes Bug #704447

---
 nova/api/direct.py | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/direct.py b/nova/api/direct.py
index 81b3ae202..2dfbcae39 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -142,9 +142,15 @@ class Reflection(object):
                 if argspec[2]:
                     args_out.insert(0, ('**%s' % argspec[2],))
 
+                if f.__doc__:
+                    short_doc = f.__doc__.split('\n')[0]
+                    doc = f.__doc__
+                else:
+                    short_doc = doc = _('not available')
+
                 methods['/%s/%s' % (route, k)] = {
-                        'short_doc': f.__doc__.split('\n')[0],
-                        'doc': f.__doc__,
+                        'short_doc': short_doc,
+                        'doc': doc,
                         'name': k,
                         'args': list(reversed(args_out))}
 
-- 
cgit 


From beff00fbe9b9e05e265f3c4ce5b6670426e22de2 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Wed, 19 Jan 2011 11:20:56 -0800
Subject: make sure params have no unicode keys

---
 nova/api/direct.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/direct.py b/nova/api/direct.py
index 81b3ae202..509ab3ae0 100644
--- a/nova/api/direct.py
+++ b/nova/api/direct.py
@@ -196,6 +196,8 @@ class ServiceWrapper(wsgi.Controller):
         # TODO(termie): do some basic normalization on methods
         method = getattr(self.service_handle, action)
 
+        # NOTE(vish): make sure we have no unicode keys for py2.6.
+        params = dict([(str(k), v) for (k, v) in params.iteritems()])
         result = method(context, **params)
         if type(result) is dict or type(result) is list:
             return self._serialize(result, req)
-- 
cgit 


From 36681f096574e5fdab26e6167a39e87df0f92fd4 Mon Sep 17 00:00:00 2001
From: Ryan Lane <rlane@wikimedia.org>
Date: Thu, 20 Jan 2011 01:34:54 +0000
Subject: Passing in an elevated context instead of making the call
 non-elevated.

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c94540793..a64c9fed8 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -133,7 +133,7 @@ class CloudController(object):
         return result
 
     def _get_availability_zone_by_host(self, context, host):
-        services = db.service_get_all_by_host(context, host)
+        services = db.service_get_all_by_host(context.elevated(), host)
         if len(services) > 0:
             return services[0]['availability_zone']
         return 'unknown zone'
-- 
cgit 


From 13b4f32d1995a8c50bcf86786b6ee75d49bea701 Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Thu, 20 Jan 2011 12:52:02 -0500
Subject: i18n's strings that were missed or have been added since initial i18n
 strings branch.

---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index c94540793..f0aa8d813 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -59,7 +59,7 @@ def _gen_key(context, user_id, key_name):
     #             creation before creating key_pair
     try:
         db.key_pair_get(context, user_id, key_name)
-        raise exception.Duplicate("The key_pair %s already exists"
+        raise exception.Duplicate(_("The key_pair %s already exists")
                                   % key_name)
     except exception.NotFound:
         pass
-- 
cgit