ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make test: VPP-1288 fix from sw_if_index values

Browse Source 
Change-Id: I80297e78d93d8cf0d347863e4d2fdb12ea9294ac
Signed-off-by: Klement Sekera <ksekera@cisco.com>
This commit is contained in:
Klement Sekera
2018-05-23 20:22:20 +02:00
committed by Damjan Marion
parent da6e11b47d
commit c798bc5b11
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/vpp_bond_interface.py
View File

@ -14,8 +14,6 @@ class VppBondInterface(VppInterface):
self.lb = lb self.lb = lb
self.use_custom_mac = use_custom_mac self.use_custom_mac = use_custom_mac
self.mac_address = mac_address self.mac_address = mac_address
self._sw_if_index = 0
super(VppBondInterface, self).__init__(test)
def add_vpp_config(self): def add_vpp_config(self):
r = self.test.vapi.bond_create(self.mode, r = self.test.vapi.bond_create(self.mode,
@ -23,6 +21,7 @@ class VppBondInterface(VppInterface):
self.use_custom_mac, self.use_custom_mac,
self.mac_address) self.mac_address)
self._sw_if_index = r.sw_if_index self._sw_if_index = r.sw_if_index
super(VppBondInterface, self).__init__(self._test)
def remove_vpp_config(self): def remove_vpp_config(self):
self.test.vapi.bond_delete(self.sw_if_index) self.test.vapi.bond_delete(self.sw_if_index)

12
test/vpp_gre_interface.py
View File

@ -11,8 +11,6 @@ class VppGreInterface(VppInterface):
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
session=0): session=0):
""" Create VPP GRE interface """ """ Create VPP GRE interface """
self._sw_if_index = 0
super(VppGreInterface, self).__init__(test)
self._test = test self._test = test
self.t_src = src_ip self.t_src = src_ip
self.t_dst = dst_ip self.t_dst = dst_ip
@ -29,7 +27,8 @@ class VppGreInterface(VppInterface):
session_id=self.t_session) session_id=self.t_session)
self._sw_if_index = r.sw_if_index self._sw_if_index = r.sw_if_index
self.generate_remote_hosts() self.generate_remote_hosts()
self._test.registry.register(self, self._test.logger) self.test.registry.register(self, self.test.logger)
super(VppGreInterface, self).__init__(self.test)
def remove_vpp_config(self): def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET, self.t_src) s = socket.inet_pton(socket.AF_INET, self.t_src)
@ -45,7 +44,7 @@ class VppGreInterface(VppInterface):
return self.object_id() return self.object_id()
def object_id(self): def object_id(self):
return "gre-%d" % self._sw_if_index return "gre-%d" % self.sw_if_index
class VppGre6Interface(VppInterface): class VppGre6Interface(VppInterface):
@ -56,8 +55,6 @@ class VppGre6Interface(VppInterface):
def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0,
session=0): session=0):
""" Create VPP GRE interface """ """ Create VPP GRE interface """
self._sw_if_index = 0
super(VppGre6Interface, self).__init__(test)
self._test = test self._test = test
self.t_src = src_ip self.t_src = src_ip
self.t_dst = dst_ip self.t_dst = dst_ip
@ -75,7 +72,8 @@ class VppGre6Interface(VppInterface):
is_ip6=1) is_ip6=1)
self._sw_if_index = r.sw_if_index self._sw_if_index = r.sw_if_index
self.generate_remote_hosts() self.generate_remote_hosts()
self._test.registry.register(self, self._test.logger) self.test.registry.register(self, self.test.logger)
super(VppGre6Interface, self).__init__(self.test)
def remove_vpp_config(self): def remove_vpp_config(self):
s = socket.inet_pton(socket.AF_INET6, self.t_src) s = socket.inet_pton(socket.AF_INET6, self.t_src)