addons: dhcp: executing dhclient4 and dhclient6 ops independently

Ticket: CM-13817
Reviewed By: CCR-5408
Testing Done: steups explained in the bug

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>

addons/dhcp.py

@@ -38,11 +38,8 @@ class dhcp(moduleBase):
 
     def _up(self, ifaceobj):
         # if dhclient is already running do not stop and start it
-        if self.dhclientcmd.is_running(ifaceobj.name) or \
-               self.dhclientcmd.is_running6(ifaceobj.name):
-            self.logger.info('dhclient already running on %s.  Not restarting.' % \
-                             ifaceobj.name)
-            return
+        dhclient4_running = self.dhclientcmd.is_running(ifaceobj.name)
+        dhclient6_running = self.dhclientcmd.is_running6(ifaceobj.name)
         try:
             dhclient_cmd_prefix = None
             dhcp_wait = policymanager.policymanager_api.get_attr_default(
@@ -54,6 +51,10 @@ class dhcp(moduleBase):
                 dhclient_cmd_prefix = '%s %s' %(self.vrf_exec_cmd_prefix, vrf)
 
             if 'inet' in ifaceobj.addr_family:
+                if dhclient4_running:
+                    self.logger.info('dhclient4 already running on %s. '
+                                     'Not restarting.' % ifaceobj.name)
+                else:
                     # First release any existing dhclient processes
                     try:
                         if not ifupdownflags.flags.PERFMODE:
@@ -63,6 +64,10 @@ class dhcp(moduleBase):
                     self.dhclientcmd.start(ifaceobj.name, wait=wait,
                                            cmd_prefix=dhclient_cmd_prefix)
             if 'inet6' in ifaceobj.addr_family:
+                if dhclient6_running:
+                    self.logger.info('dhclient6 already running on %s. '
+                                     'Not restarting.' % ifaceobj.name)
+                else:
                     accept_ra = ifaceobj.get_attr_value_first('accept_ra')
                     if accept_ra:
                         # XXX: Validate value
@@ -93,7 +98,6 @@ class dhcp(moduleBase):
                             return
                         time.sleep(2)
 
-
         except Exception, e:
             self.log_error(str(e), ifaceobj)
 

ifupdownaddons/dhclient.py

@@ -99,5 +99,6 @@ class dhclient(utilsBase):
     def release6(self, ifacename, cmd_prefix=None):
         cmd = ['/sbin/dhclient', '-6', '-r', '-pf',
                '/run/dhclient6.%s.pid' %ifacename,
+              '-lf', '/var/lib/dhcp/dhclient6.%s.leases' % ifacename,
                '%s' %ifacename]
         self._run_dhclient_cmd(cmd, cmd_prefix)