summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorNeale Ranns <nranns@cisco.com>2017-10-13 02:43:33 -0700
committerFlorin Coras <florin.coras@gmail.com>2017-10-13 23:43:35 +0000
commitf9342023c19887da656133e2688a90d70383b0c5 (patch)
treece87af209b57e2210276f6b5cebedc1ec69fdf8e /test
parent69cce166535e138e66d0a95f1cfe6a3591489e10 (diff)
Enforce FIB table creation before use
last i the serise of the use of the FIB table create/delete API. VPP now forces the tables to have been explicitly creted before they are used. Change-Id: Ifde3b1bbb76697a01ab71bce4f5264e6d1725467 Signed-off-by: Neale Ranns <nranns@cisco.com>
Diffstat (limited to 'test')
-rw-r--r--test/test_dvr.py2
-rw-r--r--test/test_srv6.py19
2 files changed, 17 insertions, 4 deletions
diff --git a/test/test_dvr.py b/test/test_dvr.py
index 27522a54eea..03c23ac1d03 100644
--- a/test/test_dvr.py
+++ b/test/test_dvr.py
@@ -83,8 +83,6 @@ 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 a31b30eb619..4c463808151 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
+from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto, VppIpTable
from vpp_srv6 import SRv6LocalSIDBehaviors, VppSRv6LocalSID, VppSRv6Policy, \
SRv6PolicyType, VppSRv6Steering, SRv6PolicySteeringTypes
@@ -100,6 +100,19 @@ 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]
@@ -124,8 +137,10 @@ class TestSRv6(VppTestCase):
# AFAIK they cannot be deleted
for i in self.pg_interfaces:
self.logger.debug("Tear down interface %s" % (i.name))
- i.admin_down()
i.unconfig()
+ i.set_table_ip4(0)
+ i.set_table_ip6(0)
+ i.admin_down()
def test_SRv6_T_Encaps(self):
""" Test SRv6 Transit.Encaps behavior for IPv6.