From 3337bd22002e9b78459082c34f7b78370b177eb0 Mon Sep 17 00:00:00 2001 From: Pablo Camarillo Date: Tue, 19 Jun 2018 15:49:02 +0200 Subject: Fixed bugs in SRv6 API Jira ticket VPP-1196 Jira ticket VPP-1081 Jira ticket VPP-1078 Jira ticket VPP-1217 Change-Id: Id7e85229cae1017acb0aa4ca63ced334e6dafb8d Signed-off-by: pcamaril Signed-off-by: Pablo Camarillo Signed-off-by: pcamaril Signed-off-by: Michal Cmarada --- test/test_srv6.py | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) (limited to 'test/test_srv6.py') diff --git a/test/test_srv6.py b/test/test_srv6.py index b64d3bc8367..3e5f856316d 100644 --- a/test/test_srv6.py +++ b/test/test_srv6.py @@ -514,9 +514,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End without PSP behavior localsid = VppSRv6LocalSID( - self, localsid_addr='A3::0', + self, localsid={'addr': 'A3::0'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_END, - nh_addr='::', + nh_addr4='0.0.0.0', + nh_addr6='::', end_psp=0, sw_if_index=0, vlan_index=0, @@ -585,9 +586,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End with PSP behavior localsid = VppSRv6LocalSID( - self, localsid_addr='A3::0', + self, localsid={'addr': 'A3::0'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_END, - nh_addr='::', + nh_addr4='0.0.0.0', + nh_addr6='::', end_psp=1, sw_if_index=0, vlan_index=0, @@ -660,9 +662,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End.X without PSP behavior # End.X points to interface pg1 localsid = VppSRv6LocalSID( - self, localsid_addr='A3::C4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_X, - nh_addr=self.pg1.remote_ip6, + nh_addr4='0.0.0.0', + nh_addr6=self.pg1.remote_ip6, end_psp=0, sw_if_index=self.pg1.sw_if_index, vlan_index=0, @@ -737,9 +740,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End with PSP behavior localsid = VppSRv6LocalSID( - self, localsid_addr='A3::C4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_X, - nh_addr=self.pg1.remote_ip6, + nh_addr4='0.0.0.0', + nh_addr6=self.pg1.remote_ip6, end_psp=1, sw_if_index=self.pg1.sw_if_index, vlan_index=0, @@ -802,9 +806,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End.DX6 behavior localsid = VppSRv6LocalSID( - self, localsid_addr='a3::c4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_DX6, - nh_addr=self.pg1.remote_ip6, + nh_addr4='0.0.0.0', + nh_addr6=self.pg1.remote_ip6, end_psp=0, sw_if_index=self.pg1.sw_if_index, vlan_index=0, @@ -890,9 +895,10 @@ class TestSRv6(VppTestCase): # fib_table: where the localsid is installed # sw_if_index: in T-variants of localsid this is the vrf table_id localsid = VppSRv6LocalSID( - self, localsid_addr='a3::c4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_DT6, - nh_addr='::', + nh_addr4='0.0.0.0', + nh_addr6='::', end_psp=0, sw_if_index=vrf_1, vlan_index=0, @@ -955,9 +961,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End.DX4 behavior localsid = VppSRv6LocalSID( - self, localsid_addr='a3::c4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_DX4, - nh_addr=self.pg1.remote_ip4, + nh_addr4=self.pg1.remote_ip4, + nh_addr6='::', end_psp=0, sw_if_index=self.pg1.sw_if_index, vlan_index=0, @@ -1043,9 +1050,10 @@ class TestSRv6(VppTestCase): # fib_table: where the localsid is installed # sw_if_index: in T-variants of localsid: vrf table_id localsid = VppSRv6LocalSID( - self, localsid_addr='a3::c4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_DT4, - nh_addr='::', + nh_addr4='0.0.0.0', + nh_addr6='::', end_psp=0, sw_if_index=vrf_1, vlan_index=0, @@ -1107,9 +1115,10 @@ class TestSRv6(VppTestCase): # configure SRv6 localSID End.DX2 behavior localsid = VppSRv6LocalSID( - self, localsid_addr='a3::c4', + self, localsid={'addr': 'A3::C4'}, behavior=SRv6LocalSIDBehaviors.SR_BEHAVIOR_DX2, - nh_addr='::', + nh_addr4='0.0.0.0', + nh_addr6='::', end_psp=0, sw_if_index=self.pg1.sw_if_index, vlan_index=0, -- cgit 1.2.3-korg