From 7f2cae4d63d1fb9c351d88ad911166f55e89c2f4 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:01:21 +0000
Subject: fixed up openstack api images index and detail

---
 nova/api/openstack/images.py | 58 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 46 insertions(+), 12 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4a0a8e6f1..3a9bdea64 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -27,6 +27,40 @@ from nova.api.openstack import faults
 
 FLAGS = flags.FLAGS
 
+def _entity_list(entities):
+    """ Coerces a list of images into proper dictionary format
+        entities is a list of entities (dicts) """
+    return dict(images=entities)
+
+def _entity_detail(inst):
+    """ Maps everything to Rackspace-like attributes for return
+        also pares down attributes to those we want
+        inst is a single entity (dict) """
+    status_mapping = {
+        'pending': 'queued',
+        'decrypting': 'preparing',
+        'untarring': 'saving',
+        'available': 'active',
+    new_inst = {}
+    mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
+
+    for k,v in mapped_keys.iteritems():
+        new_inst[k] = inst[v]
+
+    new_inst['status'] = status_mapping[inew_inst['status']]
+
+    return new_inst
+
+def _entity_inst(inst):
+    """ Filters all model attributes save for id and name
+        inst is a single entity (dict) """
+    return _filter_keys(inst, ['id','name'])
+
+def _filter_keys(inst, keys):
+    """ Filters all model attributes for keys
+        inst is a single entity (dict) """
+    return dict( (k,v) for k,v in inst.iteritems() if k in keys)
+
 
 class Controller(wsgi.Controller):
 
@@ -40,24 +74,24 @@ class Controller(wsgi.Controller):
         self._service = utils.import_object(FLAGS.image_service)
 
     def index(self, req):
-        """Return all public images in brief."""
-        return dict(images=[dict(id=img['id'], name=img['name'])
-                            for img in self.detail(req)['images']])
+        """ Return all public images in brief """
+        items = self._service.index(req.environ['nova.context'])
+        items = nova.api.openstack.limited(items, req)
+        items = [_entity_inst(item) for item in items]
+        return dict(images=items)
 
     def detail(self, req):
-        """Return all public images in detail."""
+        """ Return all public images in detail """
         try:
-            images = self._service.detail(req.environ['nova.context'])
-            images = nova.api.openstack.limited(images, req)
+            items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
-            # Emulate detail() using repeated calls to show()
-            images = self._service.index(ctxt)
-            images = nova.api.openstack.limited(images, req)
-            images = [self._service.show(ctxt, i['id']) for i in images]
-        return dict(images=images)
+            items = self._service.index(req.environ['nova.context'])
+        items = nova.api.openstack.limited(items, req)
+        items = [_entity_detail(item) for item in items]
+        return dict(images=items)
 
     def show(self, req, id):
-        """Return data about the given image id."""
+        """ Return data about the given image id """
         return dict(image=self._service.show(req.environ['nova.context'], id))
 
     def delete(self, req, id):
-- 
cgit 


From 7b0c5b3f06328ec9dbb02b2def306d671353354e Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:09:25 +0000
Subject: typo

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 3a9bdea64..78c07abde 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -40,7 +40,7 @@ def _entity_detail(inst):
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
-        'available': 'active',
+        'available': 'active'}
     new_inst = {}
     mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
 
-- 
cgit 


From fc1354a639edb1c3a7f979f58bb90918c63695ab Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 16 Dec 2010 18:17:53 +0000
Subject: fixed a couple of more syntax errors

---
 nova/api/openstack/images.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 78c07abde..7f2be5472 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -41,15 +41,15 @@ def _entity_detail(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    new_inst = {}
-    mapped_keys = {status:'imageState', id:'imageId', name:'imageLocation'}
+    mapped_inst = {}
+    mapped_keys = {'status':'imageState', 'id':'imageId', 'name':'imageLocation'}
 
     for k,v in mapped_keys.iteritems():
-        new_inst[k] = inst[v]
+        mapped_inst[k] = inst[v]
 
-    new_inst['status'] = status_mapping[inew_inst['status']]
+    mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
-    return new_inst
+    return mapped_inst
 
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
-- 
cgit 


From d71b9a34c3f76f95227da0f7a746cc5a1a76da24 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Sun, 19 Dec 2010 23:51:17 +0000
Subject: small clean up

---
 nova/api/openstack/images.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 7f2be5472..df5e1530f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -41,9 +41,14 @@ def _entity_detail(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst = {}
-    mapped_keys = {'status':'imageState', 'id':'imageId', 'name':'imageLocation'}
 
+    # TODO(tr3buchet): this map is specific to s3 object store,
+    # fix once the local image service is working
+    mapped_keys = {'status':'imageState',
+                   'id':'imageId',
+                   'name':'imageLocation'}
+
+    mapped_inst = {}
     for k,v in mapped_keys.iteritems():
         mapped_inst[k] = inst[v]
 
@@ -54,9 +59,9 @@ def _entity_detail(inst):
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
         inst is a single entity (dict) """
-    return _filter_keys(inst, ['id','name'])
+    return _select_keys(inst, ['id','name'])
 
-def _filter_keys(inst, keys):
+def _select_keys(inst, keys):
     """ Filters all model attributes for keys
         inst is a single entity (dict) """
     return dict( (k,v) for k,v in inst.iteritems() if k in keys)
-- 
cgit 


From b5756f6abf582b04a5fe6744d6a139b12440e35a Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 20 Dec 2010 21:12:20 +0000
Subject: fixed some pep8 business

---
 nova/api/openstack/images.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index df5e1530f..0f808a6bf 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -27,11 +27,13 @@ from nova.api.openstack import faults
 
 FLAGS = flags.FLAGS
 
+
 def _entity_list(entities):
     """ Coerces a list of images into proper dictionary format
         entities is a list of entities (dicts) """
     return dict(images=entities)
 
+
 def _entity_detail(inst):
     """ Maps everything to Rackspace-like attributes for return
         also pares down attributes to those we want
@@ -44,27 +46,29 @@ def _entity_detail(inst):
 
     # TODO(tr3buchet): this map is specific to s3 object store,
     # fix once the local image service is working
-    mapped_keys = {'status':'imageState',
-                   'id':'imageId',
-                   'name':'imageLocation'}
+    mapped_keys = {'status': 'imageState',
+                   'id': 'imageId',
+                   'name': 'imageLocation'}
 
     mapped_inst = {}
-    for k,v in mapped_keys.iteritems():
+    for k, v in mapped_keys.iteritems():
         mapped_inst[k] = inst[v]
 
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
     return mapped_inst
 
+
 def _entity_inst(inst):
     """ Filters all model attributes save for id and name
         inst is a single entity (dict) """
-    return _select_keys(inst, ['id','name'])
+    return _select_keys(inst, ['id', 'name'])
+
 
 def _select_keys(inst, keys):
     """ Filters all model attributes for keys
         inst is a single entity (dict) """
-    return dict( (k,v) for k,v in inst.iteritems() if k in keys)
+    return dict((k, v) for k, v in inst.iteritems() if k in keys)
 
 
 class Controller(wsgi.Controller):
-- 
cgit 


From aded4faba96e4de88f0294604927ef824cb249be Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 20 Dec 2010 22:55:11 +0000
Subject: added suspend and resume

---
 nova/api/openstack/__init__.py |  2 ++
 nova/api/openstack/servers.py  | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index 210df8d24..2553313e4 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -176,6 +176,8 @@ class APIRouter(wsgi.Router):
             logging.debug("Including admin operations in API.")
             server_members['pause'] = 'POST'
             server_members['unpause'] = 'POST'
+            server_members['suspend'] = 'POST'
+            server_members['resume'] = 'POST'
 
         mapper.resource("server", "servers", controller=servers.Controller(),
                         collection={'detail': 'GET'},
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 5c3322f7c..e6700ee96 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -195,3 +195,25 @@ class Controller(wsgi.Controller):
             logging.error("Compute.api::unpause %s", readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
+
+    def suspend(self, req, id):
+        """permit admins to suspend the server"""
+        context = req.environ['nova.context']
+        try:
+            self.compute_api.suspend(context, id)
+        except:
+            readable = traceback.format_exc()
+            logging.error("compute.api::suspend %s", readable)
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+        return exc.HTTPAccepted()
+
+    def resume(self, req, id):
+        """permit admins to resume the server from suspend"""
+        context = req.environ['nova.context']
+        try:
+            self.compute_api.resume(context, id)
+        except:
+            readable = traceback.format_exc()
+            logging.error("compute.api::resume %s", readable)
+            return faults.Fault(exc.HTTPUnprocessableEntity())
+        return exc.HTTPAccepted()
-- 
cgit 


From 62286399b69218418020baaf524292c1677d27d3 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 06:48:15 +0000
Subject: added suspend as a power state

---
 nova/api/openstack/servers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index e6700ee96..9ee52ef2f 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -45,7 +45,8 @@ def _entity_detail(inst):
         power_state.NOSTATE: 'build',
         power_state.RUNNING: 'active',
         power_state.BLOCKED: 'active',
-        power_state.PAUSED: 'suspended',
+        power_state.SUSPENDED: 'suspended',
+        power_state.PAUSED: 'error',
         power_state.SHUTDOWN: 'active',
         power_state.SHUTOFF: 'active',
         power_state.CRASHED: 'error'}
-- 
cgit 


From a0ca9d4a9550370cc262574fbee097e5b70e408d Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 20:35:16 +0000
Subject: added _() for gettext and a couple of pep8s

---
 nova/api/openstack/servers.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 9ee52ef2f..d3e5badea 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -182,7 +182,7 @@ class Controller(wsgi.Controller):
             self.compute_api.pause(ctxt, id)
         except:
             readable = traceback.format_exc()
-            logging.error("Compute.api::pause %s", readable)
+            logging.error(_("Compute.api::pause %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -193,7 +193,7 @@ class Controller(wsgi.Controller):
             self.compute_api.unpause(ctxt, id)
         except:
             readable = traceback.format_exc()
-            logging.error("Compute.api::unpause %s", readable)
+            logging.error(_("Compute.api::unpause %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -204,7 +204,7 @@ class Controller(wsgi.Controller):
             self.compute_api.suspend(context, id)
         except:
             readable = traceback.format_exc()
-            logging.error("compute.api::suspend %s", readable)
+            logging.error(_("compute.api::suspend %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
@@ -215,6 +215,6 @@ class Controller(wsgi.Controller):
             self.compute_api.resume(context, id)
         except:
             readable = traceback.format_exc()
-            logging.error("compute.api::resume %s", readable)
+            logging.error(_("compute.api::resume %s"), readable)
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
-- 
cgit 


From 8e1122997867a16c161954004b5f1722282a97ef Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 21:45:01 +0000
Subject: fixed error occuring when tests used glance attributes, fixed
 docstrings

---
 nova/api/openstack/images.py | 51 +++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 15 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 0f808a6bf..4f16b0ed4 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -29,15 +29,21 @@ FLAGS = flags.FLAGS
 
 
 def _entity_list(entities):
-    """ Coerces a list of images into proper dictionary format
-        entities is a list of entities (dicts) """
+    """
+    Coerces a list of images into proper dictionary format
+    entities is a list of entities (dicts)
+
+    """
     return dict(images=entities)
 
 
 def _entity_detail(inst):
-    """ Maps everything to Rackspace-like attributes for return
-        also pares down attributes to those we want
-        inst is a single entity (dict) """
+    """
+    Maps everything to Rackspace-like attributes for return
+    also pares down attributes to those we want
+    inst is a single entity (dict)
+
+    """
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
@@ -45,14 +51,23 @@ def _entity_detail(inst):
         'available': 'active'}
 
     # TODO(tr3buchet): this map is specific to s3 object store,
-    # fix once the local image service is working
+    # replace with a list of keys for _select_keys later
     mapped_keys = {'status': 'imageState',
                    'id': 'imageId',
                    'name': 'imageLocation'}
 
     mapped_inst = {}
-    for k, v in mapped_keys.iteritems():
-        mapped_inst[k] = inst[v]
+    # TODO(tr3buchet):
+    # this chunk of code works with s3 and the local image service/glance
+    # when we switch to glance/local image service it can be replaced with
+    # a call to _select_keys, and mapped_keys can be changed to a list
+    try:
+        for k, v in mapped_keys.iteritems():
+            # map s3 fields
+            mapped_inst[k] = inst[v]
+    except KeyError:
+        mapped_inst = _select_keys(inst, mapped_keys.keys())
+
 
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
@@ -60,14 +75,20 @@ def _entity_detail(inst):
 
 
 def _entity_inst(inst):
-    """ Filters all model attributes save for id and name
-        inst is a single entity (dict) """
+    """
+    Filters all model attributes save for id and name
+    inst is a single entity (dict)
+
+    """
     return _select_keys(inst, ['id', 'name'])
 
 
 def _select_keys(inst, keys):
-    """ Filters all model attributes for keys
-        inst is a single entity (dict) """
+    """
+    Filters all model attributes except for keys
+    inst is a single entity (dict)
+
+    """
     return dict((k, v) for k, v in inst.iteritems() if k in keys)
 
 
@@ -83,14 +104,14 @@ class Controller(wsgi.Controller):
         self._service = utils.import_object(FLAGS.image_service)
 
     def index(self, req):
-        """ Return all public images in brief """
+        """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
         items = nova.api.openstack.limited(items, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
     def detail(self, req):
-        """ Return all public images in detail """
+        """Return all public images in detail"""
         try:
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
@@ -100,7 +121,7 @@ class Controller(wsgi.Controller):
         return dict(images=items)
 
     def show(self, req, id):
-        """ Return data about the given image id """
+        """Return data about the given image id"""
         return dict(image=self._service.show(req.environ['nova.context'], id))
 
     def delete(self, req, id):
-- 
cgit 


From 1c26d2b2ce824dbc64525eea699efbfa8bf04617 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 21:48:14 +0000
Subject: updated since dietz moved the limited function

---
 nova/api/openstack/images.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 4f16b0ed4..132afc5fc 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -106,7 +106,7 @@ class Controller(wsgi.Controller):
     def index(self, req):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
-        items = nova.api.openstack.limited(items, req)
+        items = common.limited(images, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
@@ -116,7 +116,7 @@ class Controller(wsgi.Controller):
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
-        items = nova.api.openstack.limited(items, req)
+        items = common.limited(images, req)
         items = [_entity_detail(item) for item in items]
         return dict(images=items)
 
-- 
cgit 


From 6df8d6827d48572ba4cc7cf13fd69286f0dcafe1 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Thu, 23 Dec 2010 22:00:44 +0000
Subject: fixed typo

---
 nova/api/openstack/images.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 515fd4423..787e23acc 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -108,7 +108,7 @@ class Controller(wsgi.Controller):
     def index(self, req):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
-        items = common.limited(images, req)
+        items = common.limited(items, req)
         items = [_entity_inst(item) for item in items]
         return dict(images=items)
 
@@ -118,7 +118,7 @@ class Controller(wsgi.Controller):
             items = self._service.detail(req.environ['nova.context'])
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
-        items = common.limited(images, req)
+        items = common.limited(items, req)
         items = [_entity_detail(item) for item in items]
         return dict(images=items)
 
-- 
cgit 


From 59c3e5bf0dda0c0c1b77307a339f3102c7179885 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Thu, 23 Dec 2010 18:09:52 -0600
Subject: Faked out handling for shared ip groups so they return something

---
 nova/api/openstack/ratelimiting/__init__.py |  4 ++--
 nova/api/openstack/sharedipgroups.py        | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/ratelimiting/__init__.py b/nova/api/openstack/ratelimiting/__init__.py
index 91a8b2e55..cbb4b897e 100644
--- a/nova/api/openstack/ratelimiting/__init__.py
+++ b/nova/api/openstack/ratelimiting/__init__.py
@@ -64,9 +64,9 @@ class RateLimitingMiddleware(wsgi.Middleware):
         If the request should be rate limited, return a 413 status with a
         Retry-After header giving the time when the request would succeed.
         """
-        return self.limited_request(req, self.application)
+        return self.rate_limited_request(req, self.application)
 
-    def limited_request(self, req, application):
+    def rate_limited_request(self, req, application):
         """Rate limit the request.
 
         If the request should be rate limited, return a 413 status with a
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 75d02905c..4f4bb1016 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -15,6 +15,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from webob import exc
+
 from nova import wsgi
 
 
@@ -22,19 +24,25 @@ class Controller(wsgi.Controller):
     """ The Shared IP Groups Controller for the Openstack API """
 
     def index(self, req):
-        raise NotImplementedError
+        """ Returns a list of Shared IP Groups for the user """
+        return dict(sharedipgroups=[])
 
     def show(self, req, id):
-        raise NotImplementedError
+        """ Shows in-depth information on a specific Shared IP Group """
+        return dict(sharedipgroup={})
 
     def update(self, req, id):
-        raise NotImplementedError
+        """ You can't update a Shared IP Group """
+        raise faults.Fault(exc.HTTPNotImplemented())
 
     def delete(self, req, id):
-        raise NotImplementedError
+        """ Deletes a Shared IP Group """
+        raise faults.Fault(exc.HTTPNotFound())
 
-    def detail(self, req):
-        raise NotImplementedError
+    def detail(self, req, id):
+        """ Returns a complete list of Shared IP Groups """
+        return dict(sharedipgroups=[]) 
 
     def create(self, req):
-        raise NotImplementedError
+        """ Creates a new Shared IP group """
+        raise faults.Fault(exc.HTTPNotFound())
-- 
cgit 


From 4b271b9e25ac2573cbb82f4b89434d608a91a8c7 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 16:41:41 +0000
Subject: couple of pep8s

---
 nova/api/openstack/images.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 787e23acc..e848a2e3e 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -70,7 +70,6 @@ def _entity_detail(inst):
     except KeyError:
         mapped_inst = _select_keys(inst, mapped_keys.keys())
 
-
     mapped_inst['status'] = status_mapping[mapped_inst['status']]
 
     return mapped_inst
-- 
cgit 


From 3490fde00fd8bfb00834b1085de62d86c9c9d061 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 12:08:22 -0600
Subject: A few fixes

---
 nova/api/openstack/backup_schedules.py | 5 ++++-
 nova/api/openstack/servers.py          | 3 ++-
 nova/api/openstack/sharedipgroups.py   | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index fc70b5c6c..c484023e0 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -24,12 +24,14 @@ import nova.image.service
 
 
 class Controller(wsgi.Controller):
+    """ The backup schedule API controller for the Openstack API """
 
     def __init__(self):
         pass
 
     def index(self, req, server_id):
-        return faults.Fault(exc.HTTPNotFound())
+        """ Returns the list of backup schedules for a given instance """
+        return dict(backup_schedules=[])
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
@@ -37,4 +39,5 @@ class Controller(wsgi.Controller):
         return faults.Fault(exc.HTTPNotFound())
 
     def delete(self, req, server_id, id):
+        """ Deletes an existing backup schedule """
         return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 8d60e2cab..c8851387d 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -43,6 +43,7 @@ def _entity_list(entities):
 def _entity_detail(inst):
     """ Maps everything to Rackspace-like attributes for return"""
     power_mapping = {
+        None: 'build',
         power_state.NOSTATE: 'build',
         power_state.RUNNING: 'active',
         power_state.BLOCKED: 'active',
@@ -153,7 +154,7 @@ class Controller(wsgi.Controller):
 
         try:
             self.compute_api.update_instance(req.environ['nova.context'],
-                                             instance['id'],
+                                             inst_dict['id'],
                                              **update_dict)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 4f4bb1016..7e98b0712 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -18,6 +18,7 @@
 from webob import exc
 
 from nova import wsgi
+from nova.api.openstack import faults
 
 
 class Controller(wsgi.Controller):
-- 
cgit 


From b879c746049241837af3785adc3068fbe35f199d Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 13:20:37 -0600
Subject: backup schedule changes

---
 nova/api/openstack/__init__.py         |  2 +-
 nova/api/openstack/backup_schedules.py | 10 +++++++++-
 nova/api/openstack/servers.py          |  6 ++++--
 nova/api/openstack/sharedipgroups.py   | 27 ++++++++++++++++++++++++---
 4 files changed, 38 insertions(+), 7 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/__init__.py b/nova/api/openstack/__init__.py
index c49399f28..1f78820c8 100644
--- a/nova/api/openstack/__init__.py
+++ b/nova/api/openstack/__init__.py
@@ -98,7 +98,7 @@ class APIRouter(wsgi.Router):
                         collection={'detail': 'GET'},
                         member=server_members)
 
-        mapper.resource("backup_schedule", "backup_schedules",
+        mapper.resource("backup_schedule", "backup_schedule",
                         controller=backup_schedules.Controller(),
                         parent_resource=dict(member_name='server',
                         collection_name='servers'))
diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index c484023e0..a8b0fbbb9 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -22,16 +22,24 @@ from nova import wsgi
 from nova.api.openstack import faults
 import nova.image.service
 
+def _entity_inst(inst):
+    """ Coerces the backup schedule into proper dictionary format """
+    return dict(backupSchedule=inst)
 
 class Controller(wsgi.Controller):
     """ The backup schedule API controller for the Openstack API """
 
+    _serialization_metadata = {
+        'application/xml': {
+            'attributes': {
+                'backupSchedule': []}}}
+
     def __init__(self):
         pass
 
     def index(self, req, server_id):
         """ Returns the list of backup schedules for a given instance """
-        return dict(backup_schedules=[])
+        return _entity_inst({})
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index c8851387d..7abf5ec53 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -153,8 +153,10 @@ class Controller(wsgi.Controller):
             update_dict['display_name'] = inst_dict['server']['name']
 
         try:
-            self.compute_api.update_instance(req.environ['nova.context'],
-                                             inst_dict['id'],
+            ctxt = req.environ['nova.context']
+            inst_ref = self.compute_api.get_instance(ctxt, id)
+            self.compute_api.update_instance(ctxt,
+                                             id,
                                              **update_dict)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 7e98b0712..32ebfa45a 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -21,16 +21,37 @@ from nova import wsgi
 from nova.api.openstack import faults
 
 
+def _entity_list(entities):
+    """ Coerces a list of shared IP groups into proper dictionary format """
+    return dict(sharedIpGroups=entities)
+
+
+def _entity_inst(inst):
+    """ Coerces a shared IP group instance into proper dictionary format """
+    return dict(sharedIpGroup=inst)
+
+
+def _entity_detail(inst):
+    """ Coerces a shared IP group instance into proper dictionary format with
+    correctly mapped attributes """
+    return dict(sharedIpGroup=inst)
+
+
 class Controller(wsgi.Controller):
     """ The Shared IP Groups Controller for the Openstack API """
 
+    _serialization_metadata = {
+        'application/xml': {
+            'attributes': {
+                'sharedIpGroup': []}}}
+
     def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
-        return dict(sharedipgroups=[])
+        return _entity_list([])
 
     def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
-        return dict(sharedipgroup={})
+        return _entity_inst({})
 
     def update(self, req, id):
         """ You can't update a Shared IP Group """
@@ -42,7 +63,7 @@ class Controller(wsgi.Controller):
 
     def detail(self, req, id):
         """ Returns a complete list of Shared IP Groups """
-        return dict(sharedipgroups=[]) 
+        return _entity_detail({})
 
     def create(self, req):
         """ Creates a new Shared IP group """
-- 
cgit 


From d2ec717f7f819503f977c7a6f35e96867cc6c512 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:06:45 +0000
Subject: renaming things to be a bit more descriptive

---
 nova/api/openstack/images.py | 60 +++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 31 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index e848a2e3e..ea22b07ba 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -30,30 +30,18 @@ from nova.api.openstack import faults
 FLAGS = flags.FLAGS
 
 
-def _entity_list(entities):
+def _translate_keys(inst):
     """
-    Coerces a list of images into proper dictionary format
-    entities is a list of entities (dicts)
-
-    """
-    return dict(images=entities)
-
-
-def _entity_detail(inst):
-    """
-    Maps everything to Rackspace-like attributes for return
+    Maps key names to Rackspace-like attributes for return
     also pares down attributes to those we want
-    inst is a single entity (dict)
+    inst is a single item (dict)
 
-    """
-    status_mapping = {
-        'pending': 'queued',
-        'decrypting': 'preparing',
-        'untarring': 'saving',
-        'available': 'active'}
+    Note: should be removed when the set of keys expected by the api
+    and the set of keys returned by the image service are equivalent
 
+    """
     # TODO(tr3buchet): this map is specific to s3 object store,
-    # replace with a list of keys for _select_keys later
+    # replace with a list of keys for _filter_keys later
     mapped_keys = {'status': 'imageState',
                    'id': 'imageId',
                    'name': 'imageLocation'}
@@ -62,32 +50,41 @@ def _entity_detail(inst):
     # TODO(tr3buchet):
     # this chunk of code works with s3 and the local image service/glance
     # when we switch to glance/local image service it can be replaced with
-    # a call to _select_keys, and mapped_keys can be changed to a list
+    # a call to _filter_keys, and mapped_keys can be changed to a list
     try:
         for k, v in mapped_keys.iteritems():
             # map s3 fields
             mapped_inst[k] = inst[v]
     except KeyError:
-        mapped_inst = _select_keys(inst, mapped_keys.keys())
-
-    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+        # return only the fields api expects
+        mapped_inst = _filter_keys(inst, mapped_keys.keys())
 
     return mapped_inst
 
 
-def _entity_inst(inst):
+def _translate_status(inst):
     """
-    Filters all model attributes save for id and name
-    inst is a single entity (dict)
+    Translates status of image to match current Rackspace api bindings
+    inst is a single item (dict)
+
+    Note: should be removed when the set of statuses expected by the api
+    and the set of statuses returned by the image service are equivalent
 
     """
-    return _select_keys(inst, ['id', 'name'])
+    mapped_inst = {}
+    status_mapping = {
+        'pending': 'queued',
+        'decrypting': 'preparing',
+        'untarring': 'saving',
+        'available': 'active'}
+    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+    return mapped_inst
 
 
-def _select_keys(inst, keys):
+def _filter_keys(inst, keys):
     """
     Filters all model attributes except for keys
-    inst is a single entity (dict)
+    inst is a single item (dict)
 
     """
     return dict((k, v) for k, v in inst.iteritems() if k in keys)
@@ -108,7 +105,7 @@ class Controller(wsgi.Controller):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
         items = common.limited(items, req)
-        items = [_entity_inst(item) for item in items]
+        items = [_filter_keys(item, ('id', 'name')) for item in items]
         return dict(images=items)
 
     def detail(self, req):
@@ -118,7 +115,8 @@ class Controller(wsgi.Controller):
         except NotImplementedError:
             items = self._service.index(req.environ['nova.context'])
         items = common.limited(items, req)
-        items = [_entity_detail(item) for item in items]
+        items = [_translate_keys(item) for item in items]
+        items = [_translate_status(item) for item in items]
         return dict(images=items)
 
     def show(self, req, id):
-- 
cgit 


From 0c983d1f3cba82f992fc128985f4f794fb76190f Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:11:36 +0000
Subject: syntax error

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index ea22b07ba..8a16bcb0f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -77,7 +77,7 @@ def _translate_status(inst):
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst['status'] = status_mapping[mapped_inst['status']]
+    mapped_inst['status'] = status_mapping[inst['status']]
     return mapped_inst
 
 
-- 
cgit 


From e86f765181a9d0a75486a98e827cc8505b7c4111 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:17:53 +0000
Subject: inst -> item

---
 nova/api/openstack/images.py | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 8a16bcb0f..77625bab5 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -30,11 +30,11 @@ from nova.api.openstack import faults
 FLAGS = flags.FLAGS
 
 
-def _translate_keys(inst):
+def _translate_keys(item):
     """
     Maps key names to Rackspace-like attributes for return
     also pares down attributes to those we want
-    inst is a single item (dict)
+    item is a dict
 
     Note: should be removed when the set of keys expected by the api
     and the set of keys returned by the image service are equivalent
@@ -46,7 +46,7 @@ def _translate_keys(inst):
                    'id': 'imageId',
                    'name': 'imageLocation'}
 
-    mapped_inst = {}
+    mapped_item = {}
     # TODO(tr3buchet):
     # this chunk of code works with s3 and the local image service/glance
     # when we switch to glance/local image service it can be replaced with
@@ -54,40 +54,40 @@ def _translate_keys(inst):
     try:
         for k, v in mapped_keys.iteritems():
             # map s3 fields
-            mapped_inst[k] = inst[v]
+            mapped_item[k] = item[v]
     except KeyError:
         # return only the fields api expects
-        mapped_inst = _filter_keys(inst, mapped_keys.keys())
+        mapped_item = _filter_keys(item, mapped_keys.keys())
 
-    return mapped_inst
+    return mapped_item
 
 
-def _translate_status(inst):
+def _translate_status(item):
     """
     Translates status of image to match current Rackspace api bindings
-    inst is a single item (dict)
+    item is a dict
 
     Note: should be removed when the set of statuses expected by the api
     and the set of statuses returned by the image service are equivalent
 
     """
-    mapped_inst = {}
+    mapped_item = {}
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_inst['status'] = status_mapping[inst['status']]
-    return mapped_inst
+    mapped_item['status'] = status_mapping[item['status']]
+    return mapped_item
 
 
-def _filter_keys(inst, keys):
+def _filter_keys(item, keys):
     """
     Filters all model attributes except for keys
-    inst is a single item (dict)
+    item is a dict
 
     """
-    return dict((k, v) for k, v in inst.iteritems() if k in keys)
+    return dict((k, v) for k, v in item.iteritems() if k in keys)
 
 
 class Controller(wsgi.Controller):
-- 
cgit 


From 243ba12a903b2eac30dd99305a92f76e430cfb49 Mon Sep 17 00:00:00 2001
From: Trey Morris <trey.morris@rackspace.com>
Date: Mon, 27 Dec 2010 20:39:48 +0000
Subject: translate status was returning the wrong item

---
 nova/api/openstack/images.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 77625bab5..ba35fbc78 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -71,14 +71,13 @@ def _translate_status(item):
     and the set of statuses returned by the image service are equivalent
 
     """
-    mapped_item = {}
     status_mapping = {
         'pending': 'queued',
         'decrypting': 'preparing',
         'untarring': 'saving',
         'available': 'active'}
-    mapped_item['status'] = status_mapping[item['status']]
-    return mapped_item
+    item['status'] = status_mapping[item['status']]
+    return item
 
 
 def _filter_keys(item, keys):
-- 
cgit 


From 431c54ba76a2a85ff55658c571f68378b47ce39d Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 17:29:45 -0600
Subject: Renamed based on feedback from another branch

---
 nova/api/openstack/backup_schedules.py |  2 ++
 nova/api/openstack/servers.py          | 27 ++++++++++++---------------
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index a8b0fbbb9..9b8e605f6 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -22,10 +22,12 @@ from nova import wsgi
 from nova.api.openstack import faults
 import nova.image.service
 
+
 def _entity_inst(inst):
     """ Coerces the backup schedule into proper dictionary format """
     return dict(backupSchedule=inst)
 
+
 class Controller(wsgi.Controller):
     """ The backup schedule API controller for the Openstack API """
 
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 7abf5ec53..9369f6516 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -35,13 +35,9 @@ LOG = logging.getLogger('server')
 LOG.setLevel(logging.DEBUG)
 
 
-def _entity_list(entities):
-    """ Coerces a list of servers into proper dictionary format """
-    return dict(servers=entities)
-
-
-def _entity_detail(inst):
-    """ Maps everything to Rackspace-like attributes for return"""
+def _translate_detail_keys(inst):
+    """ Coerces into dictionary format, mapping everything to Rackspace-like
+    attributes for return"""
     power_mapping = {
         None: 'build',
         power_state.NOSTATE: 'build',
@@ -67,8 +63,9 @@ def _entity_detail(inst):
     return dict(server=inst_dict)
 
 
-def _entity_inst(inst):
-    """ Filters all model attributes save for id and name """
+def _translate_keys(inst):
+    """ Coerces into dictionary format, excluding all model attributes
+    save for id and name """
     return dict(server=dict(id=inst['internal_id'], name=inst['display_name']))
 
 
@@ -87,29 +84,29 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of server names and ids for a given user """
-        return self._items(req, entity_maker=_entity_inst)
+        return self._items(req, entity_maker=_translte_keys)
 
     def detail(self, req):
         """ Returns a list of server details for a given user """
-        return self._items(req, entity_maker=_entity_detail)
+        return self._items(req, entity_maker=_translate_detail_keys)
 
     def _items(self, req, entity_maker):
         """Returns a list of servers for a given user.
 
-        entity_maker - either _entity_detail or _entity_inst
+        entity_maker - either _translate_detail_keys or _translate_keys
         """
         instance_list = self.compute_api.get_instances(
             req.environ['nova.context'])
         limited_list = common.limited(instance_list, req)
         res = [entity_maker(inst)['server'] for inst in limited_list]
-        return _entity_list(res)
+        return dict(servers=res)
 
     def show(self, req, id):
         """ Returns server details by server id """
         try:
             instance = self.compute_api.get_instance(
                 req.environ['nova.context'], int(id))
-            return _entity_detail(instance)
+            return _translate_detail_keys(instance)
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
@@ -138,7 +135,7 @@ class Controller(wsgi.Controller):
             description=env['server']['name'],
             key_name=key_pair['name'],
             key_data=key_pair['public_key'])
-        return _entity_inst(instances[0])
+        return _translate_keys(instances[0])
 
     def update(self, req, id):
         """ Updates the server name or password """
-- 
cgit 


From 31d3aed581302e73b3f155b1dd72586324433e91 Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Mon, 27 Dec 2010 17:35:59 -0600
Subject: Typo fix

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

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 9369f6516..d18889563 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -84,7 +84,7 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of server names and ids for a given user """
-        return self._items(req, entity_maker=_translte_keys)
+        return self._items(req, entity_maker=_translate_keys)
 
     def detail(self, req):
         """ Returns a list of server details for a given user """
-- 
cgit 


From 902df6eb4968743dd451e54cde27ce88fc83ddaa Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Tue, 28 Dec 2010 15:48:48 -0600
Subject: Whoops

---
 nova/api/openstack/backup_schedules.py |  4 ++--
 nova/api/openstack/sharedipgroups.py   | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index 9b8e605f6..fcc07bdd3 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -23,7 +23,7 @@ from nova.api.openstack import faults
 import nova.image.service
 
 
-def _entity_inst(inst):
+def _translate_keys(inst):
     """ Coerces the backup schedule into proper dictionary format """
     return dict(backupSchedule=inst)
 
@@ -41,7 +41,7 @@ class Controller(wsgi.Controller):
 
     def index(self, req, server_id):
         """ Returns the list of backup schedules for a given instance """
-        return _entity_inst({})
+        return _translate_keys({})
 
     def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
diff --git a/nova/api/openstack/sharedipgroups.py b/nova/api/openstack/sharedipgroups.py
index 32ebfa45a..845f5bead 100644
--- a/nova/api/openstack/sharedipgroups.py
+++ b/nova/api/openstack/sharedipgroups.py
@@ -21,17 +21,12 @@ from nova import wsgi
 from nova.api.openstack import faults
 
 
-def _entity_list(entities):
-    """ Coerces a list of shared IP groups into proper dictionary format """
-    return dict(sharedIpGroups=entities)
-
-
-def _entity_inst(inst):
+def _translate_keys(inst):
     """ Coerces a shared IP group instance into proper dictionary format """
     return dict(sharedIpGroup=inst)
 
 
-def _entity_detail(inst):
+def _translate_detail_keys(inst):
     """ Coerces a shared IP group instance into proper dictionary format with
     correctly mapped attributes """
     return dict(sharedIpGroup=inst)
@@ -47,11 +42,11 @@ class Controller(wsgi.Controller):
 
     def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
-        return _entity_list([])
+        return dict(sharedIpGroups=[])
 
     def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
-        return _entity_inst({})
+        return _translate_keys({})
 
     def update(self, req, id):
         """ You can't update a Shared IP Group """
@@ -63,7 +58,7 @@ class Controller(wsgi.Controller):
 
     def detail(self, req, id):
         """ Returns a complete list of Shared IP Groups """
-        return _entity_detail({})
+        return _translate_detail_keys({})
 
     def create(self, req):
         """ Creates a new Shared IP group """
-- 
cgit 


From 99a228a8ef3ee2760774fbafd136f137bd578dba Mon Sep 17 00:00:00 2001
From: Cerberus <matt.dietz@rackspace.com>
Date: Tue, 28 Dec 2010 17:34:51 -0600
Subject: removed superfluous line

---
 nova/api/openstack/servers.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 2232d24b2..845183258 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -152,7 +152,6 @@ class Controller(wsgi.Controller):
 
         try:
             ctxt = req.environ['nova.context']
-            inst_ref = self.compute_api.get_instance(ctxt, id)
             self.compute_api.update_instance(ctxt,
                                              id,
                                              **update_dict)
-- 
cgit