summaryrefslogtreecommitdiffstats
path: root/test/test_span.py
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2019-03-11 19:23:25 +0100
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2019-03-11 21:57:19 +0000
commita5b2eec0535f9025319a752891d77ff9948ae0df (patch)
tree08c801cb85ab9639e00e5f565e613b817b3924e4 /test/test_span.py
parent2d9b427a5b20dcec3d2212a3a8a47c29b4acdd46 (diff)
vpp_papi_provider: Remove more wrapper functions.
Split this work up into pieces. Please don't add new wrappers to vpp_papi_provider.py. Change-Id: I0f8f2afc4cd2bba07ea70ddecea2d7319f7b2e10 Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test/test_span.py')
-rw-r--r--test/test_span.py18
1 files changed, 8 insertions, 10 deletions
diff --git a/test/test_span.py b/test/test_span.py
index 021eed83177..b6f816e9cf2 100644
--- a/test/test_span.py
+++ b/test/test_span.py
@@ -53,10 +53,8 @@ class TestSpan(VppTestCase):
i.resolve_arp()
cls.vxlan = cls.vapi.vxlan_add_del_tunnel(
- src_addr=cls.pg2.local_ip4n,
- dst_addr=cls.pg2.remote_ip4n,
- vni=1111,
- is_add=1)
+ src_address=cls.pg2.local_ip4n, dst_address=cls.pg2.remote_ip4n,
+ is_add=1, vni=1111)
def setUp(self):
super(TestSpan, self).setUp()
@@ -72,8 +70,8 @@ class TestSpan(VppTestCase):
self.vapi.sw_interface_set_l2_xconnect(b, a, enable=is_add)
def bridge(self, sw_if_index, is_add=1):
- self.vapi.sw_interface_set_l2_bridge(
- sw_if_index, bd_id=self.bd_id, enable=is_add)
+ self.vapi.sw_interface_set_l2_bridge(rx_sw_if_index=sw_if_index,
+ bd_id=self.bd_id, enable=is_add)
def _remove_tag(self, packet, vlan, tag_type):
self.assertEqual(packet.type, tag_type)
@@ -526,9 +524,9 @@ class TestSpan(VppTestCase):
# Create bi-directional cross-connects between pg0 and pg1
self.vapi.sw_interface_set_l2_bridge(
- self.sub_if.sw_if_index, bd_id=99, enable=1)
+ rx_sw_if_index=self.sub_if.sw_if_index, bd_id=99, enable=1)
self.vapi.sw_interface_set_l2_bridge(
- self.pg1.sw_if_index, bd_id=99, enable=1)
+ rx_sw_if_index=self.pg1.sw_if_index, bd_id=99, enable=1)
# Create incoming packet streams for packet-generator interfaces
pg0_pkts = self.create_stream(
@@ -558,9 +556,9 @@ class TestSpan(VppTestCase):
self.bridge(self.pg2.sw_if_index, is_add=0)
self.vapi.sw_interface_set_l2_bridge(
- self.sub_if.sw_if_index, bd_id=99, enable=0)
+ rx_sw_if_index=self.sub_if.sw_if_index, bd_id=99, enable=0)
self.vapi.sw_interface_set_l2_bridge(
- self.pg1.sw_if_index, bd_id=99, enable=0)
+ rx_sw_if_index=self.pg1.sw_if_index, bd_id=99, enable=0)
# Disable SPAN on pg0 (mirrored to pg2)
self.vapi.sw_interface_span_enable_disable(
self.sub_if.sw_if_index, self.pg2.sw_if_index, state=0, is_l2=1)