Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ldp: force exit if constructor init fails
[vpp.git]
/
test
/
vpp_ip.py
diff --git
a/test/vpp_ip.py
b/test/vpp_ip.py
index
e44e6b5
..
8b7ea22
100644
(file)
--- a/
test/vpp_ip.py
+++ b/
test/vpp_ip.py
@@
-2,14
+2,17
@@
IP Types
"""
IP Types
"""
+import logging
from ipaddress import ip_address
from socket import AF_INET, AF_INET6
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
-
-class IpAddressFamily:
- ADDRESS_IP4 = 0
- ADDRESS_IP6 = 1
+_log = logging.getLogger(__name__)
class DpoProto:
class DpoProto:
@@
-27,21
+30,13
@@
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):
def encode(self):
- if self.version is 6:
- return {
- 'ip6': {
- 'address': self.ip_addr.packed
- },
- }
+ if self.version == 6:
+ return {'ip6': self.ip_addr.packed}
else:
else:
- return {
- 'ip4': {
- 'address': self.ip_addr.packed
- },
- }
+ return {'ip4': self.ip_addr.packed}
@property
def version(self):
@property
def version(self):
@@
-53,10
+48,7
@@
class VppIpAddressUnion():
@property
def length(self):
@property
def length(self):
- if self.version is 6:
- return 128
- else:
- return 32
+ return self.ip_addr.max_prefixlen
@property
def bytes(self):
@property
def bytes(self):
@@
-67,16
+59,15
@@
class VppIpAddressUnion():
return self.ip_addr == other.ip_addr
elif hasattr(other, "ip4") and hasattr(other, "ip6"):
# vl_api_address_union_t
return self.ip_addr == other.ip_addr
elif hasattr(other, "ip4") and hasattr(other, "ip6"):
# vl_api_address_union_t
- if 4
is
self.version:
- return self.ip_addr.packed == other.ip4
.address
+ if 4
==
self.version:
+ return self.ip_addr.packed == other.ip4
else:
else:
- return self.ip_addr.packed == other.ip6
.address
+ return self.ip_addr.packed == other.ip6
else:
else:
- raise Exception("Comparing VppIpAddresUnions:%s"
- " with unknown type: %s" %
- (self, other))
-
- return False
+ _log.error("Comparing VppIpAddressUnions:%s"
+ " with incomparable type: %s",
+ self, other)
+ return NotImplemented
class VppIpAddress():
class VppIpAddress():
@@
-84,14
+75,14
@@
class VppIpAddress():
self.addr = VppIpAddressUnion(addr)
def encode(self):
self.addr = VppIpAddressUnion(addr)
def encode(self):
- if self.addr.version
is
6:
+ if self.addr.version
==
6:
return {
return {
- 'af':
IpAddressFamily
.ADDRESS_IP6,
+ 'af':
VppEnum.vl_api_address_family_t
.ADDRESS_IP6,
'un': self.addr.encode()
}
else:
return {
'un': self.addr.encode()
}
else:
return {
- 'af':
IpAddressFamily
.ADDRESS_IP4,
+ 'af':
VppEnum.vl_api_address_family_t
.ADDRESS_IP4,
'un': self.addr.encode()
}
'un': self.addr.encode()
}
@@
-100,16
+91,21
@@
class VppIpAddress():
return self.addr == other.addr
elif hasattr(other, "af") and hasattr(other, "un"):
# a vp_api_address_t
return self.addr == other.addr
elif hasattr(other, "af") and hasattr(other, "un"):
# a vp_api_address_t
- if 4 is self.version:
- return other.af == IpAddressFamily.ADDRESS_IP4 and \
+ if 4 == self.version:
+ return other.af == \
+ VppEnum.vl_api_address_family_t.ADDRESS_IP4 and \
other.un == self.addr
else:
other.un == self.addr
else:
- return other.af == IpAddressFamily.ADDRESS_IP6 and \
+ return other.af == \
+ VppEnum.vl_api_address_family_t.ADDRESS_IP6 and \
other.un == self.addr
else:
other.un == self.addr
else:
- raise Exception("Comparing VppIpAddress:%s with unknown type: %s" %
- (self, other))
- return False
+ _log.error(
+ "Comparing VppIpAddress:<%s> %s with incomparable "
+ "type: <%s> %s",
+ self.__class__.__name__, self,
+ other.__class__.__name__, other)
+ return NotImplemented
def __ne__(self, other):
return not (self == other)
def __ne__(self, other):
return not (self == other)
@@
-146,7
+142,7
@@
class VppIpAddress():
@property
def dpo_proto(self):
@property
def dpo_proto(self):
- if self.version
is
6:
+ if self.version
==
6:
return DpoProto.DPO_PROTO_IP6
else:
return DpoProto.DPO_PROTO_IP4
return DpoProto.DPO_PROTO_IP6
else:
return DpoProto.DPO_PROTO_IP4
@@
-157,11
+153,6
@@
class VppIpPrefix():
self.addr = VppIpAddress(addr)
self.len = len
self.addr = VppIpAddress(addr)
self.len = len
- def __eq__(self, other):
- if self.addr == other.addr and self.len == other.len:
- return True
- return False
-
def encode(self):
return {'address': self.addr.encode(),
'address_length': self.len}
def encode(self):
return {'address': self.addr.encode(),
'address_length': self.len}
@@
-170,10
+161,18
@@
class VppIpPrefix():
def address(self):
return self.addr.address
def address(self):
return self.addr.address
+ @property
+ def bytes(self):
+ return self.addr.bytes
+
@property
def length(self):
return self.len
@property
def length(self):
return self.len
+ @property
+ def is_ip6(self):
+ return self.addr.is_ip6
+
def __str__(self):
return "%s/%d" % (self.address, self.length)
def __str__(self):
return "%s/%d" % (self.address, self.length)
@@
-183,11
+182,12
@@
class VppIpPrefix():
elif hasattr(other, "address") and hasattr(other, "address_length"):
# vl_api_prefix_t
return self.len == other.address_length and \
elif hasattr(other, "address") and hasattr(other, "address_length"):
# vl_api_prefix_t
return self.len == other.address_length and \
- self.addr == other.address
+
self.addr == other.address
else:
else:
- raise Exception("Comparing VppIpPrefix:%s with unknown type: %s" %
- (self, other))
- return False
+ _log.error(
+ "Comparing VppIpPrefix:%s with incomparable type: %s" %
+ (self, other))
+ return NotImplemented
class VppIpMPrefix():
class VppIpMPrefix():
@@
-195,39
+195,25
@@
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(unicode(self.saddr))
- self.ip_gaddr = ip_address(unicode(self.gaddr))
+ self.ip_saddr = ip_address(text_type(self.saddr))
+ self.ip_gaddr = ip_address(text_type(self.gaddr))
+ if self.ip_saddr.version != self.ip_gaddr.version:
+ raise ValueError('Source and group addresses must be of the '
+ 'same address family.')
def encode(self):
def encode(self):
-
- if 6 is self.ip_saddr.version:
+ if 6 == self.ip_saddr.version:
prefix = {
prefix = {
- 'af': IpAddressFamily.ADDRESS_IP6,
- 'grp_address': {
- 'ip6': {
- 'address': self.ip_gaddr.packed
- },
- },
- 'src_address': {
- 'ip6': {
- 'address': self.ip_saddr.packed
- },
- },
+ 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
+ 'grp_address': {'ip6': self.ip_gaddr.packed},
+ 'src_address': {'ip6': self.ip_saddr.packed},
'grp_address_length': self.len,
}
else:
prefix = {
'grp_address_length': self.len,
}
else:
prefix = {
- 'af': IpAddressFamily.ADDRESS_IP4,
- 'grp_address': {
- 'ip4': {
- 'address': self.ip_gaddr.packed
- },
- },
- 'src_address': {
- 'ip4': {
- 'address': self.ip_saddr.packed
- },
- },
+ 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP4,
+ 'grp_address': {'ip4': self.ip_gaddr.packed},
+ 'src_address': {'ip4': self.ip_saddr.packed},
'grp_address_length': self.len,
}
return prefix
'grp_address_length': self.len,
}
return prefix