Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
tls: support to reinitialise ca_chain wo restart
[vpp.git]
/
test
/
test_ip6.py
diff --git
a/test/test_ip6.py
b/test/test_ip6.py
index
bac50a3
..
c86cb77
100644
(file)
--- a/
test/test_ip6.py
+++ b/
test/test_ip6.py
@@
-676,6
+676,8
@@
class TestIPv6(TestIPv6ND):
Test scenario:
"""
Test scenario:
"""
+ self.pg0.ip6_ra_config(no=1, suppress=1)
+
#
# Before we begin change the IPv6 RA responses to use the unicast
# address - that way we will not confuse them with the periodic
#
# Before we begin change the IPv6 RA responses to use the unicast
# address - that way we will not confuse them with the periodic
@@
-771,7
+773,7
@@
class TestIPv6(TestIPv6ND):
# If we happen to pick up the periodic RA at this point then so be it,
# it's not an error.
#
# If we happen to pick up the periodic RA at this point then so be it,
# it's not an error.
#
- self.pg0.ip6_ra_config(send_unicast=1
, suppress=0
)
+ self.pg0.ip6_ra_config(send_unicast=1)
p = (Ether(dst=dmac, src=self.pg0.remote_mac) /
IPv6(dst="ff02::2", src="::") /
ICMPv6ND_RS())
p = (Ether(dst=dmac, src=self.pg0.remote_mac) /
IPv6(dst="ff02::2", src="::") /
ICMPv6ND_RS())
@@
-979,7
+981,8
@@
class TestIPv6(TestIPv6ND):
#
# Reset the periodic advertisements back to default values
#
#
# Reset the periodic advertisements back to default values
#
- self.pg0.ip6_ra_config(no=1, suppress=1, send_unicast=0)
+ self.pg0.ip6_ra_config(suppress=1)
+ self.pg0.ip6_ra_config(no=1, send_unicast=1)
def test_mld(self):
""" MLD Report """
def test_mld(self):
""" MLD Report """
@@
-1754,19
+1757,19
@@
class IPv6NDProxyTest(TestIPv6ND):
self.assertTrue(rx[0].haslayer(ICMPv6ND_NS))
self.assertTrue(rx[0].haslayer(ICMPv6ND_NS))
-class TestIPNull(VppTestCase):
+class TestIP
6
Null(VppTestCase):
""" IPv6 routes via NULL """
@classmethod
def setUpClass(cls):
""" IPv6 routes via NULL """
@classmethod
def setUpClass(cls):
- super(TestIPNull, cls).setUpClass()
+ super(TestIP
6
Null, cls).setUpClass()
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):
- super(TestIPNull, cls).tearDownClass()
+ super(TestIP
6
Null, cls).tearDownClass()
def setUp(self):
def setUp(self):
- super(TestIPNull, self).setUp()
+ super(TestIP
6
Null, self).setUp()
# create 2 pg interfaces
self.create_pg_interfaces(range(1))
# create 2 pg interfaces
self.create_pg_interfaces(range(1))
@@
-1777,7
+1780,7
@@
class TestIPNull(VppTestCase):
i.resolve_ndp()
def tearDown(self):
i.resolve_ndp()
def tearDown(self):
- super(TestIPNull, self).tearDown()
+ super(TestIP
6
Null, self).tearDown()
for i in self.pg_interfaces:
i.unconfig_ip6()
i.admin_down()
for i in self.pg_interfaces:
i.unconfig_ip6()
i.admin_down()
@@
-1835,19
+1838,19
@@
class TestIPNull(VppTestCase):
self.assertEqual(icmp.code, 1)
self.assertEqual(icmp.code, 1)
-class TestIPDisabled(VppTestCase):
+class TestIP
6
Disabled(VppTestCase):
""" IPv6 disabled """
@classmethod
def setUpClass(cls):
""" IPv6 disabled """
@classmethod
def setUpClass(cls):
- super(TestIPDisabled, cls).setUpClass()
+ super(TestIP
6
Disabled, cls).setUpClass()
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):
- super(TestIPDisabled, cls).tearDownClass()
+ super(TestIP
6
Disabled, cls).tearDownClass()
def setUp(self):
def setUp(self):
- super(TestIPDisabled, self).setUp()
+ super(TestIP
6
Disabled, self).setUp()
# create 2 pg interfaces
self.create_pg_interfaces(range(2))
# create 2 pg interfaces
self.create_pg_interfaces(range(2))
@@
-1861,7
+1864,7
@@
class TestIPDisabled(VppTestCase):
self.pg1.admin_up()
def tearDown(self):
self.pg1.admin_up()
def tearDown(self):
- super(TestIPDisabled, self).tearDown()
+ super(TestIP
6
Disabled, self).tearDown()
for i in self.pg_interfaces:
i.unconfig_ip4()
i.admin_down()
for i in self.pg_interfaces:
i.unconfig_ip4()
i.admin_down()
@@
-2440,19
+2443,19
@@
class TestIP6PuntHandoff(IP6PuntSetup, VppTestCase):
ip_punt_redirect.remove_vpp_config()
ip_punt_redirect.remove_vpp_config()
-class TestIPDeag(VppTestCase):
+class TestIP
6
Deag(VppTestCase):
""" IPv6 Deaggregate Routes """
@classmethod
def setUpClass(cls):
""" IPv6 Deaggregate Routes """
@classmethod
def setUpClass(cls):
- super(TestIPDeag, cls).setUpClass()
+ super(TestIP
6
Deag, cls).setUpClass()
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):
- super(TestIPDeag, cls).tearDownClass()
+ super(TestIP
6
Deag, cls).tearDownClass()
def setUp(self):
def setUp(self):
- super(TestIPDeag, self).setUp()
+ super(TestIP
6
Deag, self).setUp()
self.create_pg_interfaces(range(3))
self.create_pg_interfaces(range(3))
@@
-2462,7
+2465,7
@@
class TestIPDeag(VppTestCase):
i.resolve_ndp()
def tearDown(self):
i.resolve_ndp()
def tearDown(self):
- super(TestIPDeag, self).tearDown()
+ super(TestIP
6
Deag, self).tearDown()
for i in self.pg_interfaces:
i.unconfig_ip6()
i.admin_down()
for i in self.pg_interfaces:
i.unconfig_ip6()
i.admin_down()
@@
-2659,19
+2662,19
@@
class TestIP6Input(VppTestCase):
self.pg_start()
self.pg_start()
-class TestIPReplace(VppTestCase):
+class TestIP
6
Replace(VppTestCase):
""" IPv6 Table Replace """
@classmethod
def setUpClass(cls):
""" IPv6 Table Replace """
@classmethod
def setUpClass(cls):
- super(TestIPReplace, cls).setUpClass()
+ super(TestIP
6
Replace, cls).setUpClass()
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):
- super(TestIPReplace, cls).tearDownClass()
+ super(TestIP
6
Replace, cls).tearDownClass()
def setUp(self):
def setUp(self):
- super(TestIPReplace, self).setUp()
+ super(TestIP
6
Replace, self).setUp()
self.create_pg_interfaces(range(4))
self.create_pg_interfaces(range(4))
@@
-2687,7
+2690,7
@@
class TestIPReplace(VppTestCase):
table_id += 1
def tearDown(self):
table_id += 1
def tearDown(self):
- super(TestIPReplace, self).tearDown()
+ super(TestIP
6
Replace, self).tearDown()
for i in self.pg_interfaces:
i.admin_down()
i.unconfig_ip6()
for i in self.pg_interfaces:
i.admin_down()
i.unconfig_ip6()
@@
-2800,19
+2803,19
@@
class TestIPReplace(VppTestCase):
self.assertEqual(len(t.mdump()), 5)
self.assertEqual(len(t.mdump()), 5)
-class TestIP6Replace(VppTestCase):
- """ IPv
4
Interface Address Replace """
+class TestIP6
Addr
Replace(VppTestCase):
+ """ IPv
6
Interface Address Replace """
@classmethod
def setUpClass(cls):
@classmethod
def setUpClass(cls):
- super(TestIP6Replace, cls).setUpClass()
+ super(TestIP6
Addr
Replace, cls).setUpClass()
@classmethod
def tearDownClass(cls):
@classmethod
def tearDownClass(cls):
- super(TestIP6Replace, cls).tearDownClass()
+ super(TestIP6
Addr
Replace, cls).tearDownClass()
def setUp(self):
def setUp(self):
- super(TestIP6Replace, self).setUp()
+ super(TestIP6
Addr
Replace, self).setUp()
self.create_pg_interfaces(range(4))
self.create_pg_interfaces(range(4))
@@
-2820,7
+2823,7
@@
class TestIP6Replace(VppTestCase):
i.admin_up()
def tearDown(self):
i.admin_up()
def tearDown(self):
- super(TestIP6Replace, self).tearDown()
+ super(TestIP6
Addr
Replace, self).tearDown()
for i in self.pg_interfaces:
i.admin_down()
for i in self.pg_interfaces:
i.admin_down()
@@
-3170,6
+3173,12
@@
class TestIPv6PathMTU(VppTestCase):
self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index,
[2800, 0, 0, 0])
self.vapi.sw_interface_set_mtu(self.pg1.sw_if_index,
[2800, 0, 0, 0])
+ p_6k = (Ether(dst=self.pg0.local_mac,
+ src=self.pg0.remote_mac) /
+ IPv6(src=self.pg0.remote_ip6,
+ dst=tun.remote_ip6) /
+ UDP(sport=1234, dport=5678) /
+ Raw(b'0xa' * 2000))
p_2k = (Ether(dst=self.pg0.local_mac,
src=self.pg0.remote_mac) /
IPv6(src=self.pg0.remote_ip6,
p_2k = (Ether(dst=self.pg0.local_mac,
src=self.pg0.remote_mac) /
IPv6(src=self.pg0.remote_ip6,
@@
-3189,6
+3198,7
@@
class TestIPv6PathMTU(VppTestCase):
self.pg1.remote_ip6).add_vpp_config()
# this is now the interface MTU frags
self.pg1.remote_ip6).add_vpp_config()
# this is now the interface MTU frags
+ self.send_and_expect(self.pg0, [p_6k], self.pg1, n_rx=4)
self.send_and_expect(self.pg0, [p_2k], self.pg1, n_rx=2)
self.send_and_expect(self.pg0, [p_1k], self.pg1)
self.send_and_expect(self.pg0, [p_2k], self.pg1, n_rx=2)
self.send_and_expect(self.pg0, [p_1k], self.pg1)