devices: partial revert of af_packet API cleanup patch

Reverting as make test must me able to run non-root so creating tap interfaces is no-go.

Type: fix
Fixes: 3b2db9002c14f9e0742622f2d503c5801d443827

Change-Id: Ib6eb2679b65b662ed6e88e67f8b199744abae85e
Signed-off-by: Damjan Marion <dmarion@me.com>
This commit is contained in:
Damjan Marion
2019-09-13 11:48:05 +00:00
parent 321cfa5fcb
commit bf02d6f467
2 changed files with 0 additions and 80 deletions

View File

@ -1,39 +0,0 @@
import unittest
import os
import psutil
from framework import VppTestCase, VppTestRunner
from vpp_devices import VppAFPacketInterface
class TestAFPacket(VppTestCase):
""" Host interface Test Case """
host_if_name = 'afp0'
@classmethod
def setUpClass(cls):
super(TestAFPacket, cls).setUpClass()
os.system('ip tuntap add dev ' + cls.host_if_name + ' mode tap')
@classmethod
def tearDownClass(cls):
super(TestAFPacket, cls).tearDownClass()
os.system('ip link delete ' + cls.host_if_name)
def test_tap_add_del(self):
"""Create host interface"""
# check if host interface exists
self.assertTrue(
psutil.net_if_addrs().get(
self.host_if_name),
'Host interface ' +
self.host_if_name +
' does not exist')
afp0 = VppAFPacketInterface(self, self.host_if_name)
afp0.add_vpp_config()
self.assertTrue(afp0.query_vpp_config())
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)

View File

@ -1,41 +0,0 @@
from vpp_interface import VppInterface
class VppAFPacketInterface(VppInterface):
@property
def host_if_name(self):
"""Host interface name"""
return self._host_if_name
def __init__(self, test, host_if_name, mac_addr=None):
self._test = test
self._host_if_name = host_if_name
self._mac_addr = mac_addr
def get_vpp_dump(self):
dump = self._test.vapi.af_packet_dump()
for entry in dump:
if entry.sw_if_index == self.sw_if_index:
return entry
def add_vpp_config(self):
use_random_mac = True if self._mac_addr else False
reply = self._test.vapi.af_packet_create(
host_if_name=self._host_if_name,
use_random_hw_addr=use_random_mac,
hw_addr=self._mac_addr)
self.set_sw_if_index(reply.sw_if_index)
self._test.registry.register(self, self.test.logger)
def remove_vpp_config(self):
self._test.vapi.af_packet_delete(host_if_name=self._host_if_name)
def query_vpp_config(self):
dump = self.get_vpp_dump()
if dump:
return True
return False
def object_id(self):
return "af_packet-%s" % self._host_if_name