openstack/nova
Code Issues Proposed changes

Merge "Fix calls to private method in linux_net"

Browse Source
This commit is contained in:
Jenkins 2012-11-19 23:19:52 +00:00 committed by Gerrit Code Review
commit e60d593b5e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/network/linux_net.py
View File

@ -952,7 +952,7 @@ def _execute(*cmd, **kwargs):
return utils.execute(*cmd, **kwargs) return utils.execute(*cmd, **kwargs)
def _device_exists(device): def device_exists(device):
"""Check if ethernet device exists.""" """Check if ethernet device exists."""
(_out, err) = _execute('ip', 'link', 'show', 'dev', device, (_out, err) = _execute('ip', 'link', 'show', 'dev', device,
check_exit_code=False, run_as_root=True) check_exit_code=False, run_as_root=True)
@ -1021,7 +1021,7 @@ def _create_veth_pair(dev1_name, dev2_name):
deleting any previous devices with those names. deleting any previous devices with those names.
""" """
for dev in [dev1_name, dev2_name]: for dev in [dev1_name, dev2_name]:
if _device_exists(dev): if device_exists(dev):
try: try:
utils.execute('ip', 'link', 'delete', dev1_name, utils.execute('ip', 'link', 'delete', dev1_name,
run_as_root=True, check_exit_code=[0, 2, 254]) run_as_root=True, check_exit_code=[0, 2, 254])
@ -1124,7 +1124,7 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
def ensure_vlan(_self, vlan_num, bridge_interface, mac_address=None): def ensure_vlan(_self, vlan_num, bridge_interface, mac_address=None):
"""Create a vlan unless it already exists.""" """Create a vlan unless it already exists."""
interface = 'vlan%s' % vlan_num interface = 'vlan%s' % vlan_num
if not _device_exists(interface): if not device_exists(interface):
LOG.debug(_('Starting VLAN inteface %s'), interface) LOG.debug(_('Starting VLAN inteface %s'), interface)
_execute('ip', 'link', 'add', 'link', bridge_interface, _execute('ip', 'link', 'add', 'link', bridge_interface,
'name', interface, 'type', 'vlan', 'name', interface, 'type', 'vlan',
@ -1163,7 +1163,7 @@ class LinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
interface onto the bridge and reset the default gateway if necessary. interface onto the bridge and reset the default gateway if necessary.
""" """
if not _device_exists(bridge): if not device_exists(bridge):
LOG.debug(_('Starting Bridge %s'), bridge) LOG.debug(_('Starting Bridge %s'), bridge)
_execute('brctl', 'addbr', bridge, run_as_root=True) _execute('brctl', 'addbr', bridge, run_as_root=True)
_execute('brctl', 'setfd', bridge, 0, run_as_root=True) _execute('brctl', 'setfd', bridge, 0, run_as_root=True)
@ -1232,7 +1232,7 @@ class LinuxOVSInterfaceDriver(LinuxNetInterfaceDriver):
def plug(self, network, mac_address, gateway=True): def plug(self, network, mac_address, gateway=True):
dev = self.get_dev(network) dev = self.get_dev(network)
if not _device_exists(dev): if not device_exists(dev):
bridge = CONF.linuxnet_ovs_integration_bridge bridge = CONF.linuxnet_ovs_integration_bridge
_execute('ovs-vsctl', _execute('ovs-vsctl',
'--', '--may-exist', 'add-port', bridge, dev, '--', '--may-exist', 'add-port', bridge, dev,
@ -1310,7 +1310,7 @@ class QuantumLinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
QuantumLinuxBridgeInterfaceDriver.create_tap_dev(dev, mac_address) QuantumLinuxBridgeInterfaceDriver.create_tap_dev(dev, mac_address)
if not _device_exists(bridge): if not device_exists(bridge):
LOG.debug(_("Starting bridge %s "), bridge) LOG.debug(_("Starting bridge %s "), bridge)
utils.execute('brctl', 'addbr', bridge, run_as_root=True) utils.execute('brctl', 'addbr', bridge, run_as_root=True)
utils.execute('brctl', 'setfd', bridge, str(0), run_as_root=True) utils.execute('brctl', 'setfd', bridge, str(0), run_as_root=True)
@ -1331,7 +1331,7 @@ class QuantumLinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
def unplug(self, network): def unplug(self, network):
dev = self.get_dev(network) dev = self.get_dev(network)
if not _device_exists(dev): if not device_exists(dev):
return None return None
else: else:
try: try:
@ -1345,7 +1345,7 @@ class QuantumLinuxBridgeInterfaceDriver(LinuxNetInterfaceDriver):
@classmethod @classmethod
def create_tap_dev(_self, dev, mac_address=None): def create_tap_dev(_self, dev, mac_address=None):
if not _device_exists(dev): if not device_exists(dev):
try: try:
# First, try with 'ip' # First, try with 'ip'
utils.execute('ip', 'tuntap', 'add', dev, 'mode', 'tap', utils.execute('ip', 'tuntap', 'add', dev, 'mode', 'tap',

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

@ -144,7 +144,7 @@ class LibvirtOpenVswitchDriver(vif.VIFDriver):
network, mapping = vif network, mapping = vif
iface_id = mapping['vif_uuid'] iface_id = mapping['vif_uuid']
dev = self.get_dev_name(iface_id) dev = self.get_dev_name(iface_id)
if not linux_net._device_exists(dev): if not linux_net.device_exists(dev):
# Older version of the command 'ip' from the iproute2 package # Older version of the command 'ip' from the iproute2 package
# don't have support for the tuntap option (lp:882568). If it # don't have support for the tuntap option (lp:882568). If it
# turns out we're on an old version we work around this by using # turns out we're on an old version we work around this by using
@ -212,10 +212,10 @@ class LibvirtHybridOVSBridgeDriver(LibvirtBridgeDriver,
br_name = self.get_br_name(iface_id) br_name = self.get_br_name(iface_id)
v1_name, v2_name = self.get_veth_pair_names(iface_id) v1_name, v2_name = self.get_veth_pair_names(iface_id)
if not linux_net._device_exists(br_name): if not linux_net.device_exists(br_name):
utils.execute('brctl', 'addbr', br_name, run_as_root=True) utils.execute('brctl', 'addbr', br_name, run_as_root=True)
if not linux_net._device_exists(v2_name): if not linux_net.device_exists(v2_name):
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)