From c8efa29b6f9a91381897b54f1147daf922ed7164 Mon Sep 17 00:00:00 2001 From: Ole Troan Date: Fri, 22 Jun 2018 22:33:41 +0200 Subject: Revert "make test: fix broken interfaces" This reverts commit d5c60b96a3fd93916fc4af5c8d6d25625c28242e. Change-Id: I3632b9c3f76c615aee897f28f76d094e7031e689 Signed-off-by: Ole Troan --- test/vpp_gre_interface.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'test/vpp_gre_interface.py') diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py index d5a40eeb03d..3de3e5c4559 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 """ - super(VppGreInterface, self).__init__(test) + self._test = test self.t_src = src_ip self.t_dst = dst_ip self.t_outer_fib = outer_fib_id @@ -25,9 +25,10 @@ class VppGreInterface(VppInterface): outer_fib_id=self.t_outer_fib, tunnel_type=self.t_type, session_id=self.t_session) - self.set_sw_if_index(r.sw_if_index) + self._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) @@ -54,7 +55,7 @@ class VppGre6Interface(VppInterface): def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, session=0): """ Create VPP GRE interface """ - super(VppGre6Interface, self).__init__(test) + self._test = test self.t_src = src_ip self.t_dst = dst_ip self.t_outer_fib = outer_fib_id @@ -69,9 +70,10 @@ class VppGre6Interface(VppInterface): tunnel_type=self.t_type, session_id=self.t_session, is_ip6=1) - self.set_sw_if_index(r.sw_if_index) + self._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