Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Revert "Revert "make test: fix broken interfaces""
[vpp.git]
/
test
/
vpp_gre_interface.py
diff --git
a/test/vpp_gre_interface.py
b/test/vpp_gre_interface.py
index
3de3e5c
..
d5a40ee
100644
(file)
--- 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 """
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
session=0):
""" Create VPP GRE interface """
- s
elf._test = test
+ s
uper(VppGreInterface, self).__init__(test)
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
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)
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)
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)
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 """
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
session=0):
""" Create VPP GRE interface """
- s
elf._test = test
+ s
uper(VppGre6Interface, self).__init__(test)
self.t_src = src_ip
self.t_dst = dst_ip
self.t_outer_fib = outer_fib_id
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)
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)
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)
def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET6, self.t_src)