summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorFlorin Coras <florin.coras@gmail.com>2017-10-15 17:41:21 +0000
committerFlorin Coras <florin.coras@gmail.com>2017-10-15 18:28:43 +0000
commitd0a59722135ec77e637097ef99edb6865bc38929 (patch)
treeb29d413e86361f682a79f5c372c942256b90fde2 /test
parent46ade031466e0ee863668fd24981183e467d552f (diff)
Revert "Enforce FIB table creation before use"
This reverts commit f9342023c19887da656133e2688a90d70383b0c5. Reverting to unblock master. No idea why jjb +1ed this patch! On closer inspection it looks like it -1ed it and subsequently changed opinion. CSIT tests should be fixed before re-merging. Change-Id: I26608912a962c52083073e16c7c9d2cc44a3cc8d Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_dvr.py2
-rw-r--r--test/test_srv6.py19
2 files changed, 4 insertions, 17 deletions
diff --git a/test/test_dvr.py b/test/test_dvr.py
index 03c23ac1d03..27522a54eea 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -83,6 +83,8 @@ class TestDVR(VppTestCase):
L2_VTR_OP.L2_POP_1,
93)
+ self.logger.error(self.vapi.ppcli("show bridge-domain 1 detail"))
+
#
# Add routes to bridge the traffic via a tagged an nontagged interface
#
diff --git a/test/test_srv6.py b/test/test_srv6.py
index 4c463808151..a31b30eb619 100644
--- a/test/test_srv6.py
+++ b/test/test_srv6.py
@@ -4,7 +4,7 @@ import unittest
from socket import AF_INET6
from framework import VppTestCase, VppTestRunner
-from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto, VppIpTable
+from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto
from vpp_srv6 import SRv6LocalSIDBehaviors, VppSRv6LocalSID, VppSRv6Policy, \
SRv6PolicyType, VppSRv6Steering, SRv6PolicySteeringTypes
@@ -100,19 +100,6 @@ class TestSRv6(VppTestCase):
# create 'count' pg interfaces
self.create_pg_interfaces(range(count))
- # create all tables
- self.tables = []
- ids = sorted(set(ipv4_table_id))
- for i in range(len(ids)):
- if 0 != ids[i]:
- self.tables.append(VppIpTable(self, ids[i]))
- ids = sorted(set(ipv6_table_id))
- for i in range(len(ids)):
- if 0 != ids[i]:
- self.tables.append(VppIpTable(self, ids[i], is_ip6=1))
- for t in self.tables:
- t.add_vpp_config()
-
# setup all interfaces
for i in range(count):
intf = self.pg_interfaces[i]
@@ -137,10 +124,8 @@ class TestSRv6(VppTestCase):
# AFAIK they cannot be deleted
for i in self.pg_interfaces:
self.logger.debug("Tear down interface %s" % (i.name))
- i.unconfig()
- i.set_table_ip4(0)
- i.set_table_ip6(0)
i.admin_down()
+ i.unconfig()
def test_SRv6_T_Encaps(self):
""" Test SRv6 Transit.Encaps behavior for IPv6.