diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-10-09 18:46:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-10-09 18:46:41 +0000 |
| commit | c5ac21f3dbb4ad59efcb631d91e4e64f77fba43f (patch) | |
| tree | 2317f1adf99cb7c2d020e99bd3f350b3a4c5db88 /nova/tests/objects/test_network_request.py | |
| parent | 655f9404c21dc013f01d88a9a15e403b5e60c4f8 (diff) | |
| parent | 7c9aa6da92805f20083203a6ec8f93b1b592fc13 (diff) | |
| download | nova-proposed/juno.tar.gz | |
Merge "Fix pci_request_id break the upgrade from icehouse to juno" into proposed/juno2014.2.rc22014.2proposed/juno
Diffstat (limited to 'nova/tests/objects/test_network_request.py')
| -rw-r--r-- | nova/tests/objects/test_network_request.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/tests/objects/test_network_request.py b/nova/tests/objects/test_network_request.py index 7c2736d23b..4d74994e6f 100644 --- a/nova/tests/objects/test_network_request.py +++ b/nova/tests/objects/test_network_request.py @@ -56,6 +56,13 @@ class _TestNetworkRequestObject(object): self.assertEqual('1.2.3.4', str(request.address)) self.assertEqual(FAKE_UUID, request.port_id) + def test_from_tuple_neutron_without_pci_request_id(self): + request = objects.NetworkRequest.from_tuple( + ('123', '1.2.3.4', FAKE_UUID)) + self.assertEqual('123', request.network_id) + self.assertEqual('1.2.3.4', str(request.address)) + self.assertEqual(FAKE_UUID, request.port_id) + def test_from_tuple_nova(self): request = objects.NetworkRequest.from_tuple( ('123', '1.2.3.4')) |