summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/vnet/vxlan-gpe/decap.c9
-rw-r--r--src/vnet/vxlan-gpe/vxlan_gpe.c2
-rw-r--r--src/vnet/vxlan-gpe/vxlan_gpe.h2
-rw-r--r--test/test_p2p_ethernet.py35
-rw-r--r--test/test_vxlan.py2
-rw-r--r--test/test_vxlan_gpe.py94
6 files changed, 26 insertions, 118 deletions
diff --git a/src/vnet/vxlan-gpe/decap.c b/src/vnet/vxlan-gpe/decap.c
index 151ffa3fcc9..cb7c525a5dc 100644
--- a/src/vnet/vxlan-gpe/decap.c
+++ b/src/vnet/vxlan-gpe/decap.c
@@ -338,6 +338,9 @@ vxlan_gpe_input (vlib_main_t * vm,
/* Required to make the l2 tag push / pop code work on l2 subifs */
vnet_update_l2_len (b0);
+ /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+ vnet_buffer (b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+
/**
* ip[46] lookup in the configured FIB
*/
@@ -426,6 +429,9 @@ vxlan_gpe_input (vlib_main_t * vm,
/* Required to make the l2 tag push / pop code work on l2 subifs */
vnet_update_l2_len (b1);
+ /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+ vnet_buffer (b1)->sw_if_index[VLIB_RX] = t1->sw_if_index;
+
/*
* ip[46] lookup in the configured FIB
*/
@@ -595,6 +601,9 @@ vxlan_gpe_input (vlib_main_t * vm,
/* Required to make the l2 tag push / pop code work on l2 subifs */
vnet_update_l2_len (b0);
+ /* Set packet input sw_if_index to unicast VXLAN tunnel for learning */
+ vnet_buffer (b0)->sw_if_index[VLIB_RX] = t0->sw_if_index;
+
/*
* ip[46] lookup in the configured FIB
*/
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.c b/src/vnet/vxlan-gpe/vxlan_gpe.c
index a95062b53f0..65a7ba3c291 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe.c
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.c
@@ -1282,7 +1282,7 @@ vxlan_gpe_init (vlib_main_t * vm)
vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_IP6,
VXLAN_GPE_INPUT_NEXT_IP6_INPUT);
vxlan_gpe_register_decap_protocol (VXLAN_GPE_PROTOCOL_ETHERNET,
- VXLAN_GPE_INPUT_NEXT_ETHERNET_INPUT);
+ VXLAN_GPE_INPUT_NEXT_L2_INPUT);
fib_node_register_type (FIB_NODE_TYPE_VXLAN_GPE_TUNNEL, &vxlan_gpe_vft);
diff --git a/src/vnet/vxlan-gpe/vxlan_gpe.h b/src/vnet/vxlan-gpe/vxlan_gpe.h
index b7e75d7ee81..8c0d37eb07a 100644
--- a/src/vnet/vxlan-gpe/vxlan_gpe.h
+++ b/src/vnet/vxlan-gpe/vxlan_gpe.h
@@ -169,7 +169,7 @@ typedef struct
_(DROP, "error-drop") \
_(IP4_INPUT, "ip4-input") \
_(IP6_INPUT, "ip6-input") \
-_(ETHERNET_INPUT, "ethernet-input")
+_(L2_INPUT, "l2-input")
/** struct for next nodes for VXLAN GPE input */
typedef enum
diff --git a/test/test_p2p_ethernet.py b/test/test_p2p_ethernet.py
index 8688f7e6960..5295d1c0c6e 100644
--- a/test/test_p2p_ethernet.py
+++ b/test/test_p2p_ethernet.py
@@ -9,7 +9,7 @@ from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
-from framework import VppTestCase, VppTestRunner, running_extended_tests
+from framework import VppTestCase, VppTestRunner
from vpp_sub_interface import VppP2PSubint
from vpp_ip_route import VppIpRoute, VppRoutePath, DpoProto
from util import mactobinary
@@ -93,39 +93,6 @@ class P2PEthernetAPI(VppTestCase):
self.logger.info("FFP_TEST_FINISH_0001")
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
- def test_p2p_subif_creation_10k(self):
- """create 100k of p2p subifs"""
- self.logger.info("FFP_TEST_START_0001")
-
- macs = []
- clients = 100000
- mac = int("dead00000000", 16)
-
- s_time = datetime.datetime.now()
- for i in range(1, clients+1):
- if i % 1000 == 0:
- e_time = datetime.datetime.now()
- print "Created 1000 subifs in %s secs" % (e_time - s_time)
- s_time = e_time
- try:
- macs.append(':'.join(re.findall('..', '{:02x}'.format(mac+i))))
- self.vapi.create_p2pethernet_subif(self.pg3.sw_if_index,
- mactobinary(macs[i-1]),
- i)
- except Exception:
- print "Failed to create subif %d %s" % (i, macs[i-1])
- raise
-
- intfs = self.vapi.cli("show interface").split("\n")
- count = 0
- for intf in intfs:
- if intf.startswith('pg3.'):
- count += 1
- self.assertEqual(count, clients)
-
- self.logger.info("FFP_TEST_FINISH_0001")
-
class P2PEthernetIPV6(VppTestCase):
"""P2P Ethernet IPv6 tests"""
diff --git a/test/test_vxlan.py b/test/test_vxlan.py
index 6bdcb258bcd..99d5d13f0fb 100644
--- a/test/test_vxlan.py
+++ b/test/test_vxlan.py
@@ -97,7 +97,7 @@ class TestVxlan(BridgeDomain, VppTestCase):
add or del tunnels sharing the same mcast dst
to test vxlan ref_count mechanism
"""
- n_shared_dst_tunnels = 2000
+ n_shared_dst_tunnels = 20
vni_start = 10000
vni_end = vni_start + n_shared_dst_tunnels
for vni in range(vni_start, vni_end):
diff --git a/test/test_vxlan_gpe.py b/test/test_vxlan_gpe.py
index 762e0709f13..61d86fe07dc 100644
--- a/test/test_vxlan_gpe.py
+++ b/test/test_vxlan_gpe.py
@@ -47,7 +47,7 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
Decapsulate the original payload frame by removing VXLAN-GPE header
"""
# check if is set I and P flag
- self.assertEqual(pkt[VXLAN].flags, int('0xc', 16))
+ self.assertEqual(pkt[VXLAN].flags, 0x0c)
return pkt[VXLAN].payload
# Method for checking VXLAN-GPE encapsulation.
@@ -74,84 +74,6 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
# Verify VNI
self.assertEqual(pkt[VXLAN].vni, vni)
- def test_decap(self):
- """ Decapsulation test
- Send encapsulated frames from pg0
- Verify receipt of decapsulated frames on pg1
- """
-
- encapsulated_pkt = self.encapsulate(self.frame_request,
- self.single_tunnel_bd)
-
- self.pg0.add_stream([encapsulated_pkt, ])
-
- self.pg1.enable_capture()
-
- self.pg_start()
-
- # Pick first received frame and check if it's the non-encapsulated
- # frame
- out = self.pg1.get_capture(1)
- pkt = out[0]
- self.assert_eq_pkts(pkt, self.frame_request)
-
- def test_encap(self):
- """ Encapsulation test
- Send frames from pg1
- Verify receipt of encapsulated frames on pg0
- """
- self.pg1.add_stream([self.frame_reply])
-
- self.pg0.enable_capture()
-
- self.pg_start()
-
- # Pick first received frame and check if it's corectly encapsulated.
- out = self.pg0.get_capture(1)
- pkt = out[0]
- self.check_encapsulation(pkt, self.single_tunnel_bd)
-
- # payload = self.decapsulate(pkt)
- # self.assert_eq_pkts(payload, self.frame_reply)
-
- def test_ucast_flood(self):
- """ Unicast flood test
- Send frames from pg3
- Verify receipt of encapsulated frames on pg0
- """
- self.pg3.add_stream([self.frame_reply])
-
- self.pg0.enable_capture()
-
- self.pg_start()
-
- # Get packet from each tunnel and assert it's corectly encapsulated.
- out = self.pg0.get_capture(self.n_ucast_tunnels)
- for pkt in out:
- self.check_encapsulation(pkt, self.ucast_flood_bd, True)
- # payload = self.decapsulate(pkt)
- # self.assert_eq_pkts(payload, self.frame_reply)
-
- def test_mcast_flood(self):
- """ Multicast flood test
- Send frames from pg2
- Verify receipt of encapsulated frames on pg0
- """
- self.pg2.add_stream([self.frame_reply])
-
- self.pg0.enable_capture()
-
- self.pg_start()
-
- # Pick first received frame and check if it's corectly encapsulated.
- out = self.pg0.get_capture(1)
- pkt = out[0]
- self.check_encapsulation(pkt, self.mcast_flood_bd,
- local_only=False, mcast_pkt=True)
-
- # payload = self.decapsulate(pkt)
- # self.assert_eq_pkts(payload, self.frame_reply)
-
@classmethod
def create_vxlan_gpe_flood_test_bd(cls, vni, n_ucast_tunnels):
# Create 10 ucast vxlan_gpe tunnels under bd
@@ -232,7 +154,7 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
try:
cls.dport = 4790
- cls.flags = 0xc
+ cls.flags = 0x0c
# Create 2 pg interfaces.
cls.create_pg_interfaces(range(4))
@@ -295,6 +217,16 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
super(TestVxlanGpe, cls).tearDownClass()
raise
+ @unittest.skip("test disabled for vxlan-gpe")
+ def test_mcast_flood(self):
+ """ inherited from BridgeDomain """
+ pass
+
+ @unittest.skip("test disabled for vxlan-gpe")
+ def test_mcast_rcv(self):
+ """ inherited from BridgeDomain """
+ pass
+
# Method to define VPP actions before tear down of the test case.
# Overrides tearDown method in VppTestCase class.
# @param self The object pointer.
@@ -305,7 +237,7 @@ class TestVxlanGpe(BridgeDomain, VppTestCase):
self.logger.info(self.vapi.cli("show bridge-domain 12 detail"))
self.logger.info(self.vapi.cli("show bridge-domain 13 detail"))
self.logger.info(self.vapi.cli("show int"))
- self.logger.info(self.vapi.cli("show vxlan-gpe tunnel"))
+ self.logger.info(self.vapi.cli("show vxlan-gpe"))
self.logger.info(self.vapi.cli("show trace"))