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/objects/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/objects/network_request.py')
| -rw-r--r-- | nova/objects/network_request.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/objects/network_request.py b/nova/objects/network_request.py index 1b128a609f..5b7c4dda1c 100644 --- a/nova/objects/network_request.py +++ b/nova/objects/network_request.py @@ -44,6 +44,12 @@ class NetworkRequest(obj_base.NovaObject): network_id, address, port_id, pci_request_id = net_tuple return cls(network_id=network_id, address=address, port_id=port_id, pci_request_id=pci_request_id) + elif len(net_tuple) == 3: + # NOTE(alex_xu): This is only for compatible with icehouse , and + # should be removed in the next cycle. + network_id, address, port_id = net_tuple + return cls(network_id=network_id, address=address, + port_id=port_id) else: network_id, address = net_tuple return cls(network_id=network_id, address=address) |