openstack/nova
Code Issues Proposed changes

Merge "Move helper APIs for OVS ports into linux_net"

Browse Source
This commit is contained in:
Jenkins 2013-01-23 19:25:07 +00:00 committed by Gerrit Code Review
commit ec543f9834
2 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nova/network/linux_net.py
View File

@ -1124,6 +1124,24 @@ def _create_veth_pair(dev1_name, dev2_name):
run_as_root=True) run_as_root=True)
def create_ovs_vif_port(bridge, dev, iface_id, mac, instance_id):
utils.execute('ovs-vsctl', '--', '--may-exist', 'add-port',
bridge, dev,
'--', 'set', 'Interface', dev,
'external-ids:iface-id=%s' % iface_id,
'external-ids:iface-status=active',
'external-ids:attached-mac=%s' % mac,
'external-ids:vm-uuid=%s' % instance_id,
run_as_root=True)
def delete_ovs_vif_port(bridge, dev):
utils.execute('ovs-vsctl', 'del-port', bridge, dev,
run_as_root=True)
utils.execute('ip', 'link', 'delete', dev,
run_as_root=True)
# Similar to compute virt layers, the Linux network node # Similar to compute virt layers, the Linux network node
# code uses a flexible driver model to support different ways # code uses a flexible driver model to support different ways
# of creating ethernet interfaces and attaching them to the network. # of creating ethernet interfaces and attaching them to the network.

40
nova/virt/libvirt/vif.py
View File

@ -165,21 +165,6 @@ class LibvirtOpenVswitchDriver(LibvirtBaseVIFDriver):
return conf return conf
def create_ovs_vif_port(self, bridge, dev, iface_id, mac, instance_id):
utils.execute('ovs-vsctl', '--', '--may-exist', 'add-port',
bridge, dev,
'--', 'set', 'Interface', dev,
'external-ids:iface-id=%s' % iface_id,
'external-ids:iface-status=active',
'external-ids:attached-mac=%s' % mac,
'external-ids:vm-uuid=%s' % instance_id,
run_as_root=True)
def delete_ovs_vif_port(self, bridge, dev):
utils.execute('ovs-vsctl', 'del-port', bridge, dev,
run_as_root=True)
utils.execute('ip', 'link', 'delete', dev, run_as_root=True)
def plug(self, instance, vif): def plug(self, instance, vif):
network, mapping = vif network, mapping = vif
iface_id = self.get_ovs_interfaceid(mapping) iface_id = self.get_ovs_interfaceid(mapping)
@ -198,22 +183,21 @@ class LibvirtOpenVswitchDriver(LibvirtBaseVIFDriver):
utils.execute('tunctl', '-b', '-t', dev, run_as_root=True) utils.execute('tunctl', '-b', '-t', dev, run_as_root=True)
utils.execute('ip', 'link', 'set', dev, 'up', run_as_root=True) utils.execute('ip', 'link', 'set', dev, 'up', run_as_root=True)
self.create_ovs_vif_port(self.get_bridge_name(network), linux_net.create_ovs_vif_port(self.get_bridge_name(network),
dev, iface_id, mapping['mac'], dev, iface_id, mapping['mac'],
instance['uuid']) instance['uuid'])
def unplug(self, instance, vif): def unplug(self, instance, vif):
"""Unplug the VIF by deleting the port from the bridge.""" """Unplug the VIF by deleting the port from the bridge."""
try: try:
network, mapping = vif network, mapping = vif
self.delete_ovs_vif_port(self.get_bridge_name(network), linux_net.delete_ovs_vif_port(self.get_bridge_name(network),
self.get_vif_devname(mapping)) self.get_vif_devname(mapping))
except exception.ProcessExecutionError: except exception.ProcessExecutionError:
LOG.exception(_("Failed while unplugging vif"), instance=instance) LOG.exception(_("Failed while unplugging vif"), instance=instance)
class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver, class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver):
LibvirtOpenVswitchDriver):
"""VIF driver that uses OVS + Linux Bridge for iptables compatibility. """VIF driver that uses OVS + Linux Bridge for iptables compatibility.
Enables the use of OVS-based Quantum plugins while at the same Enables the use of OVS-based Quantum plugins while at the same
@ -232,6 +216,9 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver,
def get_bridge_name(self, network): def get_bridge_name(self, network):
return network.get('bridge') or CONF.libvirt_ovs_bridge return network.get('bridge') or CONF.libvirt_ovs_bridge
def get_ovs_interfaceid(self, mapping):
return mapping.get('ovs_interfaceid') or mapping['vif_uuid']
def get_config(self, instance, network, mapping): def get_config(self, instance, network, mapping):
br_name = self.get_br_name(mapping['vif_uuid']) br_name = self.get_br_name(mapping['vif_uuid'])
network['bridge'] = br_name network['bridge'] = br_name
@ -261,9 +248,9 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver,
linux_net._create_veth_pair(v1_name, v2_name) linux_net._create_veth_pair(v1_name, v2_name)
utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True) utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True)
utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True) utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True)
self.create_ovs_vif_port(self.get_bridge_name(network), linux_net.create_ovs_vif_port(self.get_bridge_name(network),
v2_name, iface_id, mapping['mac'], v2_name, iface_id, mapping['mac'],
instance['uuid']) instance['uuid'])
def unplug(self, instance, vif): def unplug(self, instance, vif):
"""UnPlug using hybrid strategy """UnPlug using hybrid strategy
@ -281,7 +268,8 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver,
run_as_root=True) run_as_root=True)
utils.execute('brctl', 'delbr', br_name, run_as_root=True) utils.execute('brctl', 'delbr', br_name, run_as_root=True)
self.delete_ovs_vif_port(self.get_bridge_name(network), v2_name) linux_net.delete_ovs_vif_port(self.get_bridge_name(network),
v2_name)
except exception.ProcessExecutionError: except exception.ProcessExecutionError:
LOG.exception(_("Failed while unplugging vif"), instance=instance) LOG.exception(_("Failed while unplugging vif"), instance=instance)