diff options
| author |   Neale Ranns <nranns@cisco.com> | 2017-05-16 08:46:45 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2017-05-17 12:02:04 +0000 |
| commit | 1985c93bd728db22c946e05691f21a2f9774e458 (patch) | |
| tree | 036b987e37ae4d4b0e1c447befe43124bcc1e4c9 /test | |
| parent | 1da79ed89942dd27ea1d7c74311b91d02624722d (diff) | |
ARP learning fixes (VPP-843)
learn ARP peers if, 1) it's a reply to a local address, 2) we are sending a response to a request.
send proxy ARP responses only in the interface the request was sent.
Change-Id: I22b949c65122824233076492b7dd537daca07bc2
Signed-off-by: Neale Ranns <nranns@cisco.com>
(cherry picked from commit d5b6aa139856a1447f7bc5377058202110eaa4cf)
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_neighbor.py | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/test/test_neighbor.py b/test/test_neighbor.py index f2b1cfa47ee..48c6a291248 100644 --- a/test/test_neighbor.py +++ b/test/test_neighbor.py @@ -112,8 +112,11 @@ class ARPTestCase(VppTestCase): intf.add_stream(pkts) self.pg_enable_capture(self.pg_interfaces) self.pg_start() + timeout = 1 for i in self.pg_interfaces: + i.get_capture(0, timeout=timeout) i.assert_nothing_captured(remark=remark) + timeout = 0.1 def test_arp(self): """ ARP """ @@ -438,7 +441,9 @@ class ARPTestCase(VppTestCase): # ERROR Cases # 1 - don't respond to ARP request for address not within the # interface's sub-net - # 1a - nor within the unnumbered subnet + # 1b - nor within the unnumbered subnet + # 1c - nor within the subnet of a different interface + # p = (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.pg0.remote_mac) / ARP(op="who-has", hwsrc=self.pg0.remote_mac, @@ -446,6 +451,10 @@ class ARPTestCase(VppTestCase): psrc=self.pg0.remote_ip4)) self.send_and_assert_no_replies(self.pg0, p, "ARP req for non-local destination") + self.assertFalse(find_nbr(self, + self.pg0.sw_if_index, + "10.10.10.3")) + p = (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.pg2.remote_mac) / ARP(op="who-has", hwsrc=self.pg2.remote_mac, @@ -455,6 +464,17 @@ class ARPTestCase(VppTestCase): self.pg0, p, "ARP req for non-local destination - unnum") + p = (Ether(dst="ff:ff:ff:ff:ff:ff", src=self.pg0.remote_mac) / + ARP(op="who-has", + hwsrc=self.pg0.remote_mac, + pdst=self.pg1.local_ip4, + psrc=self.pg1.remote_ip4)) + self.send_and_assert_no_replies(self.pg0, p, + "ARP req diff sub-net") + self.assertFalse(find_nbr(self, + self.pg0.sw_if_index, + self.pg1.remote_ip4)) + # # 2 - don't respond to ARP request from an address not within the # interface's sub-net @@ -514,15 +534,11 @@ class ARPTestCase(VppTestCase): def test_proxy_arp(self): """ Proxy ARP """ + self.pg1.generate_remote_hosts(2) + # # Proxy ARP rewquest packets for each interface # - arp_req_pg2 = (Ether(src=self.pg2.remote_mac, - dst="ff:ff:ff:ff:ff:ff") / - ARP(op="who-has", - hwsrc=self.pg2.remote_mac, - pdst="10.10.10.3", - psrc=self.pg1.remote_ip4)) arp_req_pg0 = (Ether(src=self.pg0.remote_mac, dst="ff:ff:ff:ff:ff:ff") / ARP(op="who-has", @@ -535,6 +551,12 @@ class ARPTestCase(VppTestCase): hwsrc=self.pg1.remote_mac, pdst="10.10.10.3", psrc=self.pg1.remote_ip4)) + arp_req_pg2 = (Ether(src=self.pg2.remote_mac, + dst="ff:ff:ff:ff:ff:ff") / + ARP(op="who-has", + hwsrc=self.pg2.remote_mac, + pdst="10.10.10.3", + psrc=self.pg1.remote_hosts[1].ip4)) arp_req_pg3 = (Ether(src=self.pg3.remote_mac, dst="ff:ff:ff:ff:ff:ff") / ARP(op="who-has", @@ -607,7 +629,7 @@ class ARPTestCase(VppTestCase): self.pg2.local_mac, self.pg2.remote_mac, "10.10.10.3", - self.pg1.remote_ip4) + self.pg1.remote_hosts[1].ip4) # # A request for an address out of the configured range |