diff options
| author |   Klement Sekera <ksekera@cisco.com> | 2018-05-23 20:22:20 +0200 |
|---|---|---|
| committer |   Damjan Marion <dmarion.lists@gmail.com> | 2018-05-23 20:52:24 +0000 |
| commit | c798bc5b11ad4a0b8673a4a039b448a5c723f17c (patch) | |
| tree | d57ffbea24a3991478ffb99040a3820731a9576e /test | |
| parent | da6e11b47d47c764b11304524de559dda0d0d223 (diff) | |
make test: VPP-1288 fix from sw_if_index values
Change-Id: I80297e78d93d8cf0d347863e4d2fdb12ea9294ac
Signed-off-by: Klement Sekera <ksekera@cisco.com>
Diffstat (limited to 'test')
| -rw-r--r-- | test/vpp_bond_interface.py | 3 | ||||
| -rw-r--r-- | test/vpp_gre_interface.py | 12 |
2 files changed, 6 insertions, 9 deletions
diff --git a/test/vpp_bond_interface.py b/test/vpp_bond_interface.py index 1c33e1cecd6..4bd7cb8235c 100644 --- a/test/vpp_bond_interface.py +++ b/test/vpp_bond_interface.py @@ -14,8 +14,6 @@ class VppBondInterface(VppInterface): self.lb = lb self.use_custom_mac = use_custom_mac self.mac_address = mac_address - self._sw_if_index = 0 - super(VppBondInterface, self).__init__(test) def add_vpp_config(self): r = self.test.vapi.bond_create(self.mode, @@ -23,6 +21,7 @@ class VppBondInterface(VppInterface): self.use_custom_mac, self.mac_address) self._sw_if_index = r.sw_if_index + super(VppBondInterface, self).__init__(self._test) def remove_vpp_config(self): self.test.vapi.bond_delete(self.sw_if_index) diff --git a/test/vpp_gre_interface.py b/test/vpp_gre_interface.py index 91293c3d28c..3de3e5c4559 100644 --- a/test/vpp_gre_interface.py +++ b/test/vpp_gre_interface.py @@ -11,8 +11,6 @@ class VppGreInterface(VppInterface): def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, session=0): """ Create VPP GRE interface """ - self._sw_if_index = 0 - super(VppGreInterface, self).__init__(test) self._test = test self.t_src = src_ip self.t_dst = dst_ip @@ -29,7 +27,8 @@ class VppGreInterface(VppInterface): session_id=self.t_session) self._sw_if_index = r.sw_if_index 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): s = socket.inet_pton(socket.AF_INET, self.t_src) @@ -45,7 +44,7 @@ class VppGreInterface(VppInterface): return self.object_id() def object_id(self): - return "gre-%d" % self._sw_if_index + return "gre-%d" % self.sw_if_index class VppGre6Interface(VppInterface): @@ -56,8 +55,6 @@ class VppGre6Interface(VppInterface): def __init__(self, test, src_ip, dst_ip, outer_fib_id=0, type=0, session=0): """ Create VPP GRE interface """ - self._sw_if_index = 0 - super(VppGre6Interface, self).__init__(test) self._test = test self.t_src = src_ip self.t_dst = dst_ip @@ -75,7 +72,8 @@ class VppGre6Interface(VppInterface): is_ip6=1) self._sw_if_index = r.sw_if_index 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): s = socket.inet_pton(socket.AF_INET6, self.t_src) |