tests: refactor vpp_object.py

[vpp.git] / test / vpp_gre_interface.py

diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py
index d5a40ee..46dce36 100644 (file)
--- a/test/vpp_gre_interface.py
+++ b/test/vpp_gre_interface.py
@@ -21,7 +21,7 @@ class VppGreInterface(VppInterface):
     def add_vpp_config(self):
         s = socket.inet_pton(socket.AF_INET, self.t_src)
         d = socket.inet_pton(socket.AF_INET, self.t_dst)
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
+        r = self.test.vapi.gre_add_del_tunnel(s, d,
                                               outer_fib_id=self.t_outer_fib,
                                               tunnel_type=self.t_type,
                                               session_id=self.t_session)
@@ -33,15 +33,12 @@ class VppGreInterface(VppInterface):
         s = socket.inet_pton(socket.AF_INET, self.t_src)
         d = socket.inet_pton(socket.AF_INET, self.t_dst)
         self.unconfig()
-        self.test.vapi.gre_tunnel_add_del(s, d,
+        self.test.vapi.gre_add_del_tunnel(s, d,
                                           outer_fib_id=self.t_outer_fib,
                                           tunnel_type=self.t_type,
                                           session_id=self.t_session,
                                           is_add=0)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "gre-%d" % self.sw_if_index
 
@@ -64,7 +61,7 @@ class VppGre6Interface(VppInterface):
     def add_vpp_config(self):
         s = socket.inet_pton(socket.AF_INET6, self.t_src)
         d = socket.inet_pton(socket.AF_INET6, self.t_dst)
-        r = self.test.vapi.gre_tunnel_add_del(s, d,
+        r = self.test.vapi.gre_add_del_tunnel(s, d,
                                               outer_fib_id=self.t_outer_fib,
                                               tunnel_type=self.t_type,
                                               session_id=self.t_session,
@@ -77,15 +74,12 @@ class VppGre6Interface(VppInterface):
         s = socket.inet_pton(socket.AF_INET6, self.t_src)
         d = socket.inet_pton(socket.AF_INET6, self.t_dst)
         self.unconfig()
-        self.test.vapi.gre_tunnel_add_del(s, d,
+        self.test.vapi.gre_add_del_tunnel(s, d,
                                           outer_fib_id=self.t_outer_fib,
                                           tunnel_type=self.t_type,
                                           session_id=self.t_session,
                                           is_add=0,
                                           is_ip6=1)
 
-    def __str__(self):
-        return self.object_id()
-
     def object_id(self):
         return "gre-%d" % self._sw_if_index