diff options
| author | Josh Kearney <josh@jk0.org> | 2011-09-09 14:05:11 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-09-09 14:05:11 -0500 |
| commit | 64317cd7dead447280e1d143863c59d20e9f53e0 (patch) | |
| tree | ea64989496bbd1731640ba881b53a05a3f19cb0e /nova/api | |
| parent | 17b3120d6c5459c993f23256ca7e4b40a420b067 (diff) | |
| parent | 128294ab9f5c03426ecb2154c48ea98186256d5b (diff) | |
Merged trunk.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index ac09b5864..473dc9e7e 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -145,6 +145,8 @@ class ViewBuilderV11(ViewBuilder): response['server']['accessIPv4'] = inst.get('access_ip_v4') or "" response['server']['accessIPv6'] = inst.get('access_ip_v6') or "" + response['server']['key_name'] = inst.get('key_name', '') + response['server']['config_drive'] = inst.get('config_drive') return response @@ -185,8 +187,6 @@ class ViewBuilderV11(ViewBuilder): def _build_extra(self, response, inst): self._build_links(response, inst) response['uuid'] = inst['uuid'] - response['key_name'] = inst.get('key_name', '') - self._build_config_drive(response, inst) def _build_links(self, response, inst): href = self.generate_href(inst["id"]) @@ -205,9 +205,6 @@ class ViewBuilderV11(ViewBuilder): response["links"] = links - def _build_config_drive(self, response, inst): - response['config_drive'] = inst.get('config_drive') - def generate_href(self, server_id): """Create an url that refers to a specific server id.""" return os.path.join(self.base_url, self.project_id, |