diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-15 10:29:06 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-07-15 10:29:06 -0400 |
| commit | a36d93372db8556b70d28cf52644da38c7f9a02f (patch) | |
| tree | 7ace190f877aedab35d96a28aad2d8f204ff7f1c /nova/api | |
| parent | 6cbce0442cf15d31e7ab05b808939bdc3a244f1b (diff) | |
Added ViewBuilderV11 tests
Fixed bug with build detail
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 45209d9e2..570488cfa 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -140,6 +140,18 @@ class ViewBuilderV11(ViewBuilder): self.image_builder = image_builder self.base_url = base_url + def _build_detail(self, inst): + response = super(ViewBuilderV11, self)._build_detail(inst) + response['server']['created'] = inst['created_at'] + response['server']['updated'] = inst['updated_at'] + if 'status' in response['server']: + if response['server']['status'] == "ACTIVE": + response['server']['progress'] = 100 + elif response['server']['status'] == "BUILD": + response['server']['progress'] = 0 + return response + + def _build_image(self, response, inst): if 'image_ref' in dict(inst): image_href = inst['image_ref'] @@ -184,13 +196,6 @@ class ViewBuilderV11(ViewBuilder): def _build_extra(self, response, inst): self._build_links(response, inst) response['id'] = inst['uuid'] - response['created'] = inst['created_at'] - response['updated'] = inst['updated_at'] - if 'status' in response: - if response['status'] == "ACTIVE": - response['progress'] = 100 - elif response['status'] == "BUILD": - response['progress'] = 0 def _build_links(self, response, inst): href = self.generate_href(inst["uuid"]) |