diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-02-28 17:48:49 -0800 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-02-28 18:01:07 -0800 |
| commit | 5ab7378357312a8f326bf82cf2b6076d14b53d6b (patch) | |
| tree | 9ff538326fff7076686b4c9b5a63101e02b33359 /nova/tests/api/openstack | |
| parent | 2fa6e23e9cefb8e45bd5a6cec36b1ac6b7ac65c3 (diff) | |
| download | nova-5ab7378357312a8f326bf82cf2b6076d14b53d6b.tar.gz | |
Cast volume-related ids to str
* This is preparing the interface for uuids
* Fixes bug 943006
Change-Id: I7d27506118a830ae7257755032354ae7411567d3
Diffstat (limited to 'nova/tests/api/openstack')
| -rw-r--r-- | nova/tests/api/openstack/volume/test_snapshots.py | 13 | ||||
| -rw-r--r-- | nova/tests/api/openstack/volume/test_types.py | 1 | ||||
| -rw-r--r-- | nova/tests/api/openstack/volume/test_volumes.py | 24 |
3 files changed, 19 insertions, 19 deletions
diff --git a/nova/tests/api/openstack/volume/test_snapshots.py b/nova/tests/api/openstack/volume/test_snapshots.py index 0ef112ee94..95efc539ba 100644 --- a/nova/tests/api/openstack/volume/test_snapshots.py +++ b/nova/tests/api/openstack/volume/test_snapshots.py @@ -81,7 +81,7 @@ class SnapshotApiTest(test.TestCase): def test_snapshot_create(self): self.stubs.Set(volume.api.API, "create_snapshot", stub_snapshot_create) self.stubs.Set(volume.api.API, 'get', fakes.stub_volume_get) - snapshot = {"volume_id": 12, + snapshot = {"volume_id": '12', "force": False, "display_name": "Snapshot Test Name", "display_description": "Snapshot Test Desc"} @@ -99,7 +99,7 @@ class SnapshotApiTest(test.TestCase): self.stubs.Set(volume.api.API, "create_snapshot_force", stub_snapshot_create) self.stubs.Set(volume.api.API, 'get', fakes.stub_volume_get) - snapshot = {"volume_id": 12, + snapshot = {"volume_id": '12', "force": True, "display_name": "Snapshot Test Name", "display_description": "Snapshot Test Desc"} @@ -131,12 +131,11 @@ class SnapshotApiTest(test.TestCase): snapshot_id) def test_snapshot_show(self): - snapshot_id = 123 - req = fakes.HTTPRequest.blank('/v1/snapshots/%d' % snapshot_id) - resp_dict = self.controller.show(req, snapshot_id) + req = fakes.HTTPRequest.blank('/v1/snapshots/123') + resp_dict = self.controller.show(req, 123) self.assertTrue('snapshot' in resp_dict) - self.assertEqual(resp_dict['snapshot']['id'], snapshot_id) + self.assertEqual(resp_dict['snapshot']['id'], '123') def test_snapshot_show_invalid_id(self): snapshot_id = 234 @@ -155,7 +154,7 @@ class SnapshotApiTest(test.TestCase): self.assertEqual(len(resp_snapshots), 1) resp_snapshot = resp_snapshots.pop() - self.assertEqual(resp_snapshot['id'], 123) + self.assertEqual(resp_snapshot['id'], '123') class SnapshotSerializerTest(test.TestCase): diff --git a/nova/tests/api/openstack/volume/test_types.py b/nova/tests/api/openstack/volume/test_types.py index e16d853e5d..4628804431 100644 --- a/nova/tests/api/openstack/volume/test_types.py +++ b/nova/tests/api/openstack/volume/test_types.py @@ -112,6 +112,7 @@ class VolumeTypesApiTest(test.TestCase): res_dict = self.controller.show(req, 1) self.assertEqual(1, len(res_dict)) + self.assertEqual('1', res_dict['volume_type']['id']) self.assertEqual('vol_type_1', res_dict['volume_type']['name']) def test_volume_types_show_not_found(self): diff --git a/nova/tests/api/openstack/volume/test_volumes.py b/nova/tests/api/openstack/volume/test_volumes.py index e22e8ac134..9e9b5ff710 100644 --- a/nova/tests/api/openstack/volume/test_volumes.py +++ b/nova/tests/api/openstack/volume/test_volumes.py @@ -56,12 +56,12 @@ class VolumeApiTest(test.TestCase): 'displayName': 'Volume Test Name', 'attachments': [{'device': '/', 'serverId': 'fakeuuid', - 'id': 1, - 'volumeId': 1}], + 'id': '1', + 'volumeId': '1'}], 'volumeType': 'vol_type_name', 'snapshotId': None, 'metadata': {}, - 'id': 1, + 'id': '1', 'createdAt': datetime.datetime(1, 1, 1, 1, 1, 1), 'size': 100}} @@ -84,12 +84,12 @@ class VolumeApiTest(test.TestCase): 'displayName': 'displayname', 'attachments': [{'device': '/', 'serverId': 'fakeuuid', - 'id': 1, - 'volumeId': 1}], + 'id': '1', + 'volumeId': '1'}], 'volumeType': 'vol_type_name', 'snapshotId': None, 'metadata': {}, - 'id': 1, + 'id': '1', 'createdAt': datetime.datetime(1, 1, 1, 1, 1, 1), 'size': 1}]} @@ -104,12 +104,12 @@ class VolumeApiTest(test.TestCase): 'displayName': 'displayname', 'attachments': [{'device': '/', 'serverId': 'fakeuuid', - 'id': 1, - 'volumeId': 1}], + 'id': '1', + 'volumeId': '1'}], 'volumeType': 'vol_type_name', 'snapshotId': None, 'metadata': {}, - 'id': 1, + 'id': '1', 'createdAt': datetime.datetime(1, 1, 1, 1, 1, 1), 'size': 1}]} @@ -124,12 +124,12 @@ class VolumeApiTest(test.TestCase): 'displayName': 'displayname', 'attachments': [{'device': '/', 'serverId': 'fakeuuid', - 'id': 1, - 'volumeId': 1}], + 'id': '1', + 'volumeId': '1'}], 'volumeType': 'vol_type_name', 'snapshotId': None, 'metadata': {}, - 'id': 1, + 'id': '1', 'createdAt': datetime.datetime(1, 1, 1, 1, 1, 1), 'size': 1}} |