From c9610db6c4d573568bd4b6dc390df99349b0a4ea Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 18 Jan 2011 08:48:50 -0500
Subject: ComputeAPI -> compute.API in bin/nova-direct-api. Fixes LP#704422

---
 bin/nova-direct-api | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nova-direct-api b/bin/nova-direct-api
index e7dd14fb2..173b39bdb 100755
--- a/bin/nova-direct-api
+++ b/bin/nova-direct-api
@@ -49,7 +49,7 @@ if __name__ == '__main__':
     utils.default_flagfile()
     FLAGS(sys.argv)
 
-    direct.register_service('compute', compute_api.ComputeAPI())
+    direct.register_service('compute', compute_api.API())
     direct.register_service('reflect', direct.Reflection())
     router = direct.Router()
     with_json = direct.JsonParamsMiddleware(router)
-- 
cgit 


From 785c5df3d17bb158ef2c1a66ce59ee8e6d4236b1 Mon Sep 17 00:00:00 2001
From: "jaypipes@gmail.com" <>
Date: Tue, 18 Jan 2011 10:24:20 -0500
Subject: Removes circular import issues from bin/stack and replaces
 utils.loads with json.loads. Fixes Bug#704424

---
 bin/stack | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/stack b/bin/stack
index 7a6ce5960..25caca06f 100755
--- a/bin/stack
+++ b/bin/stack
@@ -22,6 +22,7 @@
 import eventlet
 eventlet.monkey_patch()
 
+import json
 import os
 import pprint
 import sys
@@ -38,7 +39,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
 import gflags
-from nova import utils
 
 
 FLAGS = gflags.FLAGS
@@ -106,8 +106,12 @@ def do_request(controller, method, params=None):
                'X-OpenStack-Project': FLAGS.project}
 
     req = urllib2.Request(url, data, headers)
-    resp = urllib2.urlopen(req)
-    return utils.loads(resp.read())
+    try:
+        resp = urllib2.urlopen(req)
+    except urllib2.HTTPError, e:
+        print e.read()
+        sys.exit(1)
+    return json.loads(resp.read())
 
 
 if __name__ == '__main__':
-- 
cgit 


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(-)

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