From eb05b127f8479451902a29d70d2e799b2c166c36 Mon Sep 17 00:00:00 2001 From: Robert Myers Date: Fri, 4 Oct 2013 09:22:46 -0500 Subject: [PATCH] Fix the fake nova server implementation * rename 'hostId' attribute to 'host' * remove duplicate initialization of 'host' attribute in account models. Fixes: Bug #1235278 Change-Id: If0110bef1beec5f570209379f24f183927908218 --- trove/extensions/account/models.py | 1 - trove/tests/fakes/nova.py | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/trove/extensions/account/models.py b/trove/extensions/account/models.py index 29197a9429..eca5f46f6d 100644 --- a/trove/extensions/account/models.py +++ b/trove/extensions/account/models.py @@ -32,7 +32,6 @@ def __init__(self, server): self.id = server['id'] self.status = server['status'] self.name = server['name'] - self.host = server['hostId'] self.host = server.get('hostId') or server['host'] @staticmethod diff --git a/trove/tests/fakes/nova.py b/trove/tests/fakes/nova.py index f29e568444..48cd29a6e4 100644 --- a/trove/tests/fakes/nova.py +++ b/trove/tests/fakes/nova.py @@ -117,7 +117,7 @@ def __init__(self, parent, owner, id, name, image_id, flavor_ref, for volume in self.volumes: info_vols.append({'id': volume.id}) volume.set_attachment(id) - self.hostId = FAKE_HOSTS[0] + self.host = FAKE_HOSTS[0] self.old_host = None setattr(self, 'OS-EXT-AZ:availability_zone', 'nova') @@ -135,7 +135,7 @@ def confirm_resize(self): def revert_resize(self): if self.status != "VERIFY_RESIZE": raise RuntimeError("Not in resize confirm mode.") - self.hostId = self.old_host + self.host = self.old_host self.old_host = None self.flavor_ref = self.old_flavor_ref self.old_flavor_ref = None @@ -533,7 +533,7 @@ def _servers_to_dict(self, servers): server_dict['id'] = server.id server_dict['name'] = server.name server_dict['status'] = server.status - server_dict['hostId'] = server.hostId + server_dict['host'] = server.host ret.append(server_dict) return ret