X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_ip.py;h=7f3a6b01e95cd66fec583542b6e72a5514dd906d;hb=e88865d;hp=912d8430d81febb7a637917e8ef589667fd596ed;hpb=d0df49f26eabf2f534b567f3370e50c4e804aeea;p=vpp.git diff --git a/test/vpp_ip.py b/test/vpp_ip.py index 912d8430d81..7f3a6b01e95 100644 --- a/test/vpp_ip.py +++ b/test/vpp_ip.py @@ -4,31 +4,33 @@ """ from ipaddress import ip_address +from socket import AF_INET, AF_INET6 +from vpp_papi import VppEnum -class IpAddressFamily: - ADDRESS_IP4 = 0 - ADDRESS_IP6 = 1 +class DpoProto: + DPO_PROTO_IP4 = 0 + DPO_PROTO_IP6 = 1 + DPO_PROTO_MPLS = 2 + DPO_PROTO_ETHERNET = 3 + DPO_PROTO_BIER = 4 + DPO_PROTO_NSH = 5 INVALID_INDEX = 0xffffffff -def compare_ip_address(api_address, py_address): - if 4 is py_address.version: - if py_address.packed == api_address.ip4.address: - return True - else: - if py_address.packed == api_address.ip6.address: - return True - return False - - class VppIpAddressUnion(): def __init__(self, addr): self.addr = addr self.ip_addr = ip_address(unicode(self.addr)) + def encode(self): + if self.version is 6: + return {'ip6': self.ip_addr.packed} + else: + return {'ip4': self.ip_addr.packed} + @property def version(self): return self.ip_addr.version @@ -37,19 +39,32 @@ class VppIpAddressUnion(): def address(self): return self.addr - def encode(self): - if self.ip_addr.version is 6: - return { - 'ip6': { - 'address': self.ip_addr.packed - }, - } + @property + def length(self): + if self.version is 6: + return 128 else: - return { - 'ip4': { - 'address': self.ip_addr.packed - }, - } + return 32 + + @property + def bytes(self): + return self.ip_addr.packed + + def __eq__(self, other): + if isinstance(other, self.__class__): + 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 + else: + return self.ip_addr.packed == other.ip6 + else: + raise Exception("Comparing VppIpAddresUnions:%s" + " with unknown type: %s" % + (self, other)) + + return False class VppIpAddress(): @@ -59,19 +74,77 @@ class VppIpAddress(): 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 { - 'af': IpAddressFamily.ADDRESS_IP4, + 'af': VppEnum.vl_api_address_family_t.ADDRESS_IP4, 'un': self.addr.encode() } + def __eq__(self, other): + if isinstance(other, self.__class__): + 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 == \ + VppEnum.vl_api_address_family_t.ADDRESS_IP4 and \ + other.un == self.addr + else: + 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" % + (self, other)) + return False + + def __ne__(self, other): + return not (self == other) + + def __str__(self): + return self.address + + @property + 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 length(self): + return self.addr.length + + @property + def version(self): + return self.addr.version + + @property + def is_ip6(self): + return (self.version == 6) + + @property + def af(self): + if self.version == 6: + return AF_INET6 + else: + return AF_INET + + @property + def dpo_proto(self): + if self.version is 6: + return DpoProto.DPO_PROTO_IP6 + else: + return DpoProto.DPO_PROTO_IP4 + class VppIpPrefix(): def __init__(self, addr, len): @@ -91,6 +164,47 @@ class VppIpPrefix(): def address(self): return self.addr.address + @property + def bytes(self): + return self.addr.bytes + + @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 __eq__(self, other): + if isinstance(other, self.__class__): + return (self.len == other.len and self.addr == other.addr) + elif hasattr(other, "address") and hasattr(other, "address_length"): + # vl_api_prefix_t + return self.len == other.address_length and \ + self.addr == other.address + else: + raise Exception("Comparing VppIpPrefix:%s with unknown type: %s" % + (self, other)) + return False + + +class VppIp6Prefix(): + def __init__(self, prefix, prefixlen): + self.ip_prefix = ip_address(unicode(prefix)) + self.prefixlen = prefixlen + + def encode(self): + return {'prefix': self.ip_prefix.packed, + 'len': self.prefixlen} + + +class VppIp4Prefix(VppIp6Prefix): + pass + class VppIpMPrefix(): def __init__(self, saddr, gaddr, len): @@ -104,32 +218,16 @@ class VppIpMPrefix(): if 6 is self.ip_saddr.version: 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 = { - '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