diff options
author | Paul Vinciguerra <pvinci@vinciconsulting.com> | 2019-02-28 09:00:09 -0800 |
---|---|---|
committer | Neale Ranns <nranns@cisco.com> | 2019-03-01 09:28:09 +0000 |
commit | a279d9cf615bd60439085ba103125e6f2fa3b27c (patch) | |
tree | 53544c5534b573251d1067bb72078d2ff6ebce00 /test/test_gbp.py | |
parent | e8fece85e2b6190a1ebdc05c10cd79e43f385918 (diff) |
Tests: Remove all wildcard imports.
They mask dependencies and confuse third party tools.
Change-Id: I24ee16bfa0d746a8e8cb99891ba8b20523048b69
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'test/test_gbp.py')
-rw-r--r-- | test/test_gbp.py | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/test/test_gbp.py b/test/test_gbp.py index fd8b79b26b6..28868c1a499 100644 --- a/test/test_gbp.py +++ b/test/test_gbp.py @@ -1,21 +1,8 @@ #!/usr/bin/env python +from socket import AF_INET, AF_INET6 import unittest -from framework import VppTestCase, VppTestRunner -from vpp_object import VppObject -from vpp_neighbor import VppNeighbor -from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, \ - VppIpInterfaceAddress, VppIpInterfaceBind, find_route -from vpp_l2 import VppBridgeDomain, VppBridgeDomainPort, \ - VppBridgeDomainArpEntry, VppL2FibEntry, find_bridge_domain_port -from vpp_vxlan_gbp_tunnel import * -from vpp_sub_interface import VppDot1QSubint - -from vpp_ip import * -from vpp_papi_provider import L2_PORT_TYPE -from vpp_papi import VppEnum, MACAddress - from scapy.packet import Raw from scapy.layers.l2 import Ether, ARP, Dot1Q from scapy.layers.inet import IP, UDP @@ -24,10 +11,21 @@ from scapy.layers.inet6 import IPv6, ICMPv6ND_NS, ICMPv6NDOptSrcLLAddr, \ from scapy.utils6 import in6_getnsma, in6_getnsmac from scapy.layers.vxlan import VXLAN from scapy.data import ETH_P_IP, ETH_P_IPV6 - -from socket import AF_INET, AF_INET6 from scapy.utils import inet_pton, inet_ntop + +from framework import VppTestCase, VppTestRunner +from vpp_object import VppObject +from vpp_interface import VppInterface +from vpp_ip_route import VppIpRoute, VppRoutePath, VppIpTable, \ + VppIpInterfaceAddress, VppIpInterfaceBind, find_route +from vpp_l2 import VppBridgeDomain, VppBridgeDomainPort, \ + VppBridgeDomainArpEntry, VppL2FibEntry, find_bridge_domain_port +from vpp_sub_interface import VppDot1QSubint +from vpp_ip import VppIpAddress, VppIpPrefix +from vpp_papi import VppEnum, MACAddress from vpp_papi_provider import L2_VTR_OP +from vpp_vxlan_gbp_tunnel import find_vxlan_gbp_tunnel, INDEX_INVALID, \ + VppVxlanGbpTunnel def find_gbp_endpoint(test, sw_if_index=None, ip=None, mac=None): |