summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
9338fc6)
Change unicode references to use text_type
Change-Id: Ia71c16e3235bc509abd3b1c651ae125f892ab108
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
AF_INET6 = socket.AF_INET6
AF_INET6 = socket.AF_INET6
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
+
def mk_ll_addr(mac):
euid = in6_mactoifaceid(mac)
def mk_ll_addr(mac):
euid = in6_mactoifaceid(mac)
def verify_prefix_info(self, reported_prefix, prefix_option):
prefix = IPv6Network(
def verify_prefix_info(self, reported_prefix, prefix_option):
prefix = IPv6Network(
- unicode(prefix_option.getfieldval("prefix") +
- "/" +
- str(prefix_option.getfieldval("prefixlen"))),
+ text_type(prefix_option.getfieldval("prefix") +
+ "/" +
+ text_type(prefix_option.getfieldval("prefixlen"))),
strict=False)
self.assert_equal(reported_prefix.prefix.network_address,
prefix.network_address)
strict=False)
self.assert_equal(reported_prefix.prefix.network_address,
prefix.network_address)
import socket
from ipaddress import IPv4Address, IPv6Address, AddressValueError
import socket
from ipaddress import IPv4Address, IPv6Address, AddressValueError
from framework import VppTestCase, VppTestRunner
from util import ppp
from framework import VppTestCase, VppTestRunner
from util import ppp
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
from scapy.layers.inet import IP, UDP
from scapy.layers.inet6 import IPv6
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
+
#
# The number of packets to sent.
#
#
# The number of packets to sent.
#
:return: Random IPv4 or IPv6 address from required range.
"""
try:
:return: Random IPv4 or IPv6 address from required range.
"""
try:
- ip_addr = IPv4Address(unicode(ip_addr_start))
+ ip_addr = IPv4Address(text_type(ip_addr_start))
ip_max_len = 32
except (AttributeError, AddressValueError):
ip_max_len = 32
except (AttributeError, AddressValueError):
- ip_addr = IPv6Address(unicode(ip_addr_start))
+ ip_addr = IPv6Address(text_type(ip_addr_start))
ip_max_len = 128
return str(ip_addr +
ip_max_len = 128
return str(ip_addr +
from ipaddress import ip_address
from vpp_object import *
from vpp_papi import mac_pton, VppEnum
from ipaddress import ip_address
from vpp_object import *
from vpp_papi import mac_pton, VppEnum
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
def find_nbr(test, sw_if_index, nbr_addr, is_static=0, mac=None):
def find_nbr(test, sw_if_index, nbr_addr, is_static=0, mac=None):
- ip_addr = ip_address(unicode(nbr_addr))
+ ip_addr = ip_address(text_type(nbr_addr))
e = VppEnum.vl_api_ip_neighbor_flags_t
nbrs = test.vapi.ip_neighbor_dump(sw_if_index,
is_ipv6=(6 is ip_addr.version))
e = VppEnum.vl_api_ip_neighbor_flags_t
nbrs = test.vapi.ip_neighbor_dump(sw_if_index,
is_ipv6=(6 is ip_addr.version))