mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

dhcp: add support for inet + inet6 dhcp on same interface

Browse Source 
Ticket: CM-12370
Reviewed By: Roopa, Kanna, Scott E
Testing Done:

This patch also fixes a problem where dhcp6 used to create lease file with
a trailing whitespace. dhcp6 operation were also sometimes using the wrong
pid file. I added some code in the debian.postinst script to correctly
rename these files if they exists when we install/update ifupdown2.

(cumulus-qa-infra/cl-tests/tests/smoke/testdhcp.py:Testdhcp_relay)
auto swp1
iface swp1 inet dhcp
      link-speed 10000
      link-duplex full
      link-autoneg off

auto swp1
iface swp1 inet6 dhcp

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-11-15 18:33:07 +01:00
parent 99b652303f
commit 004d1e6585
7 changed files with 88 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/address.py
View File

@@ -572,7 +572,7 @@ class address(moduleBase):
isloopback = self.ipcmd.link_isloopback(ifaceobjrunning.name) isloopback = self.ipcmd.link_isloopback(ifaceobjrunning.name)
if isloopback: if isloopback:
default_addrs = ['127.0.0.1/8', '::1/128'] default_addrs = ['127.0.0.1/8', '::1/128']
ifaceobjrunning.addr_family = 'inet' ifaceobjrunning.addr_family.append('inet')
ifaceobjrunning.addr_method = 'loopback' ifaceobjrunning.addr_method = 'loopback'
else: else:
default_addrs = [] default_addrs = []

46
addons/dhcp.py
View File

@@ -44,7 +44,7 @@ class dhcp(moduleBase):
self.ipcmd.link_exists(vrf)): self.ipcmd.link_exists(vrf)):
dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf) dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf)
if ifaceobj.addr_family == 'inet': if 'inet' in ifaceobj.addr_family:
# First release any existing dhclient processes # First release any existing dhclient processes
try: try:
if not ifupdownflags.flags.PERFMODE: if not ifupdownflags.flags.PERFMODE:
@@ -53,7 +53,7 @@ class dhcp(moduleBase):
pass pass
self.dhclientcmd.start(ifaceobj.name, wait=wait, self.dhclientcmd.start(ifaceobj.name, wait=wait,
cmd_prefix=dhclient_cmd_prefix) cmd_prefix=dhclient_cmd_prefix)
elif ifaceobj.addr_family == 'inet6': if 'inet6' in ifaceobj.addr_family:
accept_ra = ifaceobj.get_attr_value_first('accept_ra') accept_ra = ifaceobj.get_attr_value_first('accept_ra')
if accept_ra: if accept_ra:
# XXX: Validate value # XXX: Validate value
@@ -82,37 +82,43 @@ class dhcp(moduleBase):
if (vrf and self.vrf_exec_cmd_prefix and if (vrf and self.vrf_exec_cmd_prefix and
self.ipcmd.link_exists(vrf)): self.ipcmd.link_exists(vrf)):
dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf) dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf)
if ifaceobj.addr_family == 'inet6': if 'inet6' in ifaceobj.addr_family:
self.dhclientcmd.release6(ifaceobj.name, dhclient_cmd_prefix) self.dhclientcmd.release6(ifaceobj.name, dhclient_cmd_prefix)
else: if 'inet' in ifaceobj.addr_family:
self.dhclientcmd.release(ifaceobj.name, dhclient_cmd_prefix) self.dhclientcmd.release(ifaceobj.name, dhclient_cmd_prefix)
self.ipcmd.link_down(ifaceobj.name) self.ipcmd.link_down(ifaceobj.name)
def _query_check(self, ifaceobj, ifaceobjcurr): def _query_check(self, ifaceobj, ifaceobjcurr):
if self.dhclientcmd.is_running(ifaceobjcurr.name): status = ifaceStatus.SUCCESS
ifaceobjcurr.addr_family = 'inet' dhcp_running = False
if ifaceobj.addr_family != 'inet':
ifaceobjcurr.status = ifaceStatus.ERROR dhcp_v4 = self.dhclientcmd.is_running(ifaceobjcurr.name)
dhcp_v6 = self.dhclientcmd.is_running6(ifaceobjcurr.name)
if dhcp_v4:
dhcp_running = True
if 'inet' not in ifaceobj.addr_family and not dhcp_v6:
status = ifaceStatus.ERROR
ifaceobjcurr.addr_method = 'dhcp' ifaceobjcurr.addr_method = 'dhcp'
ifaceobjcurr.status = ifaceStatus.SUCCESS if dhcp_v6:
elif self.dhclientcmd.is_running6(ifaceobjcurr.name): dhcp_running = True
ifaceobjcurr.addr_family = 'inet6' if 'inet6' not in ifaceobj.addr_family and not dhcp_v4:
if ifaceobj.addr_family != 'inet6': status = ifaceStatus.ERROR
ifaceobjcurr.status = ifaceStatus.ERROR
ifaceobjcurr.addr_method = 'dhcp' ifaceobjcurr.addr_method = 'dhcp'
ifaceobjcurr.status = ifaceStatus.SUCCESS ifaceobjcurr.addr_family = ifaceobj.addr_family
else: if not dhcp_running:
ifaceobjcurr.addr_family = None ifaceobjcurr.addr_family = []
ifaceobjcurr.status = ifaceStatus.ERROR status = ifaceStatus.ERROR
ifaceobjcurr.status = status
def _query_running(self, ifaceobjrunning): def _query_running(self, ifaceobjrunning):
if not self.ipcmd.link_exists(ifaceobjrunning.name): if not self.ipcmd.link_exists(ifaceobjrunning.name):
return return
if self.dhclientcmd.is_running(ifaceobjrunning.name): if self.dhclientcmd.is_running(ifaceobjrunning.name):
ifaceobjrunning.addr_family = 'inet' ifaceobjrunning.addr_family.append('inet')
ifaceobjrunning.addr_method = 'dhcp' ifaceobjrunning.addr_method = 'dhcp'
elif self.dhclientcmd.is_running6(ifaceobjrunning.name): if self.dhclientcmd.is_running6(ifaceobjrunning.name):
ifaceobjrunning.addr_family = 'inet6' ifaceobjrunning.addr_family.append('inet6')
ifaceobjrunning.addr_method = 'dhcp6' ifaceobjrunning.addr_method = 'dhcp6'
_run_ops = {'up' : _up, _run_ops = {'up' : _up,

2
addons/usercmds.py
View File

@@ -40,7 +40,7 @@ class usercmds(ifupdownaddons.modulebase.moduleBase):
os.environ['IFACE'] = ifaceobj.name if ifaceobj.name else '' os.environ['IFACE'] = ifaceobj.name if ifaceobj.name else ''
os.environ['LOGICAL'] = ifaceobj.name if ifaceobj.name else '' os.environ['LOGICAL'] = ifaceobj.name if ifaceobj.name else ''
os.environ['METHOD'] = ifaceobj.addr_method if ifaceobj.addr_method else '' os.environ['METHOD'] = ifaceobj.addr_method if ifaceobj.addr_method else ''
os.environ['ADDRFAM'] = ifaceobj.addr_family if ifaceobj.addr_family else '' os.environ['ADDRFAM'] = ','.join(ifaceobj.addr_family) if ifaceobj.addr_family else ''
for cmd in cmd_list: for cmd in cmd_list:
try: try:
utils.exec_user_command(cmd) utils.exec_user_command(cmd)

10
debian/ifupdown2.postinst vendored
View File

@@ -44,6 +44,16 @@ report_err() { report "Error: $*" >&2 ; }
case "$1" in case "$1" in
configure) configure)
# work around to rename the existing dhclient6 lease file containing a space
for filename in `find /var/lib/dhcp/ -name "dhclient.*.leases "`
do
if [ -f "$filename " ];
then
interface_name=`echo $filename | cut -d'.' -f2,3,4,5`
mv "$filename " /var/lib/dhcp/dhclient6.$interface_name
fi
done
# Generic stuff done on all configurations # Generic stuff done on all configurations
if [ -f /etc/network/interfaces ] ; then if [ -f /etc/network/interfaces ] ; then
if ! grep -q "^[[:space:]]*iface[[:space:]]\+lo0\?[[:space:]]\+inet[[:space:]]\+loopback\>" /etc/network/interfaces ; then if ! grep -q "^[[:space:]]*iface[[:space:]]\+lo0\?[[:space:]]\+inet[[:space:]]\+loopback\>" /etc/network/interfaces ; then

46
ifupdown/iface.py
View File

@@ -289,7 +289,6 @@ class ifaceJsonDecoder():
class iface(): class iface():
""" ifupdown2 iface object class """ ifupdown2 iface object class
Attributes: Attributes:
**name** Name of the interface **name** Name of the interface
@@ -344,6 +343,8 @@ class iface():
version = '0.1' version = '0.1'
def __init__(self, attrsdict={}): def __init__(self, attrsdict={}):
self.addr_family = []
self._set_attrs_from_dict(attrsdict) self._set_attrs_from_dict(attrsdict)
self._config_status = {} self._config_status = {}
"""dict with config status of iface attributes""" """dict with config status of iface attributes"""
@@ -390,10 +391,13 @@ class iface():
def _set_attrs_from_dict(self, attrdict): def _set_attrs_from_dict(self, attrdict):
self.auto = attrdict.get('auto', False) self.auto = attrdict.get('auto', False)
self.name = attrdict.get('name') self.name = attrdict.get('name')
self.addr_family = attrdict.get('addr_family')
self.addr_method = attrdict.get('addr_method') self.addr_method = attrdict.get('addr_method')
self.config = attrdict.get('config', OrderedDict()) self.config = attrdict.get('config', OrderedDict())
addr_family = attrdict.get('addr_family')
if addr_family:
self.addr_family.append(addr_family)
def inc_refcnt(self): def inc_refcnt(self):
""" increment refcnt of the interface. Usually used to indicate that """ increment refcnt of the interface. Usually used to indicate that
it has dependents """ it has dependents """
@@ -579,6 +583,8 @@ class iface():
self.config[attrname].extend(attrlist) self.config[attrname].extend(attrlist)
else: else:
self.config.update([(attrname, attrlist)]) self.config.update([(attrname, attrlist)])
# we now support inet and inet6 together
self.addr_family.extend(newifaceobj.addr_family)
def __getstate__(self): def __getstate__(self):
odict = self.__dict__.copy() odict = self.__dict__.copy()
@@ -635,7 +641,7 @@ class iface():
def dump(self, logger): def dump(self, logger):
indent = '\t' indent = '\t'
logger.info(self.name + ' : {') logger.info(self.name + ' : {')
logger.info(indent + 'family: %s' %self.addr_family) logger.info(indent + 'family: %s' % ' '.join(self.addr_family))
logger.info(indent + 'method: %s' %self.addr_method) logger.info(indent + 'method: %s' %self.addr_method)
logger.info(indent + 'flags: %x' %self.flags) logger.info(indent + 'flags: %x' %self.flags)
logger.info(indent + 'state: %s' logger.info(indent + 'state: %s'
@@ -661,7 +667,7 @@ class iface():
logger.info(indent + indent + str(config)) logger.info(indent + indent + str(config))
logger.info('}') logger.info('}')
def dump_pretty(self, with_status=False, use_realname=False): def _dump_pretty(self, family, first, addr_method, with_status=False, use_realname=False):
indent = '\t' indent = '\t'
outbuf = '' outbuf = ''
if use_realname and self.realname: if use_realname and self.realname:
@@ -675,10 +681,10 @@ class iface():
ifaceline += 'vlan %s' %name ifaceline += 'vlan %s' %name
else: else:
ifaceline += 'iface %s' %name ifaceline += 'iface %s' %name
if self.addr_family: if family:
ifaceline += ' %s' %self.addr_family ifaceline += ' %s' % family
if self.addr_method: if addr_method:
ifaceline += ' %s' %self.addr_method ifaceline += ' %s' % addr_method
if with_status: if with_status:
status_str = None status_str = None
if (self.status == ifaceStatus.ERROR or if (self.status == ifaceStatus.ERROR or
@@ -689,7 +695,7 @@ class iface():
elif self.status == ifaceStatus.SUCCESS: elif self.status == ifaceStatus.SUCCESS:
status_str = '[%s]' %ifaceStatusUserStrs.SUCCESS status_str = '[%s]' %ifaceStatusUserStrs.SUCCESS
if status_str: if status_str:
outbuf += '{0:65} {1:>8}'.format(ifaceline, status_str) + '\n' outbuf += '{0:65} {1:>8}'.format(ifaceline, status_str) + '\n'
else: else:
outbuf += ifaceline + '\n' outbuf += ifaceline + '\n'
if self.status == ifaceStatus.NOTFOUND: if self.status == ifaceStatus.NOTFOUND:
@@ -700,7 +706,7 @@ class iface():
else: else:
outbuf += ifaceline + '\n' outbuf += ifaceline + '\n'
config = self.config config = self.config
if config: if config and first:
for cname, cvaluelist in config.items(): for cname, cvaluelist in config.items():
idx = 0 idx = 0
for cv in cvaluelist: for cv in cvaluelist:
@@ -723,3 +729,23 @@ class iface():
outbuf = (outbuf.encode('utf8') outbuf = (outbuf.encode('utf8')
if isinstance(outbuf, unicode) else outbuf) if isinstance(outbuf, unicode) else outbuf)
print outbuf print outbuf
def dump_pretty(self, with_status=False, use_realname=False):
if not self.addr_family:
self._dump_pretty(None, True,
self.addr_method,
with_status=with_status,
use_realname=use_realname)
else:
first = True
for family in self.addr_family:
addr_method = None
if self.addr_method:
if family == 'inet' and 'dhcp' in self.addr_method:
addr_method = 'dhcp'
elif family == 'inet6' and 'dhcp' in self.addr_method:
addr_method = 'dhcp6'
self._dump_pretty(family, first, addr_method=addr_method,
with_status=with_status,
use_realname=use_realname)
first = False

21
ifupdown/networkinterfaces.py
View File

@@ -94,20 +94,20 @@ class networkInterfaces():
self.warns += 1 self.warns += 1
def _validate_addr_family(self, ifaceobj, lineno=-1): def _validate_addr_family(self, ifaceobj, lineno=-1):
if ifaceobj.addr_family: for family in ifaceobj.addr_family:
if not self._addrfams.get(ifaceobj.addr_family): if not self._addrfams.get(family):
self._parse_error(self._currentfile, lineno, self._parse_error(self._currentfile, lineno,
'iface %s: unsupported address family \'%s\'' 'iface %s: unsupported address family \'%s\''
%(ifaceobj.name, ifaceobj.addr_family)) % (ifaceobj.name, family))
ifaceobj.addr_family = None ifaceobj.addr_family = []
ifaceobj.addr_method = None ifaceobj.addr_method = None
return return
if ifaceobj.addr_method: if ifaceobj.addr_method:
if (ifaceobj.addr_method not in if ifaceobj.addr_method not in self._addrfams.get(family):
self._addrfams.get(ifaceobj.addr_family)):
self._parse_error(self._currentfile, lineno, self._parse_error(self._currentfile, lineno,
'iface %s: unsupported address method \'%s\'' 'iface %s: unsupported '
%(ifaceobj.name, ifaceobj.addr_method)) 'address method \'%s\''
% (ifaceobj.name, ifaceobj.addr_method))
else: else:
ifaceobj.addr_method = 'static' ifaceobj.addr_method = 'static'
@@ -285,7 +285,8 @@ class networkInterfaces():
ifaceobj.generate_env() ifaceobj.generate_env()
try: try:
ifaceobj.addr_family = iface_attrs[2] if iface_attrs[2]:
ifaceobj.addr_family.append(iface_attrs[2])
ifaceobj.addr_method = iface_attrs[3] ifaceobj.addr_method = iface_attrs[3]
except IndexError: except IndexError:
# ignore # ignore

6
ifupdownaddons/dhclient.py
View File

@@ -83,7 +83,7 @@ class dhclient(utilsBase):
def start6(self, ifacename, wait=True, cmd_prefix=None): def start6(self, ifacename, wait=True, cmd_prefix=None):
cmd = ['/sbin/dhclient', '-6', '-pf', cmd = ['/sbin/dhclient', '-6', '-pf',
'/run/dhclient6.%s.pid' %ifacename, '-lf', '/run/dhclient6.%s.pid' %ifacename, '-lf',
'/var/lib/dhcp/dhclient.%s.leases ' %ifacename, '/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
'%s' %ifacename] '%s' %ifacename]
if not wait: if not wait:
cmd.append('-nw') cmd.append('-nw')
@@ -91,8 +91,8 @@ class dhclient(utilsBase):
def stop6(self, ifacename, cmd_prefix=None): def stop6(self, ifacename, cmd_prefix=None):
cmd = ['/sbin/dhclient', '-6', '-x', '-pf', cmd = ['/sbin/dhclient', '-6', '-x', '-pf',
'/run/dhclient.%s.pid' %ifacename, '-lf', '/run/dhclient6.%s.pid' % ifacename, '-lf',
'/var/lib/dhcp/dhclient.%s.leases ' %ifacename, '/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
'%s' %ifacename] '%s' %ifacename]
self._run_dhclient_cmd(cmd, cmd_prefix) self._run_dhclient_cmd(cmd, cmd_prefix)