X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_srv6.py;h=47832e28903f31ff76668b09917122917579ec7a;hb=661f91fe0a6bd87040408d45d116b63c0811f4f9;hp=b64d3bc8367d020296c1664cf71137d999616fdf;hpb=8f6dd328b2188eb15ad839b39cb31530758a4be1;p=vpp.git

diff --git a/test/test_srv6.py b/test/test_srv6.py
index b64d3bc8367..47832e28903 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,
@@ -2135,7 +2144,6 @@ class TestSRv6(VppTestCase):
                 compare_func(txed_packet, packet)
 
             except:
-                print packet.command()
                 self.logger.error(ppp("Unexpected or invalid packet:", packet))
                 raise