#!/usr/bin/python
#
-# Copyright (c) Citrix Systems 2008. All rights reserved.
+# Copyright (c) 2008,2009 Citrix Systems, Inc. All rights reserved.
# Copyright (c) 2009 Nicira Networks.
#
"""Usage:
def get_netdev_by_mac(mac):
maybe = None
for device in os.listdir("/sys/class/net"):
- dev_mac = get_netdev_by_mac(device)
+ dev_mac = get_netdev_mac(device)
if dev_mac and mac.lower() == dev_mac.lower():
if get_netdev_tx_queue_len(device):
return device
pifrec = db.get_pif_record(pif)
return bridge_name(pif)
-def physdev_pifs(pif):
+def get_physdev_pifs(pif):
"""Return the PIFs for the physical network device(s) associated with pif.
For a VLAN PIF, this is the VLAN slave's physical device PIF.
For a bond master PIF, these are the bond slave PIFs.
else:
return [pif]
-def physdev_names(pif):
+def get_physdev_names(pif):
"""Return the name(s) of the physical network device(s) associated with pif.
For a VLAN PIF, the physical devices are the VLAN slave's physical devices.
For a bond master PIF, the physical devices are the bond slaves.
For a non-VLAN, non-bond master PIF, the physical device is the PIF itself.
"""
- return [db.get_pif_record(phys)['device'] for phys in physdev_pifs(pif)]
+ return [db.get_pif_record(phys)['device'] for phys in get_physdev_pifs(pif)]
def log_pif_action(action, pif):
pifrec = db.get_pif_record(pif)
else:
raise Error("Unknown IP-configuration-mode %s" % pifrec['ip_configuration_mode'])
- oc = {}
- if pifrec.has_key('other_config'):
- oc = pifrec['other_config']
- if oc.has_key('mtu'):
+ oc = pifrec['other_config']
+ if oc.has_key('mtu'):
+ try:
int(oc['mtu']) # Check that the value is an integer
ifconfig_argv += ['mtu', oc['mtu']]
+ except ValueError, x:
+ log("Invalid value for mtu = %s" % mtu)
run_command(ifconfig_argv)
for line in oc['static-routes'].split(','):
network, masklen, gateway = line.split('/')
run_command(['/sbin/ip', 'route', 'add',
- '%s/%s' % (netmask, masklen), 'via', gateway,
+ '%s/%s' % (network, masklen), 'via', gateway,
'dev', ipdev])
settings, offload = ethtool_settings(oc)
interface = interface_name(pif)
ipdev = ipdev_name(pif)
datapath = datapath_name(pif)
- physdevs = physdev_names(pif)
+ physdev_names = get_physdev_names(pif)
argv = ['--del-match=bonding.%s.[!0-9]*' % interface]
argv += ["--add=bonding.%s.slave=%s" % (interface, slave)
- for slave in physdevs]
+ for slave in physdev_names]
+ argv += ['--add=bonding.%s.fake-iface=true']
if pifrec['MAC'] != "":
argv += ['--add=port.%s.mac=%s' % (interface, pifrec['MAC'])]
interface = interface_name(pif)
ipdev = ipdev_name(pif)
datapath = datapath_name(pif)
- physdevs = physdev_names(pif)
+ physdev_pifs = get_physdev_pifs(pif)
+ physdev_names = get_physdev_names(pif)
vlan_slave = None
if pifrec['VLAN'] != '-1':
vlan_slave = get_vlan_slave_of_pif(pif)
# Check the MAC address of each network device and remap if
# necessary to make names match our expectations.
- for physdev_pif in physdev_pifs(pif):
+ for physdev_pif in physdev_pifs:
remap_pif(physdev_pif)
# "ifconfig down" the network device and delete its IP address, etc.
down_netdev(ipdev)
- for physdev in physdevs:
- down_netdev(physdev)
+ for physdev_name in physdev_names:
+ down_netdev(physdev_name)
# If we are bringing up a bond, remove IP addresses from the
# slaves (because we are implicitly being asked to take them down).
run_command(["/sbin/ifconfig", ipdev_name(bond_pif), '0.0.0.0'])
# Remove all keys related to pif and any bond masters linked to PIF.
- del_ports = [ipdev] + physdevs + bond_masters
+ del_ports = [ipdev] + physdev_names + bond_masters
if vlan_slave and bond_master:
del_ports += [interface_name(bond_master)]
# port.
add_ports = [ipdev, datapath]
if not bond_master:
- add_ports += physdevs
+ add_ports += physdev_names
else:
add_ports += [interface_name(bond_master)]
# - The bond masters for pif. (Ordinarily pif shouldn't have any
# bond masters. If it does then interface-reconfigure is
# implicitly being asked to take them down.)
- del_ports = add_ports + physdevs + bond_masters
+ del_ports = add_ports + physdev_names + bond_masters
# What networks does this datapath carry?
#
# enables or disables bond slaves based on whether carrier is
# detected when they are added, and a network device that is down
# always reports "no carrier".
- bond_slave_physdevs = []
+ bond_slave_physdev_names = []
for slave in bond_slaves:
- bond_slave_physdevs += physdev_names(slave)
- for slave_physdev in bond_slave_physdevs:
- up_netdev(slave_physdev)
+ bond_slave_physdev_names += physdev_names(slave)
+ for slave_physdev_name in bond_slave_physdev_names:
+ up_netdev(slave_physdev_name)
# Now modify the ovs-vswitchd config file.
argv = []
argv += configure_bond(bond_master)
modify_config(argv)
- # Configure network devices.
- configure_netdev(pif)
-
# Bring up VLAN slave, plus physical devices other than bond
# slaves (which we brought up earlier).
if vlan_slave:
up_netdev(ipdev_name(vlan_slave))
- for physdev in set(physdevs) - set(bond_slave_physdevs):
- up_netdev(physdev)
+ for physdev_name in set(physdev_names) - set(bond_slave_physdev_names):
+ up_netdev(physdev_name)
+
+ # Configure network devices.
+ configure_netdev(pif)
# Update /etc/issue (which contains the IP address of the management interface)
os.system("/sbin/update-issue")
git://git.onelab.eu / sliver-openvswitch.git / blobdiff