summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-23 06:30:50 +0000
committerGerrit Code Review <review@openstack.org>2017-11-23 06:30:50 +0000
commitfce0cb4c25870384a58ae78ed6d2abf777a50a37 (patch)
treea762844b3ab4b78f7e51235c134959fcb5ce37ad
parent2cee9e9107e73b66864334c54d7ee5faba281aba (diff)
parent448556bab0209766b68876747d6c318459a5afad (diff)
Merge "Remove 'locked' from server object"
-rw-r--r--doc/notification_samples/server-create-end.json1
-rw-r--r--doc/notification_samples/server-create-error.json1
-rw-r--r--doc/notification_samples/server-create-start.json1
-rw-r--r--doc/notification_samples/server-delete-end.json1
-rw-r--r--doc/notification_samples/server-delete-start.json1
-rw-r--r--mogan/api/controllers/v1/servers.py3
-rw-r--r--mogan/db/sqlalchemy/alembic/versions/91941bf1ebc9_initial_migration.py1
-rw-r--r--mogan/db/sqlalchemy/models.py1
-rw-r--r--mogan/engine/api.py8
-rw-r--r--mogan/notifications/objects/server.py2
-rw-r--r--mogan/objects/server.py1
-rw-r--r--mogan/tests/unit/db/utils.py1
-rw-r--r--mogan/tests/unit/engine/test_engine_api.py20
-rw-r--r--mogan/tests/unit/notifications/test_notification.py4
-rw-r--r--mogan/tests/unit/objects/test_objects.py2
15 files changed, 16 insertions, 32 deletions
diff --git a/doc/notification_samples/server-create-end.json b/doc/notification_samples/server-create-end.json
index 6d268b89..6d9012d 100644
--- a/doc/notification_samples/server-create-end.json
+++ b/doc/notification_samples/server-create-end.json
@@ -41,7 +41,6 @@
41 "description": null, 41 "description": null,
42 "key_name": null, 42 "key_name": null,
43 "partitions": {}, 43 "partitions": {},
44 "locked": false,
45 "name": "test", 44 "name": "test",
46 "fault": null, 45 "fault": null,
47 "created_at": "2017-09-13T08:36:06Z", 46 "created_at": "2017-09-13T08:36:06Z",
diff --git a/doc/notification_samples/server-create-error.json b/doc/notification_samples/server-create-error.json
index ea09866..0803e37 100644
--- a/doc/notification_samples/server-create-error.json
+++ b/doc/notification_samples/server-create-error.json
@@ -7,7 +7,6 @@
7 "mogan_object.data": { 7 "mogan_object.data": {
8 "status": "error", 8 "status": "error",
9 "node": "node-0", 9 "node": "node-0",
10 "locked": false,
11 "uuid": "c6e12c34-8917-4b95-938e-e146faf1de97", 10 "uuid": "c6e12c34-8917-4b95-938e-e146faf1de97",
12 "availability_zone": null, 11 "availability_zone": null,
13 "fault": { 12 "fault": {
diff --git a/doc/notification_samples/server-create-start.json b/doc/notification_samples/server-create-start.json
index 76cf676..7efc856 100644
--- a/doc/notification_samples/server-create-start.json
+++ b/doc/notification_samples/server-create-start.json
@@ -22,7 +22,6 @@
22 "description": null, 22 "description": null,
23 "key_name": null, 23 "key_name": null,
24 "partitions": {}, 24 "partitions": {},
25 "locked": false,
26 "name": "test", 25 "name": "test",
27 "fault": null, 26 "fault": null,
28 "created_at": "2017-09-13T08:36:06Z", 27 "created_at": "2017-09-13T08:36:06Z",
diff --git a/doc/notification_samples/server-delete-end.json b/doc/notification_samples/server-delete-end.json
index 1391a0e..9e5efc5 100644
--- a/doc/notification_samples/server-delete-end.json
+++ b/doc/notification_samples/server-delete-end.json
@@ -41,7 +41,6 @@
41 "description": null, 41 "description": null,
42 "key_name": null, 42 "key_name": null,
43 "partitions": {}, 43 "partitions": {},
44 "locked": false,
45 "name": "test", 44 "name": "test",
46 "fault": null, 45 "fault": null,
47 "created_at": "2017-09-13T08:15:21Z", 46 "created_at": "2017-09-13T08:15:21Z",
diff --git a/doc/notification_samples/server-delete-start.json b/doc/notification_samples/server-delete-start.json
index 3503db1..c5ccc42 100644
--- a/doc/notification_samples/server-delete-start.json
+++ b/doc/notification_samples/server-delete-start.json
@@ -41,7 +41,6 @@
41 "description": null, 41 "description": null,
42 "key_name": null, 42 "key_name": null,
43 "partitions": {}, 43 "partitions": {},
44 "locked": false,
45 "name": "test", 44 "name": "test",
46 "fault": null, 45 "fault": null,
47 "created_at": "2017-09-13T08:15:21Z", 46 "created_at": "2017-09-13T08:15:21Z",
diff --git a/mogan/api/controllers/v1/servers.py b/mogan/api/controllers/v1/servers.py
index 7e3959d..0d015bd 100644
--- a/mogan/api/controllers/v1/servers.py
+++ b/mogan/api/controllers/v1/servers.py
@@ -449,6 +449,9 @@ class Server(base.APIBase):
449 if not pecan.request.context.is_admin: 449 if not pecan.request.context.is_admin:
450 setattr(self, field, wtypes.Unset) 450 setattr(self, field, wtypes.Unset)
451 continue 451 continue
452 if field == 'locked_by':
453 setattr(self, 'locked', bool(kwargs.get('locked_by')))
454 continue
452 # Skip fields we do not expose. 455 # Skip fields we do not expose.
453 if not hasattr(self, field): 456 if not hasattr(self, field):
454 continue 457 continue
diff --git a/mogan/db/sqlalchemy/alembic/versions/91941bf1ebc9_initial_migration.py b/mogan/db/sqlalchemy/alembic/versions/91941bf1ebc9_initial_migration.py
index bb0d46d..f5d0b22 100644
--- a/mogan/db/sqlalchemy/alembic/versions/91941bf1ebc9_initial_migration.py
+++ b/mogan/db/sqlalchemy/alembic/versions/91941bf1ebc9_initial_migration.py
@@ -82,7 +82,6 @@ def upgrade():
82 sa.Column('node_uuid', sa.String(length=36), nullable=True), 82 sa.Column('node_uuid', sa.String(length=36), nullable=True),
83 sa.Column('extra', sa.Text(), nullable=True), 83 sa.Column('extra', sa.Text(), nullable=True),
84 sa.Column('partitions', sa.Text(), nullable=True), 84 sa.Column('partitions', sa.Text(), nullable=True),
85 sa.Column('locked', sa.Boolean(), nullable=True),
86 sa.Column('affinity_zone', sa.String(length=255), nullable=True), 85 sa.Column('affinity_zone', sa.String(length=255), nullable=True),
87 sa.Column('locked_by', sa.Enum('admin', 'owner'), nullable=True), 86 sa.Column('locked_by', sa.Enum('admin', 'owner'), nullable=True),
88 sa.Column('key_name', sa.String(length=255), nullable=True), 87 sa.Column('key_name', sa.String(length=255), nullable=True),
diff --git a/mogan/db/sqlalchemy/models.py b/mogan/db/sqlalchemy/models.py
index ac2f524..f70ab72 100644
--- a/mogan/db/sqlalchemy/models.py
+++ b/mogan/db/sqlalchemy/models.py
@@ -90,7 +90,6 @@ class Server(Base):
90 launched_at = Column(DateTime, nullable=True) 90 launched_at = Column(DateTime, nullable=True)
91 extra = Column(db_types.JsonEncodedDict) 91 extra = Column(db_types.JsonEncodedDict)
92 partitions = Column(db_types.JsonEncodedDict) 92 partitions = Column(db_types.JsonEncodedDict)
93 locked = Column(Boolean)
94 locked_by = Column(Enum('owner', 'admin')) 93 locked_by = Column(Enum('owner', 'admin'))
95 affinity_zone = Column(String(255), nullable=True) 94 affinity_zone = Column(String(255), nullable=True)
96 key_name = Column(String(255), nullable=True) 95 key_name = Column(String(255), nullable=True)
diff --git a/mogan/engine/api.py b/mogan/engine/api.py
index 9503d05..a86ea3a 100644
--- a/mogan/engine/api.py
+++ b/mogan/engine/api.py
@@ -46,7 +46,7 @@ MAX_USERDATA_SIZE = 65535
46def check_server_lock(function): 46def check_server_lock(function):
47 @six.wraps(function) 47 @six.wraps(function)
48 def inner(self, context, server, *args, **kwargs): 48 def inner(self, context, server, *args, **kwargs):
49 if server.locked and not context.is_admin: 49 if server.locked_by and not context.is_admin:
50 raise exception.ServerIsLocked(server_uuid=server.uuid) 50 raise exception.ServerIsLocked(server_uuid=server.uuid)
51 return function(self, context, server, *args, **kwargs) 51 return function(self, context, server, *args, **kwargs)
52 return inner 52 return inner
@@ -118,7 +118,6 @@ class API(object):
118 'flavor_uuid': flavor['uuid'], 118 'flavor_uuid': flavor['uuid'],
119 'name': name, 119 'name': name,
120 'description': description, 120 'description': description,
121 'locked': False,
122 'metadata': metadata or {}, 121 'metadata': metadata or {},
123 'partitions': partitions or {}, 122 'partitions': partitions or {},
124 'availability_zone': availability_zone, 123 'availability_zone': availability_zone,
@@ -478,11 +477,10 @@ class API(object):
478 """Lock the given server.""" 477 """Lock the given server."""
479 478
480 is_owner = server.project_id == context.project_id 479 is_owner = server.project_id == context.project_id
481 if server.locked and is_owner: 480 if server.locked_by and is_owner:
482 return 481 return
483 482
484 LOG.debug('Locking server: %s', server.uuid) 483 LOG.debug('Locking server: %s', server.uuid)
485 server.locked = True
486 server.locked_by = 'owner' if is_owner else 'admin' 484 server.locked_by = 'owner' if is_owner else 'admin'
487 server.save() 485 server.save()
488 486
@@ -490,7 +488,6 @@ class API(object):
490 """Unlock the given server.""" 488 """Unlock the given server."""
491 489
492 LOG.debug('Unlocking server: %s', server.uuid) 490 LOG.debug('Unlocking server: %s', server.uuid)
493 server.locked = False
494 server.locked_by = None 491 server.locked_by = None
495 server.save() 492 server.save()
496 493
@@ -702,7 +699,6 @@ class API(object):
702 'power_state': states.NOSTATE, 699 'power_state': states.NOSTATE,
703 'name': name, 700 'name': name,
704 'description': description, 701 'description': description,
705 'locked': False,
706 'metadata': metadata or {}, 702 'metadata': metadata or {},
707 'availability_zone': None} 703 'availability_zone': None}
708 704
diff --git a/mogan/notifications/objects/server.py b/mogan/notifications/objects/server.py
index 2eeabbf..6b41dc8 100644
--- a/mogan/notifications/objects/server.py
+++ b/mogan/notifications/objects/server.py
@@ -31,7 +31,6 @@ class ServerPayload(base.NotificationPayloadBase):
31 'power_state': ('server', 'power_state'), 31 'power_state': ('server', 'power_state'),
32 'flavor_uuid': ('server', 'flavor_uuid'), 32 'flavor_uuid': ('server', 'flavor_uuid'),
33 'description': ('server', 'description'), 33 'description': ('server', 'description'),
34 'locked': ('server', 'locked'),
35 'locked_by': ('server', 'locked_by'), 34 'locked_by': ('server', 'locked_by'),
36 'affinity_zone': ('server', 'affinity_zone'), 35 'affinity_zone': ('server', 'affinity_zone'),
37 'metadata': ('server', 'metadata'), 36 'metadata': ('server', 'metadata'),
@@ -55,7 +54,6 @@ class ServerPayload(base.NotificationPayloadBase):
55 'launched_at': fields.DateTimeField(nullable=True), 54 'launched_at': fields.DateTimeField(nullable=True),
56 'updated_at': fields.DateTimeField(nullable=True), 55 'updated_at': fields.DateTimeField(nullable=True),
57 'status': fields.StringField(nullable=True), 56 'status': fields.StringField(nullable=True),
58 'locked': fields.BooleanField(nullable=True),
59 'locked_by': fields.StringField(nullable=True), 57 'locked_by': fields.StringField(nullable=True),
60 'affinity_zone': fields.StringField(nullable=True), 58 'affinity_zone': fields.StringField(nullable=True),
61 'metadata': fields.FlexibleDictField(nullable=True), 59 'metadata': fields.FlexibleDictField(nullable=True),
diff --git a/mogan/objects/server.py b/mogan/objects/server.py
index 9b8be90..9a801c7 100644
--- a/mogan/objects/server.py
+++ b/mogan/objects/server.py
@@ -54,7 +54,6 @@ class Server(base.MoganObject, object_base.VersionedObjectDictCompat):
54 'launched_at': object_fields.DateTimeField(nullable=True), 54 'launched_at': object_fields.DateTimeField(nullable=True),
55 'metadata': object_fields.FlexibleDictField(nullable=True), 55 'metadata': object_fields.FlexibleDictField(nullable=True),
56 'partitions': object_fields.FlexibleDictField(nullable=True), 56 'partitions': object_fields.FlexibleDictField(nullable=True),
57 'locked': object_fields.BooleanField(default=False),
58 'locked_by': object_fields.StringField(nullable=True), 57 'locked_by': object_fields.StringField(nullable=True),
59 'affinity_zone': object_fields.StringField(nullable=True), 58 'affinity_zone': object_fields.StringField(nullable=True),
60 'key_name': object_fields.StringField(nullable=True), 59 'key_name': object_fields.StringField(nullable=True),
diff --git a/mogan/tests/unit/db/utils.py b/mogan/tests/unit/db/utils.py
index b03af43..a592ae6 100644
--- a/mogan/tests/unit/db/utils.py
+++ b/mogan/tests/unit/db/utils.py
@@ -64,7 +64,6 @@ def get_test_server(**kw):
64 'partitions': kw.get('partitions', {}), 64 'partitions': kw.get('partitions', {}),
65 'updated_at': kw.get('updated_at'), 65 'updated_at': kw.get('updated_at'),
66 'created_at': kw.get('created_at'), 66 'created_at': kw.get('created_at'),
67 'locked': kw.get('locked', False),
68 'locked_by': kw.get('locked_by', None), 67 'locked_by': kw.get('locked_by', None),
69 'affinity_zone': kw.get('affinity_zone', 'ZON1'), 68 'affinity_zone': kw.get('affinity_zone', 'ZON1'),
70 'key_name': kw.get('key_name', 'test_key') 69 'key_name': kw.get('key_name', 'test_key')
diff --git a/mogan/tests/unit/engine/test_engine_api.py b/mogan/tests/unit/engine/test_engine_api.py
index d27b5f6..1ff4e76 100644
--- a/mogan/tests/unit/engine/test_engine_api.py
+++ b/mogan/tests/unit/engine/test_engine_api.py
@@ -238,16 +238,14 @@ class ComputeAPIUnitTest(base.DbTestCase):
238 user_id=self.user_id, project_id=self.project_id) 238 user_id=self.user_id, project_id=self.project_id)
239 fake_server_obj = self._create_fake_server_obj(fake_server) 239 fake_server_obj = self._create_fake_server_obj(fake_server)
240 self.engine_api.lock(self.context, fake_server_obj) 240 self.engine_api.lock(self.context, fake_server_obj)
241 self.assertTrue(fake_server_obj.locked)
242 self.assertEqual('owner', fake_server_obj.locked_by) 241 self.assertEqual('owner', fake_server_obj.locked_by)
243 242
244 def test_unlock_by_owner(self): 243 def test_unlock_by_owner(self):
245 fake_server = db_utils.get_test_server( 244 fake_server = db_utils.get_test_server(
246 user_id=self.user_id, project_id=self.project_id, 245 user_id=self.user_id, project_id=self.project_id,
247 locked=True, locked_by='owner') 246 locked_by='owner')
248 fake_server_obj = self._create_fake_server_obj(fake_server) 247 fake_server_obj = self._create_fake_server_obj(fake_server)
249 self.engine_api.unlock(self.context, fake_server_obj) 248 self.engine_api.unlock(self.context, fake_server_obj)
250 self.assertFalse(fake_server_obj.locked)
251 self.assertIsNone(fake_server_obj.locked_by) 249 self.assertIsNone(fake_server_obj.locked_by)
252 250
253 def test_lock_by_admin(self): 251 def test_lock_by_admin(self):
@@ -256,24 +254,22 @@ class ComputeAPIUnitTest(base.DbTestCase):
256 fake_server_obj = self._create_fake_server_obj(fake_server) 254 fake_server_obj = self._create_fake_server_obj(fake_server)
257 admin_context = context.get_admin_context() 255 admin_context = context.get_admin_context()
258 self.engine_api.lock(admin_context, fake_server_obj) 256 self.engine_api.lock(admin_context, fake_server_obj)
259 self.assertTrue(fake_server_obj.locked)
260 self.assertEqual('admin', fake_server_obj.locked_by) 257 self.assertEqual('admin', fake_server_obj.locked_by)
261 258
262 def test_unlock_by_admin(self): 259 def test_unlock_by_admin(self):
263 fake_server = db_utils.get_test_server( 260 fake_server = db_utils.get_test_server(
264 user_id=self.user_id, project_id=self.project_id, 261 user_id=self.user_id, project_id=self.project_id,
265 locked=True, locked_by='owner') 262 locked_by='owner')
266 fake_server_obj = self._create_fake_server_obj(fake_server) 263 fake_server_obj = self._create_fake_server_obj(fake_server)
267 admin_context = context.get_admin_context() 264 admin_context = context.get_admin_context()
268 self.engine_api.unlock(admin_context, fake_server_obj) 265 self.engine_api.unlock(admin_context, fake_server_obj)
269 self.assertFalse(fake_server_obj.locked)
270 self.assertIsNone(fake_server_obj.locked_by) 266 self.assertIsNone(fake_server_obj.locked_by)
271 267
272 @mock.patch('mogan.engine.api.API._delete_server') 268 @mock.patch('mogan.engine.api.API._delete_server')
273 def test_delete_locked_server_with_non_admin(self, mock_deleted): 269 def test_delete_locked_server_with_non_admin(self, mock_deleted):
274 fake_server = db_utils.get_test_server( 270 fake_server = db_utils.get_test_server(
275 user_id=self.user_id, project_id=self.project_id, 271 user_id=self.user_id, project_id=self.project_id,
276 locked=True, locked_by='owner') 272 locked_by='owner')
277 fake_server_obj = self._create_fake_server_obj(fake_server) 273 fake_server_obj = self._create_fake_server_obj(fake_server)
278 self.assertRaises(exception.ServerIsLocked, 274 self.assertRaises(exception.ServerIsLocked,
279 self.engine_api.delete, 275 self.engine_api.delete,
@@ -284,7 +280,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
284 def test_power_locked_server_with_non_admin(self, mock_powered): 280 def test_power_locked_server_with_non_admin(self, mock_powered):
285 fake_server = db_utils.get_test_server( 281 fake_server = db_utils.get_test_server(
286 user_id=self.user_id, project_id=self.project_id, 282 user_id=self.user_id, project_id=self.project_id,
287 locked=True, locked_by='owner') 283 locked_by='owner')
288 fake_server_obj = self._create_fake_server_obj(fake_server) 284 fake_server_obj = self._create_fake_server_obj(fake_server)
289 self.assertRaises(exception.ServerIsLocked, 285 self.assertRaises(exception.ServerIsLocked,
290 self.engine_api.power, 286 self.engine_api.power,
@@ -295,7 +291,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
295 def test_delete_locked_server_with_admin(self, mock_deleted): 291 def test_delete_locked_server_with_admin(self, mock_deleted):
296 fake_server = db_utils.get_test_server( 292 fake_server = db_utils.get_test_server(
297 user_id=self.user_id, project_id=self.project_id, 293 user_id=self.user_id, project_id=self.project_id,
298 locked=True, locked_by='owner') 294 locked_by='owner')
299 fake_server_obj = self._create_fake_server_obj(fake_server) 295 fake_server_obj = self._create_fake_server_obj(fake_server)
300 admin_context = context.get_admin_context() 296 admin_context = context.get_admin_context()
301 self.engine_api.delete(admin_context, fake_server_obj) 297 self.engine_api.delete(admin_context, fake_server_obj)
@@ -305,7 +301,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
305 def test_power_locked_server_with_admin(self, mock_powered): 301 def test_power_locked_server_with_admin(self, mock_powered):
306 fake_server = db_utils.get_test_server( 302 fake_server = db_utils.get_test_server(
307 user_id=self.user_id, project_id=self.project_id, 303 user_id=self.user_id, project_id=self.project_id,
308 locked=True, locked_by='owner') 304 locked_by='owner')
309 fake_server_obj = self._create_fake_server_obj(fake_server) 305 fake_server_obj = self._create_fake_server_obj(fake_server)
310 admin_context = context.get_admin_context() 306 admin_context = context.get_admin_context()
311 self.engine_api.power(admin_context, fake_server_obj, 'reboot') 307 self.engine_api.power(admin_context, fake_server_obj, 'reboot')
@@ -315,7 +311,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
315 def test_rebuild_locked_server_with_non_admin(self, mock_rebuild): 311 def test_rebuild_locked_server_with_non_admin(self, mock_rebuild):
316 fake_server = db_utils.get_test_server( 312 fake_server = db_utils.get_test_server(
317 user_id=self.user_id, project_id=self.project_id, 313 user_id=self.user_id, project_id=self.project_id,
318 locked=True, locked_by='owner') 314 locked_by='owner')
319 fake_server_obj = self._create_fake_server_obj(fake_server) 315 fake_server_obj = self._create_fake_server_obj(fake_server)
320 self.assertRaises(exception.ServerIsLocked, 316 self.assertRaises(exception.ServerIsLocked,
321 self.engine_api.rebuild, 317 self.engine_api.rebuild,
@@ -328,7 +324,7 @@ class ComputeAPIUnitTest(base.DbTestCase):
328 mock_get_image): 324 mock_get_image):
329 fake_server = db_utils.get_test_server( 325 fake_server = db_utils.get_test_server(
330 user_id=self.user_id, project_id=self.project_id, 326 user_id=self.user_id, project_id=self.project_id,
331 locked=True, locked_by='owner') 327 locked_by='owner')
332 fake_server_obj = self._create_fake_server_obj(fake_server) 328 fake_server_obj = self._create_fake_server_obj(fake_server)
333 admin_context = context.get_admin_context() 329 admin_context = context.get_admin_context()
334 mock_get_image.side_effect = None 330 mock_get_image.side_effect = None
diff --git a/mogan/tests/unit/notifications/test_notification.py b/mogan/tests/unit/notifications/test_notification.py
index 34fe536..5b42216 100644
--- a/mogan/tests/unit/notifications/test_notification.py
+++ b/mogan/tests/unit/notifications/test_notification.py
@@ -226,9 +226,9 @@ class TestNotificationBase(test_base.TestCase):
226 226
227 227
228notification_object_data = { 228notification_object_data = {
229 'ServerPayload': '1.0-55ce3a2c615a32c80b152aaf2b905703', 229 'ServerPayload': '1.0-30fefa8478f1b9b35c66868377fb6dfd',
230 'ServerAddressesPayload': '1.0-69caf4c36f36756bb1f6970d093ee1f6', 230 'ServerAddressesPayload': '1.0-69caf4c36f36756bb1f6970d093ee1f6',
231 'ServerActionPayload': '1.0-a22c2f18b8dd17a3990e5b4c64989d26', 231 'ServerActionPayload': '1.0-8dc4429afa34d86ab92c9387e3ccd0c3',
232 'ServerActionNotification': '1.0-20087e599436bd9db62ae1fb5e2dfef2', 232 'ServerActionNotification': '1.0-20087e599436bd9db62ae1fb5e2dfef2',
233 'ExceptionPayload': '1.0-7c31986d8d78bed910c324965c431e18', 233 'ExceptionPayload': '1.0-7c31986d8d78bed910c324965c431e18',
234 'EventType': '1.0-93493dd78bdfed806fca70c91d85cbb4', 234 'EventType': '1.0-93493dd78bdfed806fca70c91d85cbb4',
diff --git a/mogan/tests/unit/objects/test_objects.py b/mogan/tests/unit/objects/test_objects.py
index dabff02..a106039 100644
--- a/mogan/tests/unit/objects/test_objects.py
+++ b/mogan/tests/unit/objects/test_objects.py
@@ -382,7 +382,7 @@ class _TestObject(object):
382# version bump. It is md5 hash of object fields and remotable methods. 382# version bump. It is md5 hash of object fields and remotable methods.
383# The fingerprint values should only be changed if there is a version bump. 383# The fingerprint values should only be changed if there is a version bump.
384expected_object_fingerprints = { 384expected_object_fingerprints = {
385 'Server': '1.0-6b13b984cd3656a977456a12d3d1c167', 385 'Server': '1.0-1480ee88a244bf44492f61f20a022a6f',
386 'ServerFault': '1.0-74349ff701259e4834b4e9dc2dac1b12', 386 'ServerFault': '1.0-74349ff701259e4834b4e9dc2dac1b12',
387 'ServerFaultList': '1.0-43e8aad0258652921f929934e9e048fd', 387 'ServerFaultList': '1.0-43e8aad0258652921f929934e9e048fd',
388 'Flavor': '1.0-9f7166aa387d89ec40cd699019d0c9a9', 388 'Flavor': '1.0-9f7166aa387d89ec40cd699019d0c9a9',