diff options
| -rw-r--r-- | test/test_l2bd_multi_instance.py | 7 | ||||
| -rw-r--r-- | test/vpp_papi_provider.py | 4 | ||||
| -rw-r--r-- | vnet/Makefile.am | 3 | ||||
| -rw-r--r-- | vnet/vnet/span/span.api | 4 | ||||
| -rw-r--r-- | vnet/vnet/span/span_api.c | 2 | ||||
| -rw-r--r-- | vpp-api/python/vpp_papi/vpp_papi.py | 4 |
6 files changed, 9 insertions, 15 deletions
diff --git a/test/test_l2bd_multi_instance.py b/test/test_l2bd_multi_instance.py index 11cd4603f58..e0b4b2667a4 100644 --- a/test/test_l2bd_multi_instance.py +++ b/test/test_l2bd_multi_instance.py @@ -72,7 +72,7 @@ from scapy.layers.inet import IP, UDP from framework import VppTestCase, VppTestRunner from util import Host - +@unittest.skip("Crashes VPP") class TestL2bdMultiInst(VppTestCase): """ L2BD Multi-instance Test Case """ @@ -405,7 +405,6 @@ class TestL2bdMultiInst(VppTestCase): else: self.logger.error("Unknown interface: %s" % pg_if.name) - @unittest.skip("Crashes VPP") def test_l2bd_inst_01(self): """ L2BD Multi-instance test 1 - create 5 BDs """ @@ -422,7 +421,6 @@ class TestL2bdMultiInst(VppTestCase): # self.vapi.cli("clear trace") self.run_verify_test() - @unittest.skip("Crashes VPP") def test_l2bd_inst_02(self): """ L2BD Multi-instance test 2 - update data of 5 BDs """ @@ -449,7 +447,6 @@ class TestL2bdMultiInst(VppTestCase): self.verify_bd(self.bd_list[4], learn=False, forward=True, flood=True, uu_flood=True) - @unittest.skip("Crashes VPP") def test_l2bd_inst_03(self): """ L2BD Multi-instance 3 - delete 2 BDs """ @@ -466,7 +463,6 @@ class TestL2bdMultiInst(VppTestCase): # Test 3 self.run_verify_test() - @unittest.skip("Crashes VPP") def test_l2bd_inst_04(self): """ L2BD Multi-instance test 4 - add 2 BDs """ @@ -483,7 +479,6 @@ class TestL2bdMultiInst(VppTestCase): # self.vapi.cli("clear trace") self.run_verify_test() - @unittest.skip("Crashes VPP") def test_l2bd_inst_05(self): """ L2BD Multi-instance 5 - delete 5 BDs """ diff --git a/test/vpp_papi_provider.py b/test/vpp_papi_provider.py index 8acfcaa699a..cd4601e3837 100644 --- a/test/vpp_papi_provider.py +++ b/test/vpp_papi_provider.py @@ -527,7 +527,7 @@ class VppPapiProvider(object): ) def sw_interface_span_enable_disable( - self, sw_if_index_from, sw_if_index_to, enable=1): + self, sw_if_index_from, sw_if_index_to, state=1): """ :param sw_if_index_from: @@ -538,7 +538,7 @@ class VppPapiProvider(object): return self.api(self.papi.sw_interface_span_enable_disable, { 'sw_if_index_from' : sw_if_index_from, 'sw_if_index_to' : sw_if_index_to, - 'enable' : enable }) + 'state' : state }) def gre_tunnel_add_del(self, src_address, diff --git a/vnet/Makefile.am b/vnet/Makefile.am index 6e891f9de0e..930d6bb9278 100644 --- a/vnet/Makefile.am +++ b/vnet/Makefile.am @@ -917,7 +917,8 @@ api_DATA = \ vnet/interface.api.json \ vnet/ip/ip.api.json \ vnet/l2/l2.api.json \ - vnet/map/map.api.json + vnet/map/map.api.json \ + vnet/span/span.api.json # The actual %.api.h rule is in .../build-data/packages/suffix-rules.mk # and requires a symbolic link at the top of the vnet source tree diff --git a/vnet/vnet/span/span.api b/vnet/vnet/span/span.api index 2f3b4118186..4babdd834ee 100644 --- a/vnet/vnet/span/span.api +++ b/vnet/vnet/span/span.api @@ -21,7 +21,7 @@ @param sw_if_index_to - interface where the traffic is mirrored @param state - 0 = disabled, 1 = rx enabled, 2 = tx enabled, 3 tx & rx enabled */ -define sw_interface_span_enable_disable{ +define sw_interface_span_enable_disable { u32 client_index; u32 context; u32 sw_if_index_from; @@ -57,4 +57,4 @@ define sw_interface_span_details { u32 sw_if_index_from; u32 sw_if_index_to; u8 state; -};
\ No newline at end of file +}; diff --git a/vnet/vnet/span/span_api.c b/vnet/vnet/span/span_api.c index eacd6ec8531..b4565663eb9 100644 --- a/vnet/vnet/span/span_api.c +++ b/vnet/vnet/span/span_api.c @@ -115,7 +115,7 @@ static void setup_message_id_table (api_main_t * am) { #define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id); - foreach_vl_msg_name_crc_l2; + foreach_vl_msg_name_crc_span; #undef _ } diff --git a/vpp-api/python/vpp_papi/vpp_papi.py b/vpp-api/python/vpp_papi/vpp_papi.py index ffe159fda90..27d4315aae4 100644 --- a/vpp-api/python/vpp_papi/vpp_papi.py +++ b/vpp-api/python/vpp_papi/vpp_papi.py @@ -398,13 +398,11 @@ class VPP(): b = self.encode(msgdef, kwargs) self.results_prepare(context) + self._write(b) if multipart: self.results[context]['m'] = True self._control_ping(context) - - self._write(b) - self.results_wait(context) r = self.results[context]['r'] self.results_clean(context) |