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

Remove postinit from make-test interfaces

Browse Source 
Change-Id: I1eb0f735c5d025e6096d5760eb01419a1c58530a
Signed-off-by: Matej Klotton <mklotton@cisco.com>
This commit is contained in:
Matej Klotton
2016-11-23 15:27:17 +01:00
committed by Damjan Marion
parent 1cd8f3c985
commit c5bf07fabe
4 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
test/vpp_interface.py
View File

@ -1,6 +1,5 @@
from abc import abstractmethod, ABCMeta
import socket
from logging import info
from util import Host
@ -100,7 +99,7 @@ class VppInterface(object):
def host_by_mac(self, mac):
"""
:param ip: MAC address to find host by.
:param mac: MAC address to find host by.
:return: Host object assigned to interface.
"""
return self._hosts_by_mac[mac]
@ -138,8 +137,14 @@ class VppInterface(object):
self._hosts_by_ip4[ip4] = host
self._hosts_by_ip6[ip6] = host
def post_init_setup(self):
"""Additional setup run after creating an interface object."""
@abstractmethod
def __init__(self, test):
self._test = test
self._remote_hosts = []
self._hosts_by_mac = {}
self._hosts_by_ip4 = {}
self._hosts_by_ip6 = {}
self.generate_remote_hosts()
@ -153,8 +158,10 @@ class VppInterface(object):
for intf in r:
if intf.sw_if_index == self.sw_if_index:
self._name = intf.interface_name.split(b'\0', 1)[0]
self._local_mac = ':'.join(intf.l2_address.encode('hex')[i:i + 2]
for i in range(0, 12, 2))
self._local_mac = ':'.join(
intf.l2_address.encode('hex')[i:i + 2]
for i in range(0, 12, 2)
)
self._dump = intf
break
else:
@ -163,13 +170,6 @@ class VppInterface(object):
"in interface dump %s" %
(self.sw_if_index, repr(r)))
@abstractmethod
def __init__(self, test, index):
self._test = test
self.post_init_setup()
info("New %s, MAC=%s, remote_ip4=%s, local_ip4=%s" %
(self.__name__, self.remote_mac, self.remote_ip4, self.local_ip4))
def config_ip4(self):
"""Configure IPv4 address on the VPP interface."""
addr = self.local_ip4n