diff options
author | Gabriel Ganne <gabriel.ganne@enea.com> | 2017-11-17 09:18:53 +0100 |
---|---|---|
committer | John Lo <loj@cisco.com> | 2017-12-13 19:03:56 +0000 |
commit | 7e665d64eb172f8ff42009a0d412ad05ffae7432 (patch) | |
tree | 90823326b551edb6f32dfe7ad16dde9a54f9df05 /test/test_p2p_ethernet.py | |
parent | fa1da15ca5ea6ce308f16e1a44a604c4bec8091b (diff) |
make "test-all" target pass again
The "test-all" target is still never called as part of any continuous
test (as it probably should) but at least it can now be expected to
succeed.
VXLAN-GPE:
* decapsulate Ethernet to "l2-input" instead of "ethernet-input"
otherwise the inner mac address get checked against the interface one
(external) and packet gets dropped (mac mismatch)
* set packet input sw_if_index to unicast vxlan tunnel for learning
TEST:
* VXLAN:
* reduce the number of share tunnels:
=> reduce test duration by half
=> no functional change
* VXLAN-GPE:
* fix test TearDown() cli: command is "show vxlan-gpe" only
* remove vxlan-gpe specific tests as the were a duplicated of the
BridgeDomain one and already inherited.
* disable test_mcast_rcv() and test_mcast_flood() tests
* P2PEthernetAPI:
* remove test: "create 100k of p2p subifs"
there already is a "create 1k p2p subifs" so this one is a load test
and not a unit test.
See: lists.fd.io/pipermail/vpp-dev/2017-November/007280.html
Change-Id: Icafb83769eb560cbdeb3dc6d1f1d3c23c0901cd9
Signed-off-by: Gabriel Ganne <gabriel.ganne@enea.com>
Diffstat (limited to 'test/test_p2p_ethernet.py')
-rw-r--r-- | test/test_p2p_ethernet.py | 35 |
1 files changed, 1 insertions, 34 deletions
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""" |