ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: remove ip_punt from vpp_papi_provider and add ip_punt object models

Browse Source 
Type: refactor

Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
Change-Id: I1bf53c2554e6b313467f618717698ed158db9065
Signed-off-by: Jakub Grajciar <jgrajcia@cisco.com>
This commit is contained in:
Jakub Grajciar
2020-12-01 11:23:44 +01:00
parent 153e41a331
commit 2df2f75ec5
5 changed files with 103 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
test/test_ip6.py
View File

@ -22,7 +22,7 @@ from six import moves
from framework import VppTestCase, VppTestRunner
from util import ppp, ip6_normalize, mk_ll_addr
from vpp_papi import VppEnum
from vpp_ip import DpoProto
from vpp_ip import DpoProto, VppIpPuntPolicer, VppIpPuntRedirect
from vpp_ip_route import VppIpRoute, VppRoutePath, find_route, VppIpMRoute, \
VppMRoutePath, VppMplsIpBind, \
VppMplsRoute, VppMplsTable, VppIpTable, FibPathType, FibPathProto, \
@ -2211,9 +2211,9 @@ class TestIP6Punt(VppTestCase):
# Configure a punt redirect via pg1.
#
nh_addr = self.pg1.remote_ip6
self.vapi.ip_punt_redirect(self.pg0.sw_if_index,
self.pg1.sw_if_index,
nh_addr)
ip_punt_redirect = VppIpPuntRedirect(self, self.pg0.sw_if_index,
self.pg1.sw_if_index, nh_addr)
ip_punt_redirect.add_vpp_config()
self.send_and_expect(self.pg0, pkts, self.pg1)
@ -2222,7 +2222,9 @@ class TestIP6Punt(VppTestCase):
#
policer = VppPolicer(self, "ip6-punt", 400, 0, 10, 0, rate_type=1)
policer.add_vpp_config()
self.vapi.ip_punt_police(policer.policer_index, is_ip6=1)
ip_punt_policer = VppIpPuntPolicer(self, policer.policer_index,
is_ip6=True)
ip_punt_policer.add_vpp_config()
self.vapi.cli("clear trace")
self.pg0.add_stream(pkts)
@ -2240,32 +2242,25 @@ class TestIP6Punt(VppTestCase):
#
# remove the policer. back to full rx
#
self.vapi.ip_punt_police(policer.policer_index, is_add=0, is_ip6=1)
ip_punt_policer.remove_vpp_config()
policer.remove_vpp_config()
self.send_and_expect(self.pg0, pkts, self.pg1)
#
# remove the redirect. expect full drop.
#
self.vapi.ip_punt_redirect(self.pg0.sw_if_index,
self.pg1.sw_if_index,
nh_addr,
is_add=0)
ip_punt_redirect.remove_vpp_config()
self.send_and_assert_no_replies(self.pg0, pkts,
"IP no punt config")
#
# Add a redirect that is not input port selective
#
self.vapi.ip_punt_redirect(0xffffffff,
self.pg1.sw_if_index,
nh_addr)
ip_punt_redirect = VppIpPuntRedirect(self, 0xffffffff,
self.pg1.sw_if_index, nh_addr)
ip_punt_redirect.add_vpp_config()
self.send_and_expect(self.pg0, pkts, self.pg1)
self.vapi.ip_punt_redirect(0xffffffff,
self.pg1.sw_if_index,
nh_addr,
is_add=0)
ip_punt_redirect.remove_vpp_config()
def test_ip_punt_dump(self):
""" IP6 punt redirect dump"""
@ -2273,24 +2268,23 @@ class TestIP6Punt(VppTestCase):
#
# Configure a punt redirects
#
nh_addr = self.pg3.remote_ip6
self.vapi.ip_punt_redirect(self.pg0.sw_if_index,
self.pg3.sw_if_index,
nh_addr)
self.vapi.ip_punt_redirect(self.pg1.sw_if_index,
self.pg3.sw_if_index,
nh_addr)
self.vapi.ip_punt_redirect(self.pg2.sw_if_index,
self.pg3.sw_if_index,
'0::0')
nh_address = self.pg3.remote_ip6
ipr_03 = VppIpPuntRedirect(self, self.pg0.sw_if_index,
self.pg3.sw_if_index, nh_address)
ipr_13 = VppIpPuntRedirect(self, self.pg1.sw_if_index,
self.pg3.sw_if_index, nh_address)
ipr_23 = VppIpPuntRedirect(self, self.pg2.sw_if_index,
self.pg3.sw_if_index, '0::0')
ipr_03.add_vpp_config()
ipr_13.add_vpp_config()
ipr_23.add_vpp_config()
#
# Dump pg0 punt redirects
#
punts = self.vapi.ip_punt_redirect_dump(self.pg0.sw_if_index,
is_ipv6=1)
for p in punts:
self.assertEqual(p.punt.rx_sw_if_index, self.pg0.sw_if_index)
self.assertTrue(ipr_03.query_vpp_config())
self.assertTrue(ipr_13.query_vpp_config())
self.assertTrue(ipr_23.query_vpp_config())
#
# Dump punt redirects for all interfaces