Add support for VPP interface

Vector Packet Processing (VPP) is a high performance packet processing
stack that runs in user space in Linux. VPP is used as an alternative to
kernel networking stack for accelerated network data path. VPP uses DPDK
poll-mode drivers to bind system interfaces rather than kernel drivers.
VPP bound interfacees are not visible to kernel networking stack and
therefore require different configuration steps in os-net-config.

VPP interface will be used in Openstack by either Neutron ML2 driver
networking-vpp as an alternative to OVS, or by Opendaylight SDN
controller with Honeycomb agent.

This patch adds interface configuration support to os-net-config.
The kernel nic specified to be VPP interface type will be bound to
VPP with a DPDK poll-mode driver. Note that os-net-config will only
configure those settings that affect interface binding, all other
configurations for VPP will be configured throught TripleO Heat
Templates.

Implements: blueprint fdio-integration-tripleo

Change-Id: Iebb40b7c5b252c51e86b6f44bcf36ed206101390
Signed-off-by: Feng Pan <fpan@redhat.com>

1 files changed, 127 insertions, 3 deletions

diff --git a/os_net_config/tests/test_utils.py b/os_net_config/tests/test_utils.py
index 1885cbb..5a8b6af 100644
--- a/os_net_config/tests/test_utils.py
+++ b/os_net_config/tests/test_utils.py
@@ -21,6 +21,7 @@ import shutil
 import tempfile
 import yaml
 
+from os_net_config import objects
 from os_net_config.tests import base
 from os_net_config import utils
 
@@ -38,6 +39,33 @@ supports-register-dump: yes
 supports-priv-flags: no
 '''
 
+_VPPCTL_OUTPUT = '''
+            Name               Idx       State          Counter          Count
+GigabitEthernet0/9/0              1        down
+local0                            0        down
+
+'''
+
+_INITIAL_VPP_CONFIG = '''
+unix {
+  nodaemon
+  log /tmp/vpp.log
+  full-coredump
+}
+
+
+api-trace {
+  on
+}
+
+api-segment {
+  gid vpp
+}
+
+dpdk {
+}
+'''
+
 
 class TestUtils(base.TestCase):
 
@@ -83,7 +111,7 @@ class TestUtils(base.TestCase):
                 out = _PCI_OUTPUT
                 return out, None
         self.stubs.Set(processutils, 'execute', test_execute)
-        pci = utils._get_pci_address('nic2', False)
+        pci = utils.get_pci_address('nic2', False)
         self.assertEqual('0000:00:19.0', pci)
 
     def test_get_pci_address_exception(self):
@@ -91,7 +119,7 @@ class TestUtils(base.TestCase):
             if 'ethtool' in name:
                 raise processutils.ProcessExecutionError
         self.stubs.Set(processutils, 'execute', test_execute)
-        pci = utils._get_pci_address('nic2', False)
+        pci = utils.get_pci_address('nic2', False)
         self.assertEqual(None, pci)
 
     def test_get_pci_address_error(self):
@@ -99,7 +127,7 @@ class TestUtils(base.TestCase):
             if 'ethtool' in name:
                 return None, 'Error'
         self.stubs.Set(processutils, 'execute', test_execute)
-        pci = utils._get_pci_address('nic2', False)
+        pci = utils.get_pci_address('nic2', False)
         self.assertEqual(None, pci)
 
     def test_bind_dpdk_interfaces(self):
@@ -241,3 +269,99 @@ class TestUtils(base.TestCase):
         self.assertEqual(utils._is_active_nic('enp129s2'), False)
 
         shutil.rmtree(tmpdir)
+
+    def test_get_vpp_interface_name(self):
+        def test_execute(name, dummy1, dummy2=None, dummy3=None):
+            if 'systemctl' in name:
+                return None, None
+            if 'vppctl' in name:
+                return _VPPCTL_OUTPUT, None
+
+        self.stubs.Set(processutils, 'execute', test_execute)
+
+        self.assertEqual('GigabitEthernet0/9/0',
+                         utils._get_vpp_interface_name('0000:00:09.0'))
+        self.assertIsNone(utils._get_vpp_interface_name(None))
+        self.assertIsNone(utils._get_vpp_interface_name('0000:01:09.0'))
+        self.assertRaises(utils.VppException,
+                          utils._get_vpp_interface_name, '0000:09.0')
+
+    def test_generate_vpp_config(self):
+        tmpdir = tempfile.mkdtemp()
+        config_path = os.path.join(tmpdir, 'startup.conf')
+        with open(config_path, 'w') as f:
+            f.write(_INITIAL_VPP_CONFIG)
+        vpp_exec_path = os.path.join(tmpdir, 'vpp-exec')
+        utils._VPP_EXEC_FILE = vpp_exec_path
+
+        int1 = objects.VppInterface('em1', options="vlan-strip-offload off")
+        int1.pci_dev = '0000:00:09.0'
+        int2 = objects.VppInterface('em2')
+        int2.pci_dev = '0000:00:09.1'
+        interfaces = [int1, int2]
+        expected_config = '''
+unix {
+  exec %s
+  nodaemon
+  log /tmp/vpp.log
+  full-coredump
+}
+
+
+api-trace {
+  on
+}
+
+api-segment {
+  gid vpp
+}
+
+dpdk {
+  dev 0000:00:09.1
+  uio-driver vfio-pci
+  dev 0000:00:09.0 {vlan-strip-offload off}
+
+}
+''' % vpp_exec_path
+        self.assertEqual(expected_config,
+                         utils.generate_vpp_config(config_path, interfaces))
+
+    def test_update_vpp_mapping(self):
+        def test_get_dpdk_map():
+            return [{'name': 'eth1', 'pci_address': '0000:00:09.0',
+                     'mac_address': '01:02:03:04:05:06',
+                     'driver': 'vfio-pci'}]
+
+        self.stubs.Set(utils, '_get_dpdk_map', test_get_dpdk_map)
+
+        def test_execute(name, dummy1, dummy2=None, dummy3=None):
+            return None, None
+        self.stubs.Set(processutils, 'execute', test_execute)
+
+        def test_get_vpp_interface_name(pci_dev):
+            return 'GigabitEthernet0/9/0'
+
+        self.stubs.Set(utils, '_get_vpp_interface_name',
+                       test_get_vpp_interface_name)
+
+        int1 = objects.VppInterface('eth1', options="vlan-strip-offload off")
+        int1.pci_dev = '0000:00:09.0'
+        int1.hwaddr = '01:02:03:04:05:06'
+        int2 = objects.VppInterface('eth2')
+        int2.pci_dev = '0000:00:09.1'
+        int2.hwaddr = '01:02:03:04:05:07'
+        interfaces = [int1, int2]
+
+        utils.update_vpp_mapping(interfaces)
+
+        contents = utils.get_file_data(utils._DPDK_MAPPING_FILE)
+
+        dpdk_test = [{'name': 'eth1', 'pci_address': '0000:00:09.0',
+                      'mac_address': '01:02:03:04:05:06',
+                      'driver': 'vfio-pci'},
+                     {'name': 'eth2', 'pci_address': '0000:00:09.1',
+                      'mac_address': '01:02:03:04:05:07',
+                      'driver': 'vfio-pci'}]
+        dpdk_map = yaml.load(contents) if contents else []
+        self.assertEqual(2, len(dpdk_map))
+        self.assertListEqual(dpdk_test, dpdk_map)