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
openstack · Oct 4, 2013 · eb05b12 · eb05b12
1 parent 5250639
commit eb05b12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -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