-#!/usr/bin/env python
+#!/usr/bin/env python3
"""
UDP encap objects
"""
-from vpp_object import *
+from vpp_object import VppObject
from socket import inet_pton, inet_ntop, AF_INET, AF_INET6
-from vpp_ip import *
def find_udp_encap(test, ue):
encaps = test.vapi.udp_encap_dump()
for e in encaps:
- if ue.id == e.udp_encap.id \
- and ue.src_ip == e.udp_encap.src_ip \
- and ue.dst_ip == e.udp_encap.dst_ip \
- and e.udp_encap.dst_port == ue.dst_port \
- and e.udp_encap.src_port == ue.src_port:
+ if (
+ ue.id == e.udp_encap.id
+ and ue.src_ip == str(e.udp_encap.src_ip)
+ and ue.dst_ip == str(e.udp_encap.dst_ip)
+ and e.udp_encap.dst_port == ue.dst_port
+ and e.udp_encap.src_port == ue.src_port
+ ):
return True
return False
class VppUdpEncap(VppObject):
-
- def __init__(self,
- test,
- id,
- src_ip,
- dst_ip,
- src_port,
- dst_port,
- table_id=0):
+ def __init__(self, test, src_ip, dst_ip, src_port, dst_port, table_id=0):
self._test = test
- self.id = id
self.table_id = table_id
self.src_ip_s = src_ip
self.dst_ip_s = dst_ip
- self.src_ip = VppIpAddress(src_ip)
- self.dst_ip = VppIpAddress(dst_ip)
+ self.src_ip = src_ip
+ self.dst_ip = dst_ip
self.src_port = src_port
self.dst_port = dst_port
def add_vpp_config(self):
- self._test.vapi.udp_encap_add(
- self.id,
- self.src_ip.encode(),
- self.dst_ip.encode(),
- self.src_port,
- self.dst_port,
- self.table_id)
+ r = self._test.vapi.udp_encap_add(
+ self.src_ip, self.dst_ip, self.src_port, self.dst_port, self.table_id
+ )
+ self.id = r.id
self._test.registry.register(self, self._test.logger)
def remove_vpp_config(self):
def query_vpp_config(self):
return find_udp_encap(self._test, self)
- def __str__(self):
- return self.object_id()
-
def object_id(self):
- return ("udp-encap-%d" % self.id)
+ return "udp-encap-%d" % self.id
+
+ def get_stats(self):
+ c = self._test.statistics.get_counter("/net/udp-encap")
+ return c[0][self.id]