X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_punt.py;h=e6829d42bb3cc3684f66f9bef39f5123dabed27e;hb=0bef4cf39cccb5f162389009a4348d7f000e28fb;hp=378b25d1f61e7885275e60b3a3f8760e16e94e3a;hpb=feb77422a3435f4fd25c3a6e12df1bb9526b342a;p=vpp.git diff --git a/test/test_punt.py b/test/test_punt.py index 378b25d1f61..e6829d42bb3 100644 --- a/test/test_punt.py +++ b/test/test_punt.py @@ -1,35 +1,28 @@ #!/usr/bin/env python3 -import binascii import random import socket import os import threading -import struct import copy import fcntl import time -from struct import unpack, unpack_from - try: import unittest2 as unittest except ImportError: import unittest -from util import ppp, ppc -from re import compile -import scapy.compat from scapy.packet import Raw from scapy.layers.l2 import Ether from scapy.layers.l2 import Dot1Q from scapy.layers.inet import IP, UDP, ICMP from scapy.layers.ipsec import ESP import scapy.layers.inet6 as inet6 -from scapy.layers.inet6 import IPv6, ICMPv6DestUnreach +from scapy.layers.inet6 import IPv6 from scapy.contrib.ospf import OSPF_Hdr, OSPFv3_Hello -from framework import tag_fixme_vpp_workers -from framework import VppTestCase, VppTestRunner -from vpp_sub_interface import VppSubInterface, VppDot1QSubint +from framework import VppTestCase +from asfframework import VppTestRunner, tag_fixme_vpp_workers +from vpp_sub_interface import VppDot1QSubint from vpp_ip import DpoProto from vpp_ip_route import VppIpRoute, VppRoutePath @@ -110,7 +103,7 @@ class TestPuntSocket(VppTestCase): @classmethod def setUpConstants(cls): - cls.extra_vpp_punt_config = [ + cls.extra_vpp_config = [ "punt", "{", "socket",