Change in vdsm[master]: delete_dhclient_leases does not need to consider el6 anymore

ibarkan at redhat.com ibarkan at redhat.com
Sun Apr 5 12:34:51 UTC 2015


Ido Barkan has uploaded a new change for review.

Change subject: delete_dhclient_leases does not need to consider el6 anymore
......................................................................

delete_dhclient_leases does not need to consider el6 anymore

Change-Id: I3aae489f11d1c5f63d9079e5059627038bef0954
Signed-off-by: Ido Barkan <ibarkan at redhat.com>
---
M tests/functional/dhcp.py
M tests/functional/networkTests.py
2 files changed, 6 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/35/39535/1

diff --git a/tests/functional/dhcp.py b/tests/functional/dhcp.py
index 68a9d4c..47f8e0d 100644
--- a/tests/functional/dhcp.py
+++ b/tests/functional/dhcp.py
@@ -34,7 +34,6 @@
 _DHCLIENT_TIMEOUT = 10
 _WAIT_FOR_STOP_TIMEOUT = 2
 DHCLIENT_LEASE = '/var/lib/dhclient/dhclient{0}--{1}.lease'
-DHCLIENT_LEASE_EL6 = '/var/lib/dhclient/dhclient{0}-{1}.leases'
 
 
 class DhcpError(Exception):
@@ -158,9 +157,8 @@
         return executable == _DHCLIENT_BINARY.cmd
 
 
-def delete_dhclient_leases(iface, dhcpv4=False, dhcpv6=False, el6=False):
-    lease_file = DHCLIENT_LEASE_EL6 if el6 else DHCLIENT_LEASE
+def delete_dhclient_leases(iface, dhcpv4=False, dhcpv6=False):
     if dhcpv4:
-        rmFile(lease_file.format('', iface))
+        rmFile(DHCLIENT_LEASE.format('', iface))
     if dhcpv6:
-        rmFile(lease_file.format('6', iface))
+        rmFile(DHCLIENT_LEASE.format('6', iface))
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 8671244..cc63895 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1827,8 +1827,7 @@
                             self.assertRuleDoesNotExist(rule)
                 finally:
                     dhcp.delete_dhclient_leases(
-                        NETWORK_NAME if bridged else right, dhcpv4, dhcpv6,
-                        el6)
+                        NETWORK_NAME if bridged else right, dhcpv4, dhcpv6)
 
     @cleanupNet
     @RequireVethMod
@@ -1868,12 +1867,10 @@
             with dnsmasqDhcp(left, el6):
                 try:
                     setup_test_network(dhcp=True)
-                    dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True,
-                                                el6=el6)
+                    dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True)
                     setup_test_network(dhcp=False)
                 finally:
-                    dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True,
-                                                el6=el6)
+                    dhcp.delete_dhclient_leases(NETWORK_NAME, dhcpv4=True)
 
     @permutations([[(4, 'default')], [(4, 'local')], [(6, None)]])
     @cleanupNet


-- 
To view, visit https://gerrit.ovirt.org/39535
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aae489f11d1c5f63d9079e5059627038bef0954
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>


More information about the vdsm-patches mailing list