ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test/vpp_ip.py: Correct usage of 'is'

Browse Source 
* Correct 'is' (identity) usage where equality is needed '=='.
  * Change raise 'Exception' to log message and return NotImplemented.
    (see: https://docs.python.org/3/library/constants.html#NotImplemented)
  * Remove duplicate property: bytes.
  * Remove duplicate method: __eq__.

Change-Id: Id3ae4f92f985eb7cef334e2679f19ecc971007c1
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
This commit is contained in:
Paul Vinciguerra
2018-12-09 08:52:14 -08:00
committed by Ole Trøan
parent 852f5ef9cf
commit a3aaa61e2f
1 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
test/vpp_ip.py
View File

@ -2,11 +2,14 @@
IP Types IP Types
""" """
import logging
from ipaddress import ip_address from ipaddress import ip_address
from socket import AF_INET, AF_INET6 from socket import AF_INET, AF_INET6
from vpp_papi import VppEnum from vpp_papi import VppEnum
_log = logging.getLogger(__name__)
class DpoProto: class DpoProto:
DPO_PROTO_IP4 = 0 DPO_PROTO_IP4 = 0
@ -26,7 +29,7 @@ class VppIpAddressUnion():
self.ip_addr = ip_address(unicode(self.addr)) self.ip_addr = ip_address(unicode(self.addr))
def encode(self): def encode(self):
if self.version is 6: if self.version == 6:
return {'ip6': self.ip_addr.packed} return {'ip6': self.ip_addr.packed}
else: else:
return {'ip4': self.ip_addr.packed} return {'ip4': self.ip_addr.packed}
@ -41,10 +44,7 @@ class VppIpAddressUnion():
@property @property
def length(self): def length(self):
if self.version is 6: return self.ip_addr.max_prefixlen
return 128
else:
return 32
@property @property
def bytes(self): def bytes(self):
@ -55,16 +55,15 @@ class VppIpAddressUnion():
return self.ip_addr == other.ip_addr return self.ip_addr == other.ip_addr
elif hasattr(other, "ip4") and hasattr(other, "ip6"): elif hasattr(other, "ip4") and hasattr(other, "ip6"):
# vl_api_address_union_t # vl_api_address_union_t
if 4 is self.version: if 4 == self.version:
return self.ip_addr.packed == other.ip4 return self.ip_addr.packed == other.ip4
else: else:
return self.ip_addr.packed == other.ip6 return self.ip_addr.packed == other.ip6
else: else:
raise Exception("Comparing VppIpAddresUnions:%s" _log.error("Comparing VppIpAddressUnions:%s"
" with unknown type: %s" % " with incomparable type: %s",
(self, other)) self, other)
return NotImplemented
return False
class VppIpAddress(): class VppIpAddress():
@ -72,7 +71,7 @@ class VppIpAddress():
self.addr = VppIpAddressUnion(addr) self.addr = VppIpAddressUnion(addr)
def encode(self): def encode(self):
if self.addr.version is 6: if self.addr.version == 6:
return { return {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6, 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
'un': self.addr.encode() 'un': self.addr.encode()
@ -88,7 +87,7 @@ class VppIpAddress():
return self.addr == other.addr return self.addr == other.addr
elif hasattr(other, "af") and hasattr(other, "un"): elif hasattr(other, "af") and hasattr(other, "un"):
# a vp_api_address_t # a vp_api_address_t
if 4 is self.version: if 4 == self.version:
return other.af == \ return other.af == \
VppEnum.vl_api_address_family_t.ADDRESS_IP4 and \ VppEnum.vl_api_address_family_t.ADDRESS_IP4 and \
other.un == self.addr other.un == self.addr
@ -97,9 +96,12 @@ class VppIpAddress():
VppEnum.vl_api_address_family_t.ADDRESS_IP6 and \ VppEnum.vl_api_address_family_t.ADDRESS_IP6 and \
other.un == self.addr other.un == self.addr
else: else:
raise Exception("Comparing VppIpAddress:%s with unknown type: %s" % _log.error(
(self, other)) "Comparing VppIpAddress:<%s> %s with incomparable "
return False "type: <%s> %s",
self.__class__.__name__, self,
other.__class__.__name__, other)
return NotImplemented
def __ne__(self, other): def __ne__(self, other):
return not (self == other) return not (self == other)
@ -111,10 +113,6 @@ class VppIpAddress():
def bytes(self): def bytes(self):
return self.addr.bytes return self.addr.bytes
@property
def bytes(self):
return self.addr.bytes
@property @property
def address(self): def address(self):
return self.addr.address return self.addr.address
@ -140,7 +138,7 @@ class VppIpAddress():
@property @property
def dpo_proto(self): def dpo_proto(self):
if self.version is 6: if self.version == 6:
return DpoProto.DPO_PROTO_IP6 return DpoProto.DPO_PROTO_IP6
else: else:
return DpoProto.DPO_PROTO_IP4 return DpoProto.DPO_PROTO_IP4
@ -151,11 +149,6 @@ class VppIpPrefix():
self.addr = VppIpAddress(addr) self.addr = VppIpAddress(addr)
self.len = len self.len = len
def __eq__(self, other):
if self.addr == other.addr and self.len == other.len:
return True
return False
def encode(self): def encode(self):
return {'address': self.addr.encode(), return {'address': self.addr.encode(),
'address_length': self.len} 'address_length': self.len}
@ -185,11 +178,12 @@ class VppIpPrefix():
elif hasattr(other, "address") and hasattr(other, "address_length"): elif hasattr(other, "address") and hasattr(other, "address_length"):
# vl_api_prefix_t # vl_api_prefix_t
return self.len == other.address_length and \ 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" % _log.error(
(self, other)) "Comparing VppIpPrefix:%s with incomparable type: %s" %
return False (self, other))
return NotImplemented
class VppIpMPrefix(): class VppIpMPrefix():
@ -199,10 +193,12 @@ class VppIpMPrefix():
self.len = len self.len = len
self.ip_saddr = ip_address(unicode(self.saddr)) self.ip_saddr = ip_address(unicode(self.saddr))
self.ip_gaddr = ip_address(unicode(self.gaddr)) self.ip_gaddr = ip_address(unicode(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 == self.ip_saddr.version:
if 6 is self.ip_saddr.version:
prefix = { prefix = {
'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6, 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
'grp_address': {'ip6': self.ip_gaddr.packed}, 'grp_address': {'ip6': self.ip_gaddr.packed},