diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-09-09 18:06:34 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-09-09 18:06:34 +0000 |
| commit | 266fe18ef4ec474926908fcd9aeb2d7de4b34447 (patch) | |
| tree | 6291b05506449647eed72a4747c938b09f6b3f4a | |
| parent | e03f6a245d5be18e3918090cdd951f17b59d3585 (diff) | |
| parent | 7352e3e1eb7a4d29b556492a208e80439828f211 (diff) | |
| download | nova-266fe18ef4ec474926908fcd9aeb2d7de4b34447.tar.gz nova-266fe18ef4ec474926908fcd9aeb2d7de4b34447.tar.xz nova-266fe18ef4ec474926908fcd9aeb2d7de4b34447.zip | |
Remove chanes_since and key_name from basic server entity.
| -rw-r--r-- | nova/api/openstack/views/servers.py | 7 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_servers.py | 4 |
2 files changed, 2 insertions, 9 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, diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index d063a60c2..f0a1c5ce5 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -3715,7 +3715,6 @@ class ServersViewBuilderV11Test(test.TestCase): "id": 1, "uuid": self.instance['uuid'], "name": "test_server", - "key_name": '', "links": [ { "rel": "self", @@ -3726,7 +3725,6 @@ class ServersViewBuilderV11Test(test.TestCase): "href": "http://localhost/servers/1", }, ], - "config_drive": None, } } @@ -3739,8 +3737,6 @@ class ServersViewBuilderV11Test(test.TestCase): "id": 1, "uuid": self.instance['uuid'], "name": "test_server", - "key_name": '', - "config_drive": None, "links": [ { "rel": "self", |