ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test: fix missing log/packet messages

Browse Source 
Change-Id: Idb3119792943664748c4abc3829ad723f4156dfe
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2016-11-18 07:38:42 +01:00
committed by Damjan Marion
parent 86fb04db3e
commit 7bb873a4cc
13 changed files with 107 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/framework.py
View File

@ -193,7 +193,7 @@ class VppTestCase(unittest.TestCase):
cls.vpp_stderr_reader_thread = Thread(target=pump_output, args=(
cls.vpp.stderr, cls.vpp_stderr_queue))
cls.vpp_stderr_reader_thread.start()
cls.vapi = VppPapiProvider(cls.shm_prefix, cls.shm_prefix)
cls.vapi = VppPapiProvider(cls.shm_prefix, cls.shm_prefix, cls)
if cls.step:
hook = StepHook(cls)
else:

12
test/test_ip4.py
View File

@ -4,12 +4,12 @@ import unittest
import socket
from framework import VppTestCase, VppTestRunner
from vpp_interface import VppInterface
from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
from scapy.packet import Raw
from scapy.layers.l2 import Ether, Dot1Q
from scapy.layers.inet import IP, UDP
from util import ppp
class TestIPv4(VppTestCase):
@ -164,16 +164,14 @@ class TestIPv4(VppTestCase):
self.assertEqual(udp.sport, saved_packet[UDP].sport)
self.assertEqual(udp.dport, saved_packet[UDP].dport)
except:
self.logger.error("Unexpected or invalid packet:")
self.logger.error(packet.show())
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise
for i in self.interfaces:
remaining_packet = self.get_next_packet_info_for_interface2(
i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])
self.assertTrue(
remaining_packet is None,
"Interface %s: Packet expected from interface %s didn't arrive" %
(dst_if.name, i.name))
self.assertTrue(remaining_packet is None,
"Interface %s: Packet expected from interface %s "
"didn't arrive" % (dst_if.name, i.name))
def test_fib(self):
""" IPv4 FIB test

11
test/test_ip6.py
View File

@ -9,6 +9,7 @@ from vpp_sub_interface import VppSubInterface, VppDot1QSubint
from scapy.packet import Raw
from scapy.layers.l2 import Ether, Dot1Q
from scapy.layers.inet6 import IPv6, UDP
from util import ppp
class TestIPv6(VppTestCase):
@ -171,16 +172,14 @@ class TestIPv6(VppTestCase):
self.assertEqual(udp.sport, saved_packet[UDP].sport)
self.assertEqual(udp.dport, saved_packet[UDP].dport)
except:
self.logger.error("Unexpected or invalid packet:")
self.logger.error(packet.show())
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise
for i in self.interfaces:
remaining_packet = self.get_next_packet_info_for_interface2(
i.sw_if_index, dst_sw_if_index, last_info[i.sw_if_index])
self.assertTrue(
remaining_packet is None,
"Interface %s: Packet expected from interface %s didn't arrive" %
(dst_if.name, i.name))
self.assertTrue(remaining_packet is None,
"Interface %s: Packet expected from interface %s "
"didn't arrive" % (dst_if.name, i.name))
def test_fib(self):
""" IPv6 FIB test

5
test/test_l2bd.py
View File

@ -8,7 +8,7 @@ from scapy.layers.l2 import Ether, Dot1Q
from scapy.layers.inet import IP, UDP
from framework import VppTestCase, VppTestRunner
from util import Host
from util import Host, ppp
from vpp_sub_interface import VppDot1QSubint, VppDot1ADSubint
@ -217,8 +217,7 @@ class TestL2bd(VppTestCase):
self.assertEqual(udp.sport, saved_packet[UDP].sport)
self.assertEqual(udp.dport, saved_packet[UDP].dport)
except:
self.logger.error("Unexpected or invalid packet:")
self.logger.error(packet.show())
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise
for i in self.pg_interfaces:
remaining_packet = self.get_next_packet_info_for_interface2(

5
test/test_l2xc.py
View File

@ -8,7 +8,7 @@ from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from framework import VppTestCase, VppTestRunner
from util import Host
from util import Host, ppp
class TestL2xc(VppTestCase):
@ -169,8 +169,7 @@ class TestL2xc(VppTestCase):
self.assertEqual(udp.sport, saved_packet[UDP].sport)
self.assertEqual(udp.dport, saved_packet[UDP].dport)
except:
self.logger.error("Unexpected or invalid packet:")
self.logger.error(packet.show())
self.logger.error(ppp("Unexpected or invalid packet:", packet))
raise
for i in self.interfaces:
remaining_packet = self.get_next_packet_info_for_interface2(

7
test/test_lb.py
View File

@ -1,5 +1,4 @@
import socket
from logging import *
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
@ -7,6 +6,7 @@ from scapy.layers.l2 import Ether, GRE
from scapy.packet import Raw
from framework import VppTestCase
from util import ppp
""" TestLB is a subclass of VPPTestCase classes.
@ -57,7 +57,7 @@ class TestLB(VppTestCase):
def tearDown(self):
super(TestLB, self).tearDown()
if not self.vpp_dead:
info(self.vapi.cli("show lb vip verbose"))
self.logger.info(self.vapi.cli("show lb vip verbose"))
def getIPv4Flow(self, id):
return (IP(dst="90.0.%u.%u" % (id / 255, id % 255),
@ -139,8 +139,7 @@ class TestLB(VppTestCase):
self.checkInner(gre, isv4)
load[asid] += 1
except:
error("Unexpected or invalid packet:")
p.show()
self.logger.error(ppp("Unexpected or invalid packet:", p))
raise
# This is just to roughly check that the balancing algorithm

12
test/test_mpls.py
View File

@ -1,18 +1,18 @@
#!/usr/bin/env python
import unittest
import socket
from logging import *
from framework import VppTestCase, VppTestRunner
from vpp_sub_interface import VppSubInterface, VppDot1QSubint, VppDot1ADSubint
from vpp_ip_route import IpRoute, RoutePath, MplsRoute, MplsIpBind
from scapy.packet import Raw
from scapy.layers.l2 import Ether, Dot1Q, ARP
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import ICMPv6ND_NS, IPv6, UDP
from scapy.layers.inet6 import IPv6
from scapy.contrib.mpls import MPLS
from util import ppp
class TestMPLS(VppTestCase):
@ -621,8 +621,8 @@ class TestMPLS(VppTestCase):
try:
self.assertEqual(0, len(rx))
except:
error("MPLS TTL=0 packets forwarded")
error(packet.show())
self.logger.error("MPLS TTL=0 packets forwarded")
self.logger.error(ppp("", rx))
raise
#

45
test/test_span.py
View File

@ -1,15 +1,13 @@
#!/usr/bin/env python
import unittest
import random
from scapy.packet import Raw
from scapy.layers.l2 import Ether
from scapy.layers.inet import IP, UDP
from logging import *
from framework import VppTestCase, VppTestRunner
from util import Host
from util import Host, ppp
class TestSpan(VppTestCase):
@ -56,7 +54,8 @@ class TestSpan(VppTestCase):
i.resolve_arp()
# Enable SPAN on pg0 (mirrored to pg2)
self.vapi.sw_interface_span_enable_disable(self.pg0.sw_if_index, self.pg2.sw_if_index)
self.vapi.sw_interface_span_enable_disable(
self.pg0.sw_if_index, self.pg2.sw_if_index)
def tearDown(self):
super(TestSpan, self).tearDown()
@ -86,8 +85,6 @@ class TestSpan(VppTestCase):
pkts = []
for i in range(0, TestSpan.pkts_per_burst):
dst_if = self.flows[src_if][0]
dst_host = random.choice(self.hosts_by_pg_idx[dst_if.sw_if_index])
src_host = random.choice(self.hosts_by_pg_idx[src_if.sw_if_index])
pkt_info = self.create_packet_info(
src_if.sw_if_index, dst_if.sw_if_index)
payload = self.info_to_payload(pkt_info)
@ -107,8 +104,9 @@ class TestSpan(VppTestCase):
last_info[i.sw_if_index] = None
dst_sw_if_index = dst_if.sw_if_index
if len(capture_pg1) != len(capture_pg2):
error("Diffrent number of outgoing and mirrored packets : %u != %u"
% (len(capture_pg1), len(capture_pg2)))
self.logger.error(
"Different number of outgoing and mirrored packets : %u != %u" %
(len(capture_pg1), len(capture_pg2)))
raise
for pkt_pg1, pkt_pg2 in zip(capture_pg1, capture_pg2):
try:
@ -117,22 +115,27 @@ class TestSpan(VppTestCase):
raw1 = pkt_pg1[Raw]
if pkt_pg1[Ether] != pkt_pg2[Ether]:
error("Diffrent ethernet header of outgoing and mirrored packet")
self.logger.error("Different ethernet header of "
"outgoing and mirrored packet")
raise
if ip1 != pkt_pg2[IP]:
error("Diffrent ip header of outgoing and mirrored packet")
self.logger.error(
"Different ip header of outgoing and mirrored packet")
raise
if udp1 != pkt_pg2[UDP]:
error("Diffrent udp header of outgoing and mirrored packet")
self.logger.error(
"Different udp header of outgoing and mirrored packet")
raise
if raw1 != pkt_pg2[Raw]:
error("Diffrent raw data of outgoing and mirrored packet")
self.logger.error(
"Different raw data of outgoing and mirrored packet")
raise
payload_info = self.payload_to_info(str(raw1))
packet_index = payload_info.index
self.assertEqual(payload_info.dst, dst_sw_if_index)
debug("Got packet on port %s: src=%u (id=%u)" %
self.logger.debug(
"Got packet on port %s: src=%u (id=%u)" %
(dst_if.name, payload_info.src, packet_index))
next_info = self.get_next_packet_info_for_interface2(
payload_info.src, dst_sw_if_index,
@ -147,9 +150,9 @@ class TestSpan(VppTestCase):
self.assertEqual(udp1.sport, saved_packet[UDP].sport)
self.assertEqual(udp1.dport, saved_packet[UDP].dport)
except:
error("Unexpected or invalid packet:")
pkt_pg1.show()
pkt_pg2.show()
self.logger.error("Unexpected or invalid packets:")
self.logger.error(ppp("pg1 packet:", pkt_pg1))
self.logger.error(ppp("pg2 packet:", pkt_pg2))
raise
for i in self.interfaces:
remaining_packet = self.get_next_packet_info_for_interface2(
@ -164,7 +167,8 @@ class TestSpan(VppTestCase):
Test scenario:
1. config
3 interfaces, pg0 l2xconnected with pg1
2. sending l2 eth packets between 2 interfaces (pg0, pg1) and mirrored to pg2
2. sending l2 eth packets between 2 interfaces (pg0, pg1) and
mirrored to pg2
64B, 512B, 1518B, 9018B (ether_size)
burst of packets per interface
"""
@ -178,8 +182,11 @@ class TestSpan(VppTestCase):
self.pg_start()
# Verify packets outgoing packet streams on mirrored interface (pg2)
info("Verifying capture on interfaces %s and %s" % (self.pg1.name, self.pg2.name))
self.verify_capture(self.pg1, self.pg1.get_capture(), self.pg2.get_capture())
self.logger.info("Verifying capture on interfaces %s and %s" %
(self.pg1.name, self.pg2.name))
self.verify_capture(self.pg1,
self.pg1.get_capture(),
self.pg2.get_capture())
if __name__ == '__main__':

3
test/test_vxlan.py
View File

@ -1,7 +1,6 @@
#!/usr/bin/env python
import unittest
from logging import *
from framework import VppTestCase, VppTestRunner
from template_bd import BridgeDomain
@ -94,7 +93,7 @@ class TestVxlan(BridgeDomain, VppTestCase):
def tearDown(self):
super(TestVxlan, self).tearDown()
if not self.vpp_dead:
info(self.vapi.cli("show bridge-domain 1 detail"))
self.logger.info(self.vapi.cli("show bridge-domain 1 detail"))
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)

14
test/util.py
View File

@ -1,4 +1,18 @@
import socket
import sys
from cStringIO import StringIO
def ppp(headline, packet):
""" Return string containing the output of scapy packet.show() call. """
o = StringIO()
old_stdout = sys.stdout
sys.stdout = o
print(headline)
packet.show()
sys.stdout = old_stdout
return o.getvalue()
class Host(object):
""" Generic test host "connected" to VPPs interface. """

12
test/vpp_interface.py
View File

@ -1,8 +1,6 @@
from abc import abstractmethod, ABCMeta
import socket
from util import Host
class VppInterface(object):
"""Generic VPP interface."""
@ -127,7 +125,8 @@ class VppInterface(object):
self._hosts_by_mac = {}
self._hosts_by_ip4 = {}
self._hosts_by_ip6 = {}
for i in range(2, count+2): # 0: network address, 1: local vpp address
for i in range(
2, count + 2): # 0: network address, 1: local vpp address
mac = "02:%02x:00:00:ff:%02x" % (self.sw_if_index, i)
ip4 = "172.16.%u.%u" % (self.sw_if_index, i)
ip6 = "fd01:%04x::%04x" % (self.sw_if_index, i)
@ -158,10 +157,9 @@ class VppInterface(object):
for intf in r:
if intf.sw_if_index == self.sw_if_index:
self._name = intf.interface_name.split(b'\0', 1)[0]
self._local_mac = ':'.join(
intf.l2_address.encode('hex')[i:i + 2]
for i in range(0, 12, 2)
)
self._local_mac =\
':'.join(intf.l2_address.encode('hex')[i:i + 2]
for i in range(0, 12, 2))
self._dump = intf
break
else:

11
test/vpp_papi_provider.py
View File

@ -1,6 +1,5 @@
import os
import array
from logging import error
from hook import Hook
do_import = True
@ -32,10 +31,11 @@ class VppPapiProvider(object):
"""
def __init__(self, name, shm_prefix):
def __init__(self, name, shm_prefix, test_class):
self.hook = Hook("vpp-papi-provider")
self.name = name
self.shm_prefix = shm_prefix
self.test_class = test_class
def register_hook(self, hook):
"""Replace hook registration with new hook
@ -68,7 +68,7 @@ class VppPapiProvider(object):
if hasattr(reply, 'retval') and reply.retval != expected_retval:
msg = "API call failed, expected retval == %d, got %s" % (
expected_retval, repr(reply))
error(msg)
self.test_class.test_instance.logger.error(msg)
raise Exception(msg)
self.hook.after_api(api_fn.__name__, api_args)
return reply
@ -497,7 +497,8 @@ class VppPapiProvider(object):
)
)
def sw_interface_span_enable_disable(self, sw_if_index_from, sw_if_index_to, enable=1):
def sw_interface_span_enable_disable(
self, sw_if_index_from, sw_if_index_to, enable=1):
"""
:param sw_if_index_from:
@ -683,3 +684,5 @@ class VppPapiProvider(object):
next_hop_table_id,
stack))
return self.api(vpp_papi.sw_interface_span_enable_disable,
(sw_if_index_from, sw_if_index_to, enable))

36
test/vpp_pg_interface.py
View File

@ -1,12 +1,12 @@
import os
import time
from logging import error, info
from scapy.utils import wrpcap, rdpcap
from vpp_interface import VppInterface
from scapy.layers.l2 import Ether, ARP
from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6ND_NA, \
ICMPv6NDOptSrcLLAddr, ICMPv6NDOptDstLLAddr
from util import ppp
class VppPGInterface(VppInterface):
@ -127,7 +127,7 @@ class VppPGInterface(VppInterface):
try:
output = rdpcap(self.out_path)
except IOError: # TODO
error("File %s does not exist, probably because no"
self.test.logger.error("File %s does not exist, probably because no"
" packets arrived" % self.out_path)
return []
return output
@ -154,16 +154,18 @@ class VppPGInterface(VppInterface):
"""
if pg_interface is None:
pg_interface = self
info("Sending ARP request for %s on port %s" %
self.test.logger.info("Sending ARP request for %s on port %s" %
(self.local_ip4, pg_interface.name))
arp_req = self.create_arp_req()
pg_interface.add_stream(arp_req)
pg_interface.enable_capture()
self.test.pg_start()
info(self.test.vapi.cli("show trace"))
self.test.logger.info(self.test.vapi.cli("show trace"))
arp_reply = pg_interface.get_capture()
if arp_reply is None or len(arp_reply) == 0:
info("No ARP received on port %s" % pg_interface.name)
self.test.logger.info(
"No ARP received on port %s" %
pg_interface.name)
return
arp_reply = arp_reply[0]
# Make Dot1AD packet content recognizable to scapy
@ -172,14 +174,16 @@ class VppPGInterface(VppInterface):
arp_reply = Ether(str(arp_reply))
try:
if arp_reply[ARP].op == ARP.is_at:
info("VPP %s MAC address is %s " %
self.test.logger.info("VPP %s MAC address is %s " %
(self.name, arp_reply[ARP].hwsrc))
self._local_mac = arp_reply[ARP].hwsrc
else:
info("No ARP received on port %s" % pg_interface.name)
self.test.logger.info(
"No ARP received on port %s" %
pg_interface.name)
except:
error("Unexpected response to ARP request:")
error(arp_reply.show())
self.test.logger.error(
ppp("Unexpected response to ARP request:", arp_reply))
raise
def resolve_ndp(self, pg_interface=None):
@ -191,16 +195,18 @@ class VppPGInterface(VppInterface):
"""
if pg_interface is None:
pg_interface = self
info("Sending NDP request for %s on port %s" %
self.test.logger.info("Sending NDP request for %s on port %s" %
(self.local_ip6, pg_interface.name))
ndp_req = self.create_ndp_req()
pg_interface.add_stream(ndp_req)
pg_interface.enable_capture()
self.test.pg_start()
info(self.test.vapi.cli("show trace"))
self.test.logger.info(self.test.vapi.cli("show trace"))
ndp_reply = pg_interface.get_capture()
if ndp_reply is None or len(ndp_reply) == 0:
info("No NDP received on port %s" % pg_interface.name)
self.test.logger.info(
"No NDP received on port %s" %
pg_interface.name)
return
ndp_reply = ndp_reply[0]
# Make Dot1AD packet content recognizable to scapy
@ -210,10 +216,10 @@ class VppPGInterface(VppInterface):
try:
ndp_na = ndp_reply[ICMPv6ND_NA]
opt = ndp_na[ICMPv6NDOptDstLLAddr]
info("VPP %s MAC address is %s " %
self.test.logger.info("VPP %s MAC address is %s " %
(self.name, opt.lladdr))
self._local_mac = opt.lladdr
except:
error("Unexpected response to NDP request:")
error(ndp_reply.show())
self.test.logger.error(
ppp("Unexpected response to NDP request:", ndp_reply))
raise