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

addons: dhcp: Policy to specify DUID type to use on dhcpv6 requests

Browse Source 
Add a ifupdown2 policy attribute dhcp6-duid to allow user to specify the DUID type
to be used on an IPv6 enabled interface.

Signed-off-by: Rajendra Dendukuri <rajendra.dendukuri@broadcom.com>
This commit is contained in:
Rajendra Dendukuri
2019-07-06 15:14:38 -07:00
parent c9091d7108
commit f62cfb7b95
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ifupdown2/addons/dhcp.py
View File

@@ -68,6 +68,8 @@ class dhcp(moduleBase):
except:
timeout = 10
pass
dhcp6_duid = policymanager.policymanager_api.get_iface_default(module_name=self.__class__.__name__, \
ifname=ifaceobj.name, attr='dhcp6-duid')
vrf = ifaceobj.get_attr_value_first('vrf')
if (vrf and self.vrf_exec_cmd_prefix and
@@ -103,7 +105,7 @@ class dhcp(moduleBase):
self.sysctl_set('net.ipv6.conf.%s' %ifaceobj.name +
'.autoconf', autoconf)
try:
self.dhclientcmd.stop6(ifaceobj.name)
self.dhclientcmd.stop6(ifaceobj.name, duid=dhcp6_duid)
except:
pass
#add delay before starting IPv6 dhclient to
@@ -118,7 +120,7 @@ class dhcp(moduleBase):
if r:
self.dhclientcmd.start6(ifaceobj.name,
wait=wait,
cmd_prefix=dhclient_cmd_prefix)
cmd_prefix=dhclient_cmd_prefix, duid=dhcp6_duid)
return
timeout -= 1
if timeout:
@@ -144,8 +146,10 @@ class dhcp(moduleBase):
if (vrf and self.vrf_exec_cmd_prefix and
self.ipcmd.link_exists(vrf)):
dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf)
dhcp6_duid = policymanager.policymanager_api.get_iface_default(module_name=self.__class__.__name__, \
ifname=ifaceobj.name, attr='dhcp6-duid')
if 'inet6' in ifaceobj.addr_family:
self.dhclientcmd.release6(ifaceobj.name, dhclient_cmd_prefix)
self.dhclientcmd.release6(ifaceobj.name, dhclient_cmd_prefix, duid=dhcp6_duid)
if 'inet' in ifaceobj.addr_family:
self.dhclientcmd.release(ifaceobj.name, dhclient_cmd_prefix)

15
ifupdown2/ifupdownaddons/dhclient.py
View File

@@ -85,25 +85,34 @@ class dhclient(utilsBase):
'%s' %ifacename]
self._run_dhclient_cmd(cmd, cmd_prefix)
def start6(self, ifacename, wait=True, cmd_prefix=None):
def start6(self, ifacename, wait=True, cmd_prefix=None, duid=None):
cmd = ['/sbin/dhclient', '-6', '-pf',
'/run/dhclient6.%s.pid' %ifacename, '-lf',
'/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
'%s' %ifacename]
if not wait:
cmd.append('-nw')
if duid is not None:
cmd.append('-D')
cmd.append(duid)
self._run_dhclient_cmd(cmd, cmd_prefix)
def stop6(self, ifacename, cmd_prefix=None):
def stop6(self, ifacename, cmd_prefix=None, duid=None):
cmd = ['/sbin/dhclient', '-6', '-x', '-pf',
'/run/dhclient6.%s.pid' % ifacename, '-lf',
'/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
'%s' %ifacename]
if duid is not None:
cmd.append('-D')
cmd.append(duid)
self._run_dhclient_cmd(cmd, cmd_prefix)
def release6(self, ifacename, cmd_prefix=None):
def release6(self, ifacename, cmd_prefix=None, duid=None):
cmd = ['/sbin/dhclient', '-6', '-r', '-pf',
'/run/dhclient6.%s.pid' %ifacename,
'-lf', '/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
'%s' %ifacename]
if duid is not None:
cmd.append('-D')
cmd.append(duid)
self._run_dhclient_cmd(cmd, cmd_prefix)