Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Build issue after https://gerrit.fd.io/r/#/c/16508/.
[vpp.git]
/
test
/
vpp_ip.py
diff --git
a/test/vpp_ip.py
b/test/vpp_ip.py
index
e92c919
..
055e6d7
100644
(file)
--- a/
test/vpp_ip.py
+++ b/
test/vpp_ip.py
@@
-27,17
+27,9
@@
class VppIpAddressUnion():
def encode(self):
if self.version is 6:
def encode(self):
if self.version is 6:
- return {
- 'ip6': {
- 'address': self.ip_addr.packed
- },
- }
+ 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):
@@
-64,9
+56,9
@@
class VppIpAddressUnion():
elif hasattr(other, "ip4") and hasattr(other, "ip6"):
# vl_api_address_union_t
if 4 is self.version:
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
+ 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:
raise Exception("Comparing VppIpAddresUnions:%s"
" with unknown type: %s" %
else:
raise Exception("Comparing VppIpAddresUnions:%s"
" with unknown type: %s" %
@@
-119,6
+111,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
@@
-168,10
+164,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)
@@
-201,31
+205,15
@@
class VppIpMPrefix():
if 6 is self.ip_saddr.version:
prefix = {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
if 6 is self.ip_saddr.version:
prefix = {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
- 'grp_address': {
- 'ip6': {
- 'address': self.ip_gaddr.packed
- },
- },
- 'src_address': {
- 'ip6': {
- 'address': self.ip_saddr.packed
- },
- },
+ 'grp_address': {'ip6': self.ip_gaddr.packed},
+ 'src_address': {'ip6': self.ip_saddr.packed},
'grp_address_length': self.len,
}
else:
prefix = {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP4,
'grp_address_length': self.len,
}
else:
prefix = {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP4,
- 'grp_address': {
- 'ip4': {
- 'address': self.ip_gaddr.packed
- },
- },
- 'src_address': {
- 'ip4': {
- 'address': self.ip_saddr.packed
- },
- },
+ '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