removed uneeded **kw args leftover from removed account-in-url changes.

8 files changed, 56 insertions, 56 deletions

diff --git a/nova/api/openstack/backup_schedules.py b/nova/api/openstack/backup_schedules.py
index a4d5939df..7abb5f884 100644
--- a/nova/api/openstack/backup_schedules.py
+++ b/nova/api/openstack/backup_schedules.py
@@ -40,15 +40,15 @@ class Controller(wsgi.Controller):
     def __init__(self):
         pass
 
-    def index(self, req, server_id, **kw):
+    def index(self, req, server_id):
         """ Returns the list of backup schedules for a given instance """
         return _translate_keys({})
 
-    def create(self, req, server_id, **kw):
+    def create(self, req, server_id):
         """ No actual update method required, since the existing API allows
         both create and update through a POST """
         return faults.Fault(exc.HTTPNotImplemented())
 
-    def delete(self, req, server_id, id, **kw):
+    def delete(self, req, server_id, id):
         """ Deletes an existing backup schedule """
         return faults.Fault(exc.HTTPNotImplemented())
diff --git a/nova/api/openstack/consoles.py b/nova/api/openstack/consoles.py
index 85b2a4140..9ebdbe710 100644
--- a/nova/api/openstack/consoles.py
+++ b/nova/api/openstack/consoles.py
@@ -55,7 +55,7 @@ class Controller(wsgi.Controller):
         self.console_api = console.API()
         super(Controller, self).__init__()
 
-    def index(self, req, server_id, **kw):
+    def index(self, req, server_id):
         """Returns a list of consoles for this instance"""
         consoles = self.console_api.get_consoles(
                                     req.environ['nova.context'],
@@ -63,14 +63,14 @@ class Controller(wsgi.Controller):
         return dict(consoles=[_translate_keys(console)
                               for console in consoles])
 
-    def create(self, req, server_id, **kw):
+    def create(self, req, server_id):
         """Creates a new console"""
         #info = self._deserialize(req.body, req)
         self.console_api.create_console(
                                 req.environ['nova.context'],
                                 int(server_id))
 
-    def show(self, req, server_id, id, **kw):
+    def show(self, req, server_id, id):
         """Shows in-depth information on a specific console"""
         try:
             console = self.console_api.get_console(
@@ -81,11 +81,11 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPNotFound())
         return _translate_detail_keys(console)
 
-    def update(self, req, server_id, id, **kw):
+    def update(self, req, server_id, id):
         """You can't update a console"""
         raise faults.Fault(exc.HTTPNotImplemented())
 
-    def delete(self, req, server_id, id, **kw):
+    def delete(self, req, server_id, id):
         """Deletes a console"""
         try:
             self.console_api.delete_console(req.environ['nova.context'],
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py
index 1de67328b..f3d040ba3 100644
--- a/nova/api/openstack/flavors.py
+++ b/nova/api/openstack/flavors.py
@@ -34,17 +34,17 @@ class Controller(wsgi.Controller):
             "attributes": {
                 "flavor": ["id", "name", "ram", "disk"]}}}
 
-    def index(self, req, **kw):
+    def index(self, req):
         """Return all flavors in brief."""
         return dict(flavors=[dict(id=flavor['id'], name=flavor['name'])
                              for flavor in self.detail(req)['flavors']])
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """Return all flavors in detail."""
         items = [self.show(req, id)['flavor'] for id in self._all_ids(req)]
         return dict(flavors=items)
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """Return data about the given flavor id."""
         ctxt = req.environ['nova.context']
         values = db.instance_type_get_by_flavor_id(ctxt, id)
diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index 5bc5b9978..cf85a496f 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -115,14 +115,14 @@ class Controller(wsgi.Controller):
     def __init__(self):
         self._service = utils.import_object(FLAGS.image_service)
 
-    def index(self, req, **kw):
+    def index(self, req):
         """Return all public images in brief"""
         items = self._service.index(req.environ['nova.context'])
         items = common.limited(items, req)
         items = [_filter_keys(item, ('id', 'name')) for item in items]
         return dict(images=items)
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """Return all public images in detail"""
         try:
             items = self._service.detail(req.environ['nova.context'])
@@ -136,7 +136,7 @@ class Controller(wsgi.Controller):
         items = [_translate_status(item) for item in items]
         return dict(images=items)
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """Return data about the given image id"""
         image_id = common.get_image_id_from_image_hash(self._service,
                     req.environ['nova.context'], id)
@@ -145,11 +145,11 @@ class Controller(wsgi.Controller):
         _convert_image_id_to_hash(image)
         return dict(image=image)
 
-    def delete(self, req, id, **kw):
+    def delete(self, req, id):
         # Only public images are supported for now.
         raise faults.Fault(exc.HTTPNotFound())
 
-    def create(self, req, **kw):
+    def create(self, req):
         context = req.environ['nova.context']
         env = self._deserialize(req.body, req)
         instance_id = env["image"]["serverId"]
@@ -160,7 +160,7 @@ class Controller(wsgi.Controller):
 
         return dict(image=image_meta)
 
-    def update(self, req, id, **kw):
+    def update(self, req, id):
         # Users may not modify public images, and that's all that
         # we support for now.
         raise faults.Fault(exc.HTTPNotFound())
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 54060c2bb..c2bf42b72 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -105,11 +105,11 @@ class Controller(wsgi.Controller):
         self._image_service = utils.import_object(FLAGS.image_service)
         super(Controller, self).__init__()
 
-    def index(self, req, **kw):
+    def index(self, req):
         """ Returns a list of server names and ids for a given user """
         return self._items(req, entity_maker=_translate_keys)
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """ Returns a list of server details for a given user """
         return self._items(req, entity_maker=_translate_detail_keys)
 
@@ -123,7 +123,7 @@ class Controller(wsgi.Controller):
         res = [entity_maker(inst)['server'] for inst in limited_list]
         return dict(servers=res)
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """ Returns server details by server id """
         try:
             instance = self.compute_api.get(req.environ['nova.context'], id)
@@ -131,7 +131,7 @@ class Controller(wsgi.Controller):
         except exception.NotFound:
             return faults.Fault(exc.HTTPNotFound())
 
-    def delete(self, req, id, **kw):
+    def delete(self, req, id):
         """ Destroys a server """
         try:
             self.compute_api.delete(req.environ['nova.context'], id)
@@ -139,7 +139,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPNotFound())
         return exc.HTTPAccepted()
 
-    def create(self, req, **kw):
+    def create(self, req):
         """ Creates a new server for a given user """
         env = self._deserialize(req.body, req)
         if not env:
@@ -180,7 +180,7 @@ class Controller(wsgi.Controller):
             onset_files=env.get('onset_files', []))
         return _translate_keys(instances[0])
 
-    def update(self, req, id, **kw):
+    def update(self, req, id):
         """ Updates the server name or password """
         inst_dict = self._deserialize(req.body, req)
         if not inst_dict:
@@ -202,7 +202,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPNotFound())
         return exc.HTTPNoContent()
 
-    def action(self, req, id, **kw):
+    def action(self, req, id):
         """Multi-purpose method used to reboot, rebuild, or
         resize a server"""
 
@@ -267,7 +267,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def lock(self, req, id, **kw):
+    def lock(self, req, id):
         """
         lock the instance with id
         admin only operation
@@ -282,7 +282,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def unlock(self, req, id, **kw):
+    def unlock(self, req, id):
         """
         unlock the instance with id
         admin only operation
@@ -297,7 +297,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def get_lock(self, req, id, **kw):
+    def get_lock(self, req, id):
         """
         return the boolean state of (instance with id)'s lock
 
@@ -311,7 +311,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def reset_network(self, req, id, **kw):
+    def reset_network(self, req, id):
         """
         Reset networking on an instance (admin only).
 
@@ -325,7 +325,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def inject_network_info(self, req, id, **kw):
+    def inject_network_info(self, req, id):
         """
         Inject network info for an instance (admin only).
 
@@ -339,7 +339,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def pause(self, req, id, **kw):
+    def pause(self, req, id):
         """ Permit Admins to Pause the server. """
         ctxt = req.environ['nova.context']
         try:
@@ -350,7 +350,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def unpause(self, req, id, **kw):
+    def unpause(self, req, id):
         """ Permit Admins to Unpause the server. """
         ctxt = req.environ['nova.context']
         try:
@@ -361,7 +361,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def suspend(self, req, id, **kw):
+    def suspend(self, req, id):
         """permit admins to suspend the server"""
         context = req.environ['nova.context']
         try:
@@ -372,7 +372,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def resume(self, req, id, **kw):
+    def resume(self, req, id):
         """permit admins to resume the server from suspend"""
         context = req.environ['nova.context']
         try:
@@ -383,7 +383,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def rescue(self, req, id, **kw):
+    def rescue(self, req, id):
         """Permit users to rescue the server."""
         context = req.environ["nova.context"]
         try:
@@ -394,7 +394,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def unrescue(self, req, id, **kw):
+    def unrescue(self, req, id):
         """Permit users to unrescue the server."""
         context = req.environ["nova.context"]
         try:
@@ -405,7 +405,7 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPUnprocessableEntity())
         return exc.HTTPAccepted()
 
-    def get_ajax_console(self, req, id, **kw):
+    def get_ajax_console(self, req, id):
         """ Returns a url to an instance's ajaxterm console. """
         try:
             self.compute_api.get_ajax_console(req.environ['nova.context'],
@@ -414,12 +414,12 @@ class Controller(wsgi.Controller):
             return faults.Fault(exc.HTTPNotFound())
         return exc.HTTPAccepted()
 
-    def diagnostics(self, req, id, **kw):
+    def diagnostics(self, req, id):
         """Permit Admins to retrieve server diagnostics."""
         ctxt = req.environ["nova.context"]
         return self.compute_api.get_diagnostics(ctxt, id)
 
-    def actions(self, req, id, **kw):
+    def actions(self, req, id):
         """Permit Admins to retrieve server actions."""
         ctxt = req.environ["nova.context"]
         items = self.compute_api.get_actions(ctxt, id)
diff --git a/nova/api/openstack/shared_ip_groups.py b/nova/api/openstack/shared_ip_groups.py
index e3c917749..5d78f9377 100644
--- a/nova/api/openstack/shared_ip_groups.py
+++ b/nova/api/openstack/shared_ip_groups.py
@@ -40,26 +40,26 @@ class Controller(wsgi.Controller):
             'attributes': {
                 'sharedIpGroup': []}}}
 
-    def index(self, req, **kw):
+    def index(self, req):
         """ Returns a list of Shared IP Groups for the user """
         return dict(sharedIpGroups=[])
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """ Shows in-depth information on a specific Shared IP Group """
         return _translate_keys({})
 
-    def update(self, req, id, **kw):
+    def update(self, req, id):
         """ You can't update a Shared IP Group """
         raise faults.Fault(exc.HTTPNotImplemented())
 
-    def delete(self, req, id, **kw):
+    def delete(self, req, id):
         """ Deletes a Shared IP Group """
         raise faults.Fault(exc.HTTPNotImplemented())
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """ Returns a complete list of Shared IP Groups """
         return _translate_detail_keys({})
 
-    def create(self, req, **kw):
+    def create(self, req):
         """ Creates a new Shared IP group """
         raise faults.Fault(exc.HTTPNotImplemented())
diff --git a/nova/api/openstack/users.py b/nova/api/openstack/users.py
index ae3bf7791..83ebec964 100644
--- a/nova/api/openstack/users.py
+++ b/nova/api/openstack/users.py
@@ -50,28 +50,28 @@ class Controller(wsgi.Controller):
         if not context.is_admin:
             raise exception.NotAuthorized(_("Not admin user"))
 
-    def index(self, req, **kw):
+    def index(self, req):
         """Return all users in brief"""
         users = self.manager.get_users()
         users = common.limited(users, req)
         users = [_translate_keys(user) for user in users]
         return dict(users=users)
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """Return all users in detail"""
         return self.index(req)
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """Return data about the given user id"""
         user = self.manager.get_user(id)
         return dict(user=_translate_keys(user))
 
-    def delete(self, req, id, **kw):
+    def delete(self, req, id):
         self._check_admin(req.environ['nova.context'])
         self.manager.delete_user(id)
         return {}
 
-    def create(self, req, **kw):
+    def create(self, req):
         self._check_admin(req.environ['nova.context'])
         env = self._deserialize(req.body, req)
         is_admin = env['user'].get('admin') in ('T', 'True', True)
@@ -81,7 +81,7 @@ class Controller(wsgi.Controller):
         user = self.manager.create_user(name, access, secret, is_admin)
         return dict(user=_translate_keys(user))
 
-    def update(self, req, id, **kw):
+    def update(self, req, id):
         self._check_admin(req.environ['nova.context'])
         env = self._deserialize(req.body, req)
         is_admin = env['user'].get('admin')
diff --git a/nova/api/openstack/zones.py b/nova/api/openstack/zones.py
index 30bf2b67b..d5206da20 100644
--- a/nova/api/openstack/zones.py
+++ b/nova/api/openstack/zones.py
@@ -43,35 +43,35 @@ class Controller(wsgi.Controller):
             "attributes": {
                 "zone": ["id", "api_url"]}}}
 
-    def index(self, req, **kw):
+    def index(self, req):
         """Return all zones in brief"""
         items = db.zone_get_all(req.environ['nova.context'])
         items = common.limited(items, req)
         items = [_scrub_zone(item) for item in items]
         return dict(zones=items)
 
-    def detail(self, req, **kw):
+    def detail(self, req):
         """Return all zones in detail"""
         return self.index(req)
 
-    def show(self, req, id, **kw):
+    def show(self, req, id):
         """Return data about the given zone id"""
         zone_id = int(id)
         zone = db.zone_get(req.environ['nova.context'], zone_id)
         return dict(zone=_scrub_zone(zone))
 
-    def delete(self, req, id, **kw):
+    def delete(self, req, id):
         zone_id = int(id)
         db.zone_delete(req.environ['nova.context'], zone_id)
         return {}
 
-    def create(self, req, **kw):
+    def create(self, req):
         context = req.environ['nova.context']
         env = self._deserialize(req.body, req)
         zone = db.zone_create(context, env["zone"])
         return dict(zone=_scrub_zone(zone))
 
-    def update(self, req, id, **kw):
+    def update(self, req, id):
         context = req.environ['nova.context']
         env = self._deserialize(req.body, req)
         zone_id = int(id)