X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_udp_encap.py;h=b89e9411e6a1f0d929c8228ad5e9cda044591831;hb=51880abac14379b06d0c8ff8f17d0b2cd502bbc0;hp=5e2df7646a63f0dace2b3a5e3d7d9d14ad6d43ac;hpb=0bcad32b3870f9998fa1393418081cdda685272f;p=vpp.git

diff --git a/test/vpp_udp_encap.py b/test/vpp_udp_encap.py
index 5e2df7646a6..b89e9411e6a 100644
--- a/test/vpp_udp_encap.py
+++ b/test/vpp_udp_encap.py
@@ -1,34 +1,29 @@
-#!/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
 
 
 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 == 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:
+        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,
-                 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.table_id = table_id
         self.src_ip_s = src_ip
@@ -40,11 +35,8 @@ class VppUdpEncap(VppObject):
 
     def add_vpp_config(self):
         r = self._test.vapi.udp_encap_add(
-            self.src_ip,
-            self.dst_ip,
-            self.src_port,
-            self.dst_port,
-            self.table_id)
+            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)
 
@@ -54,11 +46,8 @@ class VppUdpEncap(VppObject):
     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")