Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
GBP Endpoint Learning
[vpp.git]
/
test
/
vpp_ip.py
diff --git
a/test/vpp_ip.py
b/test/vpp_ip.py
index
e44e6b5
..
6d22c16
100644
(file)
--- a/
test/vpp_ip.py
+++ b/
test/vpp_ip.py
@@
-5,11
+5,7
@@
from ipaddress import ip_address
from socket import AF_INET, AF_INET6
from ipaddress import ip_address
from socket import AF_INET, AF_INET6
-
-
-class IpAddressFamily:
- ADDRESS_IP4 = 0
- ADDRESS_IP6 = 1
+from vpp_papi import VppEnum
class DpoProto:
class DpoProto:
@@
-86,12
+82,12
@@
class VppIpAddress():
def encode(self):
if self.addr.version is 6:
return {
def encode(self):
if self.addr.version is 6:
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()
}
@@
-101,10
+97,12
@@
class VppIpAddress():
elif hasattr(other, "af") and hasattr(other, "un"):
# a vp_api_address_t
if 4 is self.version:
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 \
+ 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:
raise Exception("Comparing VppIpAddress:%s with unknown type: %s" %
other.un == self.addr
else:
raise Exception("Comparing VppIpAddress:%s with unknown type: %s" %
@@
-121,6
+119,10
@@
class VppIpAddress():
def bytes(self):
return self.addr.bytes
def bytes(self):
return self.addr.bytes
+ @property
+ def bytes(self):
+ return self.addr.bytes
+
@property
def address(self):
return self.addr.address
@property
def address(self):
return self.addr.address
@@
-170,10
+172,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)
@@
-202,7
+212,7
@@
class VppIpMPrefix():
if 6 is self.ip_saddr.version:
prefix = {
if 6 is self.ip_saddr.version:
prefix = {
- 'af':
IpAddressFamily
.ADDRESS_IP6,
+ 'af':
VppEnum.vl_api_address_family_t
.ADDRESS_IP6,
'grp_address': {
'ip6': {
'address': self.ip_gaddr.packed
'grp_address': {
'ip6': {
'address': self.ip_gaddr.packed
@@
-217,7
+227,7
@@
class VppIpMPrefix():
}
else:
prefix = {
}
else:
prefix = {
- 'af':
IpAddressFamily
.ADDRESS_IP4,
+ 'af':
VppEnum.vl_api_address_family_t
.ADDRESS_IP4,
'grp_address': {
'ip4': {
'address': self.ip_gaddr.packed
'grp_address': {
'ip4': {
'address': self.ip_gaddr.packed