Revision c449760f snf-cyclades-app/synnefo/api/tests/servers.py
b/snf-cyclades-app/synnefo/api/tests/servers.py | ||
---|---|---|
317 | 317 |
|
318 | 318 |
fixed_image = Mock() |
319 | 319 |
fixed_image.return_value = {'location': 'pithos://foo', |
320 |
'checksum': '1234',
|
|
320 |
'mapfile': '1234',
|
|
321 | 321 |
"id": 1, |
322 | 322 |
"name": "test_image", |
323 | 323 |
"size": 1024, |
... | ... | |
623 | 623 |
self.assertEqual(volume.source, "image:%s" % fixed_image()["id"]) |
624 | 624 |
self.assertEqual(volume.delete_on_termination, False) |
625 | 625 |
self.assertEqual(volume.userid, user) |
626 |
self.assertEqual(volume.origin, "pithos:" + fixed_image()["checksum"])
|
|
626 |
self.assertEqual(volume.origin, "pithos:" + fixed_image()["mapfile"])
|
|
627 | 627 |
|
628 | 628 |
# Test using a snapshot |
629 | 629 |
request["server"]["block_device_mapping_v2"] = [ |
... | ... | |
641 | 641 |
self.assertEqual(volume.disk_template, self.flavor.disk_template) |
642 | 642 |
self.assertEqual(volume.size, 10) |
643 | 643 |
self.assertEqual(volume.source, "snapshot:%s" % fixed_image()["id"]) |
644 |
self.assertEqual(volume.origin, fixed_image()["checksum"])
|
|
644 |
self.assertEqual(volume.origin, fixed_image()["mapfile"])
|
|
645 | 645 |
self.assertEqual(volume.delete_on_termination, False) |
646 | 646 |
self.assertEqual(volume.userid, user) |
647 | 647 |
|
Also available in: Unified diff