diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-01 18:24:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-01 18:24:48 +0000 |
| commit | 71bd02356b41f682c6a196f75e0ed1accc8f5fb6 (patch) | |
| tree | ca0dd87585ab6158ccb0c27b5aeb8fd4409038b8 /nova/api | |
| parent | 44f9f331fe75ee2facc2be995632cdf20f319380 (diff) | |
| parent | 18e43e6b4dffba73dd35afb797dfa4e1d6cd00fe (diff) | |
Merge changes I15dd5a5e,I0641f2c4
* changes:
Support server uuids with security groups
Support using server uuids when accessing consoles.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/consoles.py | 8 | ||||
| -rw-r--r-- | nova/api/openstack/contrib/security_groups.py | 8 |
2 files changed, 4 insertions, 12 deletions
diff --git a/nova/api/openstack/consoles.py b/nova/api/openstack/consoles.py index d42d34069..7d8c0523e 100644 --- a/nova/api/openstack/consoles.py +++ b/nova/api/openstack/consoles.py @@ -54,7 +54,7 @@ class Controller(object): """Returns a list of consoles for this instance""" consoles = self.console_api.get_consoles( req.environ['nova.context'], - int(server_id)) + server_id) return dict(consoles=[_translate_keys(console) for console in consoles]) @@ -62,14 +62,14 @@ class Controller(object): """Creates a new console""" self.console_api.create_console( req.environ['nova.context'], - int(server_id)) + server_id) def show(self, req, server_id, id): """Shows in-depth information on a specific console""" try: console = self.console_api.get_console( req.environ['nova.context'], - int(server_id), + server_id, int(id)) except exception.NotFound: raise exc.HTTPNotFound() @@ -83,7 +83,7 @@ class Controller(object): """Deletes a console""" try: self.console_api.delete_console(req.environ['nova.context'], - int(server_id), + server_id, int(id)) except exception.NotFound: raise exc.HTTPNotFound() diff --git a/nova/api/openstack/contrib/security_groups.py b/nova/api/openstack/contrib/security_groups.py index d8462b02c..662711951 100644 --- a/nova/api/openstack/contrib/security_groups.py +++ b/nova/api/openstack/contrib/security_groups.py @@ -349,10 +349,6 @@ class Security_groups(extensions.ExtensionDescriptor): try: body = input_dict['addSecurityGroup'] group_name = body['name'] - instance_id = int(instance_id) - except ValueError: - msg = _("Server id should be integer") - raise exc.HTTPBadRequest(explanation=msg) except TypeError: msg = _("Missing parameter dict") raise webob.exc.HTTPBadRequest(explanation=msg) @@ -382,10 +378,6 @@ class Security_groups(extensions.ExtensionDescriptor): try: body = input_dict['removeSecurityGroup'] group_name = body['name'] - instance_id = int(instance_id) - except ValueError: - msg = _("Server id should be integer") - raise exc.HTTPBadRequest(explanation=msg) except TypeError: msg = _("Missing parameter dict") raise webob.exc.HTTPBadRequest(explanation=msg) |