diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-14 11:53:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-14 11:53:16 +0000 |
| commit | aa18fca87fd4655c47e473639a30a6b61ed88fce (patch) | |
| tree | 11cc17f51b4f30190341a288e83ff79f2a66df21 | |
| parent | 86c1ace54fee26297b2a2a276cd84e79a11dea63 (diff) | |
| parent | f863697be1cf1abc49805f1345b81f49ba4556b4 (diff) | |
| download | nova-aa18fca87fd4655c47e473639a30a6b61ed88fce.tar.gz nova-aa18fca87fd4655c47e473639a30a6b61ed88fce.tar.xz nova-aa18fca87fd4655c47e473639a30a6b61ed88fce.zip | |
Merge "Make nova network manager fill in vif_type"
| -rw-r--r-- | nova/network/manager.py | 1 | ||||
| -rw-r--r-- | nova/tests/network/test_manager.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 8d9255dac..ccdac6f60 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -1231,6 +1231,7 @@ class NetworkManager(manager.SchedulerDependentManager): nw_info = network_model.NetworkInfo() for vif in vifs: vif_dict = {'id': vif['uuid'], + 'type': network_model.VIF_TYPE_BRIDGE, 'address': vif['address']} # handle case where vif doesn't have a network diff --git a/nova/tests/network/test_manager.py b/nova/tests/network/test_manager.py index d825a86d1..385aea1ee 100644 --- a/nova/tests/network/test_manager.py +++ b/nova/tests/network/test_manager.py @@ -27,6 +27,7 @@ from nova import exception from nova import ipv6 from nova.network import linux_net from nova.network import manager as network_manager +from nova.network import model as net_model from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging @@ -184,7 +185,7 @@ class FlatNetworkTestCase(test.TestCase): 'label': 'test%d' % nid, 'mac': 'DE:AD:BE:EF:00:%02x' % nid, 'rxtx_cap': 30, - 'vif_type': None, + 'vif_type': net_model.VIF_TYPE_BRIDGE, 'vif_uuid': '00000000-0000-0000-0000-00000000000000%02d' % nid, 'should_create_vlan': False, |