diff options
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/openstack/servers.py | 3 | ||||
| -rw-r--r-- | nova/api/openstack/views/servers.py | 12 |
2 files changed, 7 insertions, 8 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index 7bb7250ba..de67cbc4a 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -436,6 +436,3 @@ class Controller(wsgi.Controller): _("Ramdisk not found for image %(image_id)s") % locals()) return kernel_id, ramdisk_id - - - diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index 950662747..15ac9964c 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -16,7 +16,8 @@ def get_view_builder(req): if version == '1.1': flavor_builder = flavors_view.get_view_builder(req) image_builder = images_view.get_view_builder(req) - return ViewBuilder_1_1(addresses_builder, flavor_builder, image_builder) + return ViewBuilder_1_1(addresses_builder, flavor_builder, + image_builder) else: return ViewBuilder_1_0(addresses_builder) @@ -28,8 +29,10 @@ class ViewBuilder(object): self.addresses_builder = addresses_builder def build(self, inst, is_detail): - """ Coerces into dictionary format, mapping everything to Rackspace-like - attributes for return""" + """ + Coerces into dictionary format, mapping everything to + Rackspace-like attributes for return + """ if is_detail: return self._build_detail(inst) else: @@ -106,6 +109,5 @@ class ViewBuilder_1_1(ViewBuilder): def _build_flavor_ref(self, response, inst): flavor_id = inst["instance_type"] - response["flavorRef"]= self.flavor_builder.generate_href(flavor_id) + response["flavorRef"] = self.flavor_builder.generate_href(flavor_id) return response - |