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

test framework: Fix wrapper functions to match API message names.

Browse Source 
In preparation to remove the wrappers in vpp_papi_provider.py, ensure
names used in tests match the actual API message names.

Change-Id: I230ca4eb75aa727ff68d702e085a2edbbc6b6d19
Signed-off-by: Ole Troan <ot@cisco.com>
This commit is contained in:
Ole Troan
2019-03-04 23:55:43 +01:00
parent fd06084a9e
commit e1ade684eb
18 changed files with 237 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
test/test_dvr.py
View File

@ -91,12 +91,14 @@ class TestDVR(VppTestCase):
self.vapi.sw_interface_set_l2_bridge(self.loop0.sw_if_index, 1,
port_type=L2_PORT_TYPE.BVI)
self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg2.sw_if_index,
L2_VTR_OP.L2_POP_1,
92)
self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg3.sw_if_index,
L2_VTR_OP.L2_POP_1,
93)
self.vapi.l2_interface_vlan_tag_rewrite(
sub_if_on_pg2.sw_if_index,
L2_VTR_OP.L2_POP_1,
92)
self.vapi.l2_interface_vlan_tag_rewrite(
sub_if_on_pg3.sw_if_index,
L2_VTR_OP.L2_POP_1,
93)
#
# Add routes to bridge the traffic via a tagged an nontagged interface
@ -291,12 +293,14 @@ class TestDVR(VppTestCase):
self.vapi.sw_interface_set_l2_bridge(self.pg1.sw_if_index, 1)
self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg2.sw_if_index, 1)
self.vapi.sw_interface_set_l2_bridge(sub_if_on_pg3.sw_if_index, 1)
self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg2.sw_if_index,
L2_VTR_OP.L2_POP_1,
92)
self.vapi.sw_interface_set_l2_tag_rewrite(sub_if_on_pg3.sw_if_index,
L2_VTR_OP.L2_POP_1,
93)
self.vapi.l2_interface_vlan_tag_rewrite(
sub_if_on_pg2.sw_if_index,
L2_VTR_OP.L2_POP_1,
92)
self.vapi.l2_interface_vlan_tag_rewrite(
sub_if_on_pg3.sw_if_index,
L2_VTR_OP.L2_POP_1,
93)
#
# Disable UU flooding, learning and ARP terminaation. makes this test
@ -326,10 +330,10 @@ class TestDVR(VppTestCase):
#
# Enable L3 extraction on pgs
#
self.vapi.sw_interface_set_l2_emulation(self.pg0.sw_if_index)
self.vapi.sw_interface_set_l2_emulation(self.pg1.sw_if_index)
self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg2.sw_if_index)
self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg3.sw_if_index)
self.vapi.l2_emulation(self.pg0.sw_if_index)
self.vapi.l2_emulation(self.pg1.sw_if_index)
self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index)
self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index)
#
# now we expect the packet forward according to the DVR route
@ -358,14 +362,14 @@ class TestDVR(VppTestCase):
#
# cleanup
#
self.vapi.sw_interface_set_l2_emulation(self.pg0.sw_if_index,
enable=0)
self.vapi.sw_interface_set_l2_emulation(self.pg1.sw_if_index,
enable=0)
self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg2.sw_if_index,
enable=0)
self.vapi.sw_interface_set_l2_emulation(sub_if_on_pg3.sw_if_index,
enable=0)
self.vapi.l2_emulation(self.pg0.sw_if_index,
enable=0)
self.vapi.l2_emulation(self.pg1.sw_if_index,
enable=0)
self.vapi.l2_emulation(sub_if_on_pg2.sw_if_index,
enable=0)
self.vapi.l2_emulation(sub_if_on_pg3.sw_if_index,
enable=0)
self.vapi.sw_interface_set_l2_bridge(self.pg0.sw_if_index,
1, enable=0)