diff options
| author |   Ole Trøan <otroan@employees.org> | 2018-02-15 21:56:06 +0000 |
|---|---|---|
| committer | Ole Trøan <otroan@employees.org> | 2018-02-15 22:12:03 +0000 |
| commit | 438f63094465d35c278155484fe85153e438873e (patch) | |
| tree | 06e0ec613a6b2393ef2021f12ea7545fade9fec2 /test | |
| parent | 909c26bda66313b86168dda31003f76410c1d746 (diff) | |
Revert "Allow interface types to override glean adjacency behaivour"
This reverts commit 8b30e471df4d42214619e1d6c50cc8298426b45f.
Change-Id: I99edb236eb0a7f8ba3fba333c3481a710ebcb59c
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/test_bier.py | 2 | ||||
| -rw-r--r-- | test/test_neighbor.py | 63 | ||||
| -rw-r--r-- | test/vpp_papi_provider.py | 5 |
3 files changed, 1 insertions, 69 deletions
diff --git a/test/test_bier.py b/test/test_bier.py index ae7b46a130c..a70dd0978cb 100644 --- a/test/test_bier.py +++ b/test/test_bier.py @@ -195,7 +195,7 @@ class TestBier(VppTestCase): self.bier_midpoint(BIERLength.BIER_LEN_128, 16, 128) def test_bier_midpoint_64(self): - """BIER midpoint BSL:64""" + """BIER midpoint BSL:256""" self.bier_midpoint(BIERLength.BIER_LEN_64, 8, 64) def test_bier_head(self): diff --git a/test/test_neighbor.py b/test/test_neighbor.py index 74209e40428..47e9c5bed76 100644 --- a/test/test_neighbor.py +++ b/test/test_neighbor.py @@ -1144,69 +1144,6 @@ class ARPTestCase(VppTestCase): self.pg2.unconfig_ip4() self.pg2.set_table_ip4(0) - def test_arp_incomplete(self): - """ ARP Incomplete""" - self.pg1.generate_remote_hosts(3) - - p0 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / - IP(src=self.pg0.remote_ip4, - dst=self.pg1.remote_hosts[1].ip4) / - UDP(sport=1234, dport=1234) / - Raw()) - p1 = (Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / - IP(src=self.pg0.remote_ip4, - dst=self.pg1.remote_hosts[2].ip4) / - UDP(sport=1234, dport=1234) / - Raw()) - - # - # a packet to an unresolved destination generates an ARP request - # - rx = self.send_and_expect(self.pg0, [p0], self.pg1) - self.verify_arp_req(rx[0], - self.pg1.local_mac, - self.pg1.local_ip4, - self.pg1._remote_hosts[1].ip4) - - # - # add a neighbour for remote host 1 - # - static_arp = VppNeighbor(self, - self.pg1.sw_if_index, - self.pg1.remote_hosts[1].mac, - self.pg1.remote_hosts[1].ip4, - is_static=1) - static_arp.add_vpp_config() - - # - # change the interface's MAC - # - mac = [chr(0x00), chr(0x00), chr(0x00), - chr(0x33), chr(0x33), chr(0x33)] - mac_string = ''.join(mac) - - self.vapi.sw_interface_set_mac_address(self.pg1.sw_if_index, - mac_string) - - # - # now ARP requests come from the new source mac - # - rx = self.send_and_expect(self.pg0, [p1], self.pg1) - self.verify_arp_req(rx[0], - "00:00:00:33:33:33", - self.pg1.local_ip4, - self.pg1._remote_hosts[2].ip4) - - # - # packets to the resolved host also have the new source mac - # - rx = self.send_and_expect(self.pg0, [p0], self.pg1) - self.verify_ip(rx[0], - "00:00:00:33:33:33", - self.pg1.remote_hosts[1].mac, - self.pg0.remote_ip4, - self.pg1.remote_hosts[1].ip4) - if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 8e53333b624..cdbe08d6a71 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -639,11 +639,6 @@ class VppPapiProvider(object): {'sw_if_index': sw_if_index, 'mtu': mtu}) - def sw_interface_set_mac_address(self, sw_if_index, mac): - return self.api(self.papi.sw_interface_set_mac_address, - {'sw_if_index': sw_if_index, - 'mac_address': mac}) - def create_subif(self, sw_if_index, sub_id, outer_vlan, inner_vlan, no_tags=0, one_tag=0, two_tags=0, dot1ad=0, exact_match=0, default_sub=0, outer_vlan_id_any=0, inner_vlan_id_any=0): |