diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-10 20:35:37 -0500 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-10 20:35:37 -0500 |
| commit | 76b5871adbb1bfc2e3d2a1151a00fa654c45953d (patch) | |
| tree | 944fa2d15cde83d9f883a2709f34e5783ced73f6 | |
| parent | c540d6d7fef1da68a42c16ac1f9a44337661bb0d (diff) | |
| download | nova-76b5871adbb1bfc2e3d2a1151a00fa654c45953d.tar.gz nova-76b5871adbb1bfc2e3d2a1151a00fa654c45953d.tar.xz nova-76b5871adbb1bfc2e3d2a1151a00fa654c45953d.zip | |
_translate_keys now needs one more argument, the request object.
| -rw-r--r-- | nova/api/openstack/servers.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index ec542bc92..bd317f995 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -78,7 +78,7 @@ def _translate_detail_keys(req, inst): return dict(server=inst_dict) -def _translate_keys(inst): +def _translate_keys(req, inst): """ Coerces into dictionary format, excluding all model attributes save for id and name """ return dict(server=dict(id=inst['id'], name=inst['display_name'])) @@ -193,7 +193,7 @@ class Controller(wsgi.Controller): metadata=metadata, onset_files=env.get('onset_files', [])) - server = _translate_keys(instances[0]) + server = _translate_keys(req, instances[0]) password = "%s%s" % (server['server']['name'][:4], utils.generate_password(12)) server['server']['adminPass'] = password |