diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-14 22:55:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-14 22:55:44 +0000 |
| commit | 5e94da199c67460fc96d6d5c9397364090de0fb4 (patch) | |
| tree | 30c6de3a11db20a663f72e239aebd44cfc5de654 | |
| parent | cdcd8857f0c1ef36e2c08bcabcc29231c1c87881 (diff) | |
| parent | e92d1c4388c92ddd925dcf9ddece6166a7fa4eb0 (diff) | |
Merge "Remove useless _get_key_name() in servers API"
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 1a8fbda41..f448d3fb9 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -616,8 +616,6 @@ class Controller(wsgi.Controller): if not self.is_valid_body(body, 'server'): raise exc.HTTPUnprocessableEntity() - body['server']['key_name'] = self._get_key_name(req, body) - context = req.environ['nova.context'] server_dict = body['server'] password = self._get_server_admin_password(server_dict) @@ -960,14 +958,6 @@ class Controller(wsgi.Controller): common.raise_http_conflict_for_instance_invalid_state(state_error, 'delete') - def _get_key_name(self, req, body): - if 'server' in body: - try: - return body['server'].get('key_name') - except AttributeError: - msg = _("Malformed server entity") - raise exc.HTTPBadRequest(explanation=msg) - def _image_ref_from_req_data(self, data): try: return unicode(data['server']['imageRef']) |