Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
pg: remove no-recycle option
[vpp.git]
/
test
/
vpp_ip.py
diff --git
a/test/vpp_ip.py
b/test/vpp_ip.py
index
fe985fb
..
8b7ea22
100644
(file)
--- a/
test/vpp_ip.py
+++ b/
test/vpp_ip.py
@@
-7,6
+7,10
@@
import logging
from ipaddress import ip_address
from socket import AF_INET, AF_INET6
from vpp_papi import VppEnum
from ipaddress import ip_address
from socket import AF_INET, AF_INET6
from vpp_papi import VppEnum
+try:
+ text_type = unicode
+except NameError:
+ text_type = str
_log = logging.getLogger(__name__)
_log = logging.getLogger(__name__)
@@
-26,7
+30,7
@@
INVALID_INDEX = 0xffffffff
class VppIpAddressUnion():
def __init__(self, addr):
self.addr = addr
class VppIpAddressUnion():
def __init__(self, addr):
self.addr = addr
- self.ip_addr = ip_address(
unicod
e(self.addr))
+ self.ip_addr = ip_address(
text_typ
e(self.addr))
def encode(self):
if self.version == 6:
def encode(self):
if self.version == 6:
@@
-191,8
+195,8
@@
class VppIpMPrefix():
self.saddr = saddr
self.gaddr = gaddr
self.len = len
self.saddr = saddr
self.gaddr = gaddr
self.len = len
- self.ip_saddr = ip_address(
unicod
e(self.saddr))
- self.ip_gaddr = ip_address(
unicod
e(self.gaddr))
+ self.ip_saddr = ip_address(
text_typ
e(self.saddr))
+ self.ip_gaddr = ip_address(
text_typ
e(self.gaddr))
if self.ip_saddr.version != self.ip_gaddr.version:
raise ValueError('Source and group addresses must be of the '
'same address family.')
if self.ip_saddr.version != self.ip_gaddr.version:
raise ValueError('Source and group addresses must be of the '
'same address family.')