From b9ef2739dd1e681143e78ada1ffc342ae2fb89b0 Mon Sep 17 00:00:00 2001 From: Klement Sekera Date: Sun, 24 Jun 2018 22:49:33 +0200 Subject: Revert "Revert "make test: fix broken interfaces"" This reverts commit c8efa29b6f9a91381897b54f1147daf922ed7164. Change-Id: I1d5c5773d5f86a63073e255336bd9de628e26179 Signed-off-by: Klement Sekera --- test/vpp_gre_interface.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'test/vpp_gre_interface.py') diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py index 3de3e5c4559..d5a40eeb03d 100644 --- a/test/vpp_gre_interface.py +++ b/test/vpp_gre_interface.py @@ -11,7 +11,7 @@ class VppGreInterface(VppInterface): def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, session=0): """ Create VPP GRE interface """ - self._test = test + super(VppGreInterface, self).__init__(test) self.t_src = src_ip self.t_dst = dst_ip self.t_outer_fib = outer_fib_id @@ -25,10 +25,9 @@ class VppGreInterface(VppInterface): outer_fib_id=self.t_outer_fib, tunnel_type=self.t_type, session_id=self.t_session) - self._sw_if_index = r.sw_if_index + self.set_sw_if_index(r.sw_if_index) self.generate_remote_hosts() self.test.registry.register(self, self.test.logger) - super(VppGreInterface, self).__init__(self.test) def remove_vpp_config(self): s = socket.inet_pton(socket.AF_INET, self.t_src) @@ -55,7 +54,7 @@ class VppGre6Interface(VppInterface): def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, session=0): """ Create VPP GRE interface """ - self._test = test + super(VppGre6Interface, self).__init__(test) self.t_src = src_ip self.t_dst = dst_ip self.t_outer_fib = outer_fib_id @@ -70,10 +69,9 @@ class VppGre6Interface(VppInterface): tunnel_type=self.t_type, session_id=self.t_session, is_ip6=1) - self._sw_if_index = r.sw_if_index + self.set_sw_if_index(r.sw_if_index) self.generate_remote_hosts() self.test.registry.register(self, self.test.logger) - super(VppGre6Interface, self).__init__(self.test) def remove_vpp_config(self): s = socket.inet_pton(socket.AF_INET6, self.t_src) -- cgit 1.2.3-korg