commit b097c0f1bda297c938ec76278494f775f31abd03
author You Wang <you@opennetworking.org> Fri Feb 16 16:19:41 2018 -0800
committer You Wang <you@opennetworking.org> Fri Feb 16 16:19:41 2018 -0800
tree a5e3a32e76c72d5a4fb0f7d369604ed01c203929
parent 728fcb1fbc9fb11d5f2b56defffe6a3c0d49fb6a

DHCP clients should always specify lease file

Change-Id: I49da5b9a833a0e34cffffd7d9d4bd333e448d9d9

TestON/tests/USECASE/SegmentRouting/dependencies/trellislib.py

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/trellislib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/trellislib.py
index 4c827f0..f4c1df0 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/trellislib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/trellislib.py
@@ -307,11 +307,7 @@
             self.nameToIntf[self.vlanIntf] = defaultIntf
 
         if self.dhcpClient:
-            if self.vlan or self.dualHomed:
-                # Why leaseFile is not required here?
-                self.cmd('dhclient -q -%s -nw -pf %s %s' % (6 if self.ipv6 else 4, self.pidFile, self.defaultIntf()))
-            else:
-                self.cmd('dhclient -q -%s -nw -pf %s -lf %s %s' % (6 if self.ipv6 else 4, self.pidFile, self.leaseFile, self.defaultIntf()))
+            self.cmd('dhclient -q -%s -nw -pf %s -lf %s %s' % (6 if self.ipv6 else 4, self.pidFile, self.leaseFile, self.defaultIntf()))
         else:
             # Setup IP addresses
             for ip in self.ips: