diff options
| author | Dan Wendlandt <dan@nicira.com> | 2011-08-04 16:20:38 -0700 |
|---|---|---|
| committer | Dan Wendlandt <dan@nicira.com> | 2011-08-04 16:20:38 -0700 |
| commit | 18f09f165b5dca5f11253b143045b2ff7327532d (patch) | |
| tree | f11673ad028f1464fa205018756aa1c85d6398c2 /nova/virt | |
| parent | e770068ae33afb444140de624d6f5f8543e0136b (diff) | |
| download | nova-18f09f165b5dca5f11253b143045b2ff7327532d.tar.gz nova-18f09f165b5dca5f11253b143045b2ff7327532d.tar.xz nova-18f09f165b5dca5f11253b143045b2ff7327532d.zip | |
move ensure_vlan_bridge,ensure_bridge,ensure_vlan to the bridge/vlan specific vif-plugging driver
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/libvirt/vif.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index eef582fac..f42eeec98 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -79,12 +79,14 @@ class LibvirtBridgeDriver(VIFDriver): LOG.debug(_('Ensuring vlan %(vlan)s and bridge %(bridge)s'), {'vlan': network['vlan'], 'bridge': network['bridge']}) - linux_net.ensure_vlan_bridge(network['vlan'], + linux_net.LinuxBridgeInterfaceDriver.ensure_vlan_bridge( + network['vlan'], network['bridge'], network['bridge_interface']) else: LOG.debug(_("Ensuring bridge %s"), network['bridge']) - linux_net.ensure_bridge(network['bridge'], + linux_net.LinuxBridgeInterfaceDriver.ensure_bridge( + network['bridge'], network['bridge_interface']) return self._get_configurations(network, mapping) |