X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ip.py;h=8b7ea222a67a841dbcee046c6a3c07bdb2bb4930;hb=refs%2Fchanges%2F34%2F19134%2F2;hp=6d22c16ff609dc51f57d4edb76d12f75abd2af2f;hpb=93cc3ee3b3a9c9224a1446625882205f3282a949;p=vpp.git

diff --git a/test/vpp_ip.py b/test/vpp_ip.py
index 6d22c16ff60..8b7ea222a67 100644
--- a/test/vpp_ip.py
+++ b/test/vpp_ip.py
@@ -2,10 +2,17 @@
   IP Types
 
 """
+import logging
 
 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__)
 
 
 class DpoProto:
@@ -23,21 +30,13 @@ INVALID_INDEX = 0xffffffff
 class VppIpAddressUnion():
     def __init__(self, addr):
         self.addr = addr
-        self.ip_addr = ip_address(unicode(self.addr))
+        self.ip_addr = ip_address(text_type(self.addr))
 
     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:
-            return {
-                'ip4': {
-                    'address': self.ip_addr.packed
-                },
-            }
+            return {'ip4': self.ip_addr.packed}
 
     @property
     def version(self):
@@ -49,10 +48,7 @@ class VppIpAddressUnion():
 
     @property
     def length(self):
-        if self.version is 6:
-            return 128
-        else:
-            return 32
+        return self.ip_addr.max_prefixlen
 
     @property
     def bytes(self):
@@ -63,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
-            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:
-                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" %
-                            (self, other))
-
-        return False
+            _log.error("Comparing VppIpAddressUnions:%s"
+                       " with incomparable type: %s",
+                       self, other)
+            return NotImplemented
 
 
 class VppIpAddress():
@@ -80,7 +75,7 @@ class VppIpAddress():
         self.addr = VppIpAddressUnion(addr)
 
     def encode(self):
-        if self.addr.version is 6:
+        if self.addr.version == 6:
             return {
                 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP6,
                 'un': self.addr.encode()
@@ -96,7 +91,7 @@ class VppIpAddress():
             return self.addr == other.addr
         elif hasattr(other, "af") and hasattr(other, "un"):
             # a vp_api_address_t
-            if 4 is self.version:
+            if 4 == self.version:
                 return other.af == \
                     VppEnum.vl_api_address_family_t.ADDRESS_IP4 and \
                     other.un == self.addr
@@ -105,9 +100,12 @@ class VppIpAddress():
                     VppEnum.vl_api_address_family_t.ADDRESS_IP6 and \
                     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)
@@ -119,10 +117,6 @@ class VppIpAddress():
     def bytes(self):
         return self.addr.bytes
 
-    @property
-    def bytes(self):
-        return self.addr.bytes
-
     @property
     def address(self):
         return self.addr.address
@@ -148,7 +142,7 @@ class VppIpAddress():
 
     @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
@@ -159,11 +153,6 @@ class VppIpPrefix():
         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}
@@ -193,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 \
-                self.addr == other.address
+                   self.addr == other.address
         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():
@@ -205,39 +195,25 @@ class VppIpMPrefix():
         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):
-
-        if 6 is self.ip_saddr.version:
+        if 6 == 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': {
-                    '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