summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorOle Troan <ot@cisco.com>2016-12-06 23:00:38 +0100
committerOle Troan <ot@cisco.com>2016-12-06 23:48:43 +0100
commit399ca1ca5267861b56a81f64e689aa42b9a79620 (patch)
treee3028d077f469f877e9cb75a397fae5175cca64d /test
parent7e3a875c94b180ef4d9dc99a7fcc8a73c348969b (diff)
SPAN API: Fix various errors making SPAN break make tests.
- s/l2/span in span_api.c in foreach macro - Not installing .json from Makefile.am Change-Id: I2469fe01138d62e044b8262cdb5a6e3b009bb43e Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_l2bd_multi_instance.py7
-rw-r--r--test/vpp_papi_provider.py4
2 files changed, 3 insertions, 8 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,