From f863697be1cf1abc49805f1345b81f49ba4556b4 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Fri, 4 Jan 2013 18:25:57 +0000 Subject: Make nova network manager fill in vif_type Make the Nova network manager impl fill in the 'vif_type' parameter in the VIF configuration for instances. This is hardcoded to VIF_TYPE_BRIDGE, since that's all Nova network supports. Blueprint: libvirt-vif-driver Change-Id: I46d1f0edc820ccc198e5a5c876ea25644ebedd86 Signed-off-by: Daniel P. Berrange --- nova/network/manager.py | 1 + nova/tests/network/test_manager.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) 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, -- cgit