Remove useless _get_key_name() in servers API

This no longer does anything useful. Firstly, we already check that the
body dict has a server key. Secondly, AttributeError will never be
thrown here since we have already checked that the entity is a dict.
Finally, we don't need to set this key to None if it's not supplied
by the client since we later use get() to to look it up.

Change-Id: I4235117cc47e5b5cbdad4425edb3c7059e608d49

1 files changed, 0 insertions, 10 deletions

diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 4c4b86aa8..49800c807 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'])