summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeale Ranns <neale.ranns@cisco.com>2018-05-17 06:34:24 -0700
committerDave Barach <openvpp@barachs.net>2018-05-18 12:15:27 +0000
commit8f6dd328b2188eb15ad839b39cb31530758a4be1 (patch)
treebc889d0a658280f9c026637a532fa831b9c741a4
parent1f6e9288536ee30db3911ccea1ea10af4b6b3e5e (diff)
IP table bind allowed only if table exists
Change-Id: If01400e3434b25b2da36ba28ceb8444b216d0e38 Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
-rw-r--r--src/vnet/interface_api.c36
-rw-r--r--test/test_gbp.py2
-rw-r--r--test/test_srv6.py8
3 files changed, 15 insertions, 31 deletions
diff --git a/src/vnet/interface_api.c b/src/vnet/interface_api.c
index 8d982e36b73..9a1838fa321 100644
--- a/src/vnet/interface_api.c
+++ b/src/vnet/interface_api.c
@@ -382,30 +382,15 @@ ip_table_bind (fib_protocol_t fproto,
}
/*
- * This is temporary whilst I do the song and dance with the CSIT version
- */
- if (0 != table_id)
- {
- fib_index = fib_table_find_or_create_and_lock (fproto, table_id, src);
- mfib_index =
- mfib_table_find_or_create_and_lock (fproto, table_id, msrc);
- }
- else
- {
- fib_index = 0;
- mfib_index = 0;
- }
-
- /*
* This if table does not exist = error is what we want in the end.
*/
- /* fib_index = fib_table_find (fproto, table_id); */
- /* mfib_index = mfib_table_find (fproto, table_id); */
+ fib_index = fib_table_find (fproto, table_id);
+ mfib_index = mfib_table_find (fproto, table_id);
- /* if (~0 == fib_index || ~0 == mfib_index) */
- /* { */
- /* return (VNET_API_ERROR_NO_SUCH_FIB); */
- /* } */
+ if (~0 == fib_index || ~0 == mfib_index)
+ {
+ return (VNET_API_ERROR_NO_SUCH_FIB);
+ }
if (FIB_PROTOCOL_IP6 == fproto)
{
@@ -513,15 +498,6 @@ ip_table_bind (fib_protocol_t fproto,
ip4_main.mfib_index_by_sw_if_index[sw_if_index] = mfib_index;
}
- /*
- * Temporary. undo the locks from the find and create at the staart
- */
- if (0 != table_id)
- {
- fib_table_unlock (fib_index, fproto, src);
- mfib_table_unlock (mfib_index, fproto, msrc);
- }
-
return (0);
}
diff --git a/test/test_gbp.py b/test/test_gbp.py
index 3d9ebbc8f08..fe19ae6a27f 100644
--- a/test/test_gbp.py
+++ b/test/test_gbp.py
@@ -413,6 +413,8 @@ class TestGBP(VppTestCase):
nat_table = VppIpTable(self, 20)
nat_table.add_vpp_config()
+ nat_table = VppIpTable(self, 20, is_ip6=True)
+ nat_table.add_vpp_config()
#
# Bridge Domains
diff --git a/test/test_srv6.py b/test/test_srv6.py
index fda24b43a0e..b64d3bc8367 100644
--- a/test/test_srv6.py
+++ b/test/test_srv6.py
@@ -5,7 +5,7 @@ import binascii
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
@@ -127,6 +127,8 @@ class TestSRv6(VppTestCase):
self.logger.debug("Tear down interface %s" % (i.name))
i.admin_down()
i.unconfig()
+ i.set_table_ip4(0)
+ i.set_table_ip6(0)
@unittest.skipUnless(0, "PC to fix")
def test_SRv6_T_Encaps(self):
@@ -856,6 +858,8 @@ class TestSRv6(VppTestCase):
# source interface in global FIB (0)
# destination interfaces in global and vrf
vrf_1 = 1
+ ipt = VppIpTable(self, vrf_1, is_ip6=True)
+ ipt.add_vpp_config()
self.setup_interfaces(ipv6=[True, True, True],
ipv6_table_id=[0, 0, vrf_1])
@@ -1007,6 +1011,8 @@ class TestSRv6(VppTestCase):
# source interface in global FIB (0)
# destination interfaces in global and vrf
vrf_1 = 1
+ ipt = VppIpTable(self, vrf_1)
+ ipt.add_vpp_config()
self.setup_interfaces(ipv6=[True, False, False],
ipv4=[False, True, True],
ipv6_table_id=[0, 0, 0],