X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_interface_crud.py;h=c79999b5bc5f2e42dd722ee45e151f1e3ee58ba1;hb=refs%2Fchanges%2F62%2F38162%2F6;hp=afeafa5f73b15da9bc1a5b0389d8d2169f53f2c0;hpb=ead1e536d66d83b546528c32e2112085a97c8e13;p=vpp.git diff --git a/test/test_interface_crud.py b/test/test_interface_crud.py index afeafa5f73b..c79999b5bc5 100644 --- a/test/test_interface_crud.py +++ b/test/test_interface_crud.py @@ -20,9 +20,7 @@ from framework import VppTestCase, VppTestRunner class TestLoopbackInterfaceCRUD(VppTestCase): - """CRUD Loopback - - """ + """CRUD Loopback""" @classmethod def setUpClass(cls): @@ -30,8 +28,7 @@ class TestLoopbackInterfaceCRUD(VppTestCase): try: cls.create_pg_interfaces(range(1)) for i in cls.pg_interfaces: - i.config_ip4() - i.resolve_arp() + i.config_ip4().resolve_arp() except: cls.tearDownClass() raise @@ -52,9 +49,11 @@ class TestLoopbackInterfaceCRUD(VppTestCase): """ pkts = [] for i in dst_ifs: - p = (Ether(dst=src_if.local_mac, src=src_if.remote_mac) / - IP(src=src_if.remote_ip4, dst=i.local_ip4) / - ICMP(id=i.sw_if_index, type='echo-request')) + p = ( + Ether(dst=src_if.local_mac, src=src_if.remote_mac) + / IP(src=src_if.remote_ip4, dst=i.local_ip4) + / ICMP(id=i.sw_if_index, type="echo-request") + ) pkts.append(p) return pkts @@ -85,17 +84,23 @@ class TestLoopbackInterfaceCRUD(VppTestCase): # create loopbacks = self.create_loopback_interfaces(20) for i in loopbacks: - i.local_ip4_prefix.len = 32 - i.config_ip4() - i.admin_up() + i.local_ip4_prefix_len = 32 + i.config_ip4().admin_up() # read (check sw if dump, ip4 fib, ip6 fib) - if_dump = self.vapi.sw_interface_dump() + if_dump = self.vapi.sw_interface_dump( + name_filter_valid=True, name_filter="loop" + ) fib4_dump = self.vapi.ip_route_dump(0) for i in loopbacks: self.assertTrue(i.is_interface_config_in_dump(if_dump)) self.assertTrue(i.is_ip4_entry_in_fib_dump(fib4_dump)) + if_dump = self.vapi.sw_interface_dump( + name_filter_valid=True, name_filter="loopXYZ" + ) + self.assertEqual(len(if_dump), 0) + # check ping stream = self.create_icmp_stream(self.pg0, loopbacks) self.pg0.add_stream(stream) @@ -127,14 +132,12 @@ class TestLoopbackInterfaceCRUD(VppTestCase): # create loopbacks = self.create_loopback_interfaces(20) for i in loopbacks: - i.local_ip4_prefix.len = 32 - i.config_ip4() - i.admin_up() + i.local_ip4_prefix_len = 32 + i.config_ip4().admin_up() # disable for i in loopbacks: - i.admin_down() - i.unconfig_ip4() + i.admin_down().unconfig_ip4() # read (check not in sw if dump, ip4 fib, ip6 fib) if_dump = self.vapi.sw_interface_dump() @@ -159,30 +162,29 @@ class TestInterfaceDumpApiLocalOnly(VppTestCase): self.assertEqual(rv[0].sw_if_index, 0) def test_sw_if_index_twiddle0(self): - rv = self.vapi.sw_interface_dump(sw_if_index=0xffffffff) + rv = self.vapi.sw_interface_dump(sw_if_index=0xFFFFFFFF) self.assertEqual(rv[0].sw_if_index, 0) def test_sw_if_index_1_not_existing(self): rv = self.vapi.sw_interface_dump(sw_if_index=1) - self.assertEqual(len(rv), 0, 'expected no records.') + self.assertEqual(len(rv), 0, "expected no records.") class TestInterfaceDumpApi(VppTestCase): """test_interface_crud.TestInterfaceDumpApi""" def test_sw_if_index_1(self): - self.vapi.create_loopback_instance(is_specified=1, - user_instance=10) - self.vapi.create_loopback_instance(is_specified=1, - user_instance=5) + self.vapi.create_loopback_instance(is_specified=1, user_instance=10) + self.vapi.create_loopback_instance(is_specified=1, user_instance=5) # Can I get back the specified record? rv = self.vapi.sw_interface_dump(sw_if_index=1) self.assertEqual(rv[0].sw_if_index, 1, rv) # verify 3 interfaces - rv = self.vapi.sw_interface_dump(sw_if_index=0xffffffff) - self.assertEqual(len(rv), 3, 'Expected 3 interfaces.') + rv = self.vapi.sw_interface_dump(sw_if_index=0xFFFFFFFF) + self.assertEqual(len(rv), 3, "Expected 3 interfaces.") + -if __name__ == '__main__': +if __name__ == "__main__": unittest.main(testRunner=VppTestRunner)