Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Tests: use self.assertNotIn().
[vpp.git]
/
test
/
test_dhcp.py
diff --git
a/test/test_dhcp.py
b/test/test_dhcp.py
index
3d00f1b
..
2efa9a7
100644
(file)
--- a/
test/test_dhcp.py
+++ b/
test/test_dhcp.py
@@
-360,6
+360,16
@@
class TestDHCP(VppTestCase):
# not sure why this is not decoding
# adv = pkt[DHCP6_Advertise]
# not sure why this is not decoding
# adv = pkt[DHCP6_Advertise]
+ def wait_for_no_route(self, address, length,
+ n_tries=50, s_time=1):
+ while (n_tries):
+ if not find_route(self, address, length):
+ return True
+ n_tries = n_tries - 1
+ self.sleep(s_time)
+
+ return False
+
def test_dhcp_proxy(self):
""" DHCPv4 Proxy """
def test_dhcp_proxy(self):
""" DHCPv4 Proxy """
@@
-1052,8
+1062,7
@@
class TestDHCP(VppTestCase):
nd_entry = VppNeighbor(self,
self.pg1.sw_if_index,
self.pg1.remote_hosts[1].mac,
nd_entry = VppNeighbor(self,
self.pg1.sw_if_index,
self.pg1.remote_hosts[1].mac,
- self.pg1.remote_hosts[1].ip6,
- af=AF_INET6)
+ self.pg1.remote_hosts[1].ip6)
nd_entry.add_vpp_config()
#
nd_entry.add_vpp_config()
#
@@
-1204,7
+1213,7
@@
class TestDHCP(VppTestCase):
#
# Configure DHCP client on PG3 and capture the discover sent
#
#
# Configure DHCP client on PG3 and capture the discover sent
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname)
rx = self.pg3.get_capture(1)
rx = self.pg3.get_capture(1)
@@
-1267,13
+1276,14
@@
class TestDHCP(VppTestCase):
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
-
mac_pton(self.pg3.remote_mac)
,
+
self.pg3.remote_mac
,
self.pg3.remote_ip4,
is_add=0)
self.pg3.remote_ip4,
is_add=0)
+
#
# remove the DHCP config
#
#
# remove the DHCP config
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname, is_add=0)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname, is_add=0)
#
# and now the route should be gone
#
# and now the route should be gone
@@
-1287,8
+1297,8
@@
class TestDHCP(VppTestCase):
self.pg3.admin_down()
self.sleep(1)
self.pg3.admin_up()
self.pg3.admin_down()
self.sleep(1)
self.pg3.admin_up()
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname,
- client_id=self.pg3.local_mac)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname,
+
client_id=self.pg3.local_mac)
rx = self.pg3.get_capture(1)
rx = self.pg3.get_capture(1)
@@
-1345,7
+1355,7
@@
class TestDHCP(VppTestCase):
#
# remove the DHCP config
#
#
# remove the DHCP config
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname, is_add=0)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname, is_add=0)
self.assertFalse(find_route(self, self.pg3.local_ip4, 32))
self.assertFalse(find_route(self, self.pg3.local_ip4, 24))
self.assertFalse(find_route(self, self.pg3.local_ip4, 32))
self.assertFalse(find_route(self, self.pg3.local_ip4, 24))
@@
-1357,8
+1367,8
@@
class TestDHCP(VppTestCase):
#
# Configure DHCP client on PG3 and capture the discover sent
#
#
# Configure DHCP client on PG3 and capture the discover sent
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname,
- set_broadcast_flag=0)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname,
+
set_broadcast_flag=0)
rx = self.pg3.get_capture(1)
rx = self.pg3.get_capture(1)
@@
-1423,7
+1433,7
@@
class TestDHCP(VppTestCase):
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
-
mac_pton(self.pg3.remote_mac)
,
+
self.pg3.remote_mac
,
self.pg3.remote_ip4,
is_add=0)
self.pg3.remote_ip4,
is_add=0)
@@
-1452,7
+1462,7
@@
class TestDHCP(VppTestCase):
#
# remove the DHCP config
#
#
# remove the DHCP config
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname, is_add=0)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname, is_add=0)
#
# and now the route should be gone
#
# and now the route should be gone
@@
-1466,7
+1476,7
@@
class TestDHCP(VppTestCase):
self.pg3.admin_down()
self.sleep(1)
self.pg3.admin_up()
self.pg3.admin_down()
self.sleep(1)
self.pg3.admin_up()
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname)
rx = self.pg3.get_capture(1)
rx = self.pg3.get_capture(1)
@@
-1530,25
+1540,20
@@
class TestDHCP(VppTestCase):
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
# remove the left over ARP entry
self.vapi.ip_neighbor_add_del(self.pg3.sw_if_index,
-
mac_pton(self.pg3.remote_mac)
,
+
self.pg3.remote_mac
,
self.pg3.remote_ip4,
is_add=0)
#
self.pg3.remote_ip4,
is_add=0)
#
- # Sleep for the lease time
- #
- self.sleep(lease_time+1)
-
- #
- # And now the route should be gone
+ # the route should be gone after the lease expires
#
#
- self.assert
False(find_route(self,
self.pg3.local_ip4, 32))
- self.assert
False(find_route(self,
self.pg3.local_ip4, 24))
+ self.assert
True(self.wait_for_no_route(
self.pg3.local_ip4, 32))
+ self.assert
True(self.wait_for_no_route(
self.pg3.local_ip4, 24))
#
# remove the DHCP config
#
#
# remove the DHCP config
#
- self.vapi.dhcp_client(self.pg3.sw_if_index, hostname, is_add=0)
+ self.vapi.dhcp_client
_config
(self.pg3.sw_if_index, hostname, is_add=0)
if __name__ == '__main__':
if __name__ == '__main__':