From c82cc955983065dba7b4d60858082150834ac356 Mon Sep 17 00:00:00 2001 From: Saravanan KR Date: Wed, 31 Aug 2016 17:10:56 +0530 Subject: Fixed nic numbering issue of DPDK nics after the nic has bound * os-net-config is called multiple times during the deploy. Once the interface is bound to a driver, it will not be listed for ethtool to get the pci address, which will through exception. Handled this exception. * Stored the DPDK bound nic configs at '/var/lib/os-net-config/ dpdk_mappings.yaml' file to emulate the same nic numbering after the nic has been bound to the DPDK driver. Partial-Bug: #1619330 Change-Id: I6b1e45003f851f1fcf5b8730890c75331e8d0f8f --- os_net_config/tests/test_utils.py | 151 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 151 insertions(+) (limited to 'os_net_config/tests/test_utils.py') diff --git a/os_net_config/tests/test_utils.py b/os_net_config/tests/test_utils.py index b6531a6..a2d5cc4 100644 --- a/os_net_config/tests/test_utils.py +++ b/os_net_config/tests/test_utils.py @@ -14,16 +14,43 @@ # License for the specific language governing permissions and limitations # under the License. +import os import os.path +import random import shutil import tempfile +import yaml from os_net_config.tests import base from os_net_config import utils +from oslo_concurrency import processutils + +_PCI_OUTPUT = '''driver: e1000e +version: 3.2.6-k +firmware-version: 0.13-3 +expansion-rom-version: +bus-info: 0000:00:19.0 +supports-statistics: yes +supports-test: yes +supports-eeprom-access: yes +supports-register-dump: yes +supports-priv-flags: no +''' + class TestUtils(base.TestCase): + def setUp(self): + super(TestUtils, self).setUp() + rand = str(int(random.random() * 100000)) + utils._DPDK_MAPPING_FILE = '/tmp/dpdk_mapping_' + rand + '.yaml' + + def tearDown(self): + super(TestUtils, self).tearDown() + if os.path.isfile(utils._DPDK_MAPPING_FILE): + os.remove(utils._DPDK_MAPPING_FILE) + def test_ordered_active_nics(self): tmpdir = tempfile.mkdtemp() @@ -49,3 +76,127 @@ class TestUtils(base.TestCase): self.assertEqual('z1', nics[7]) shutil.rmtree(tmpdir) + + def test_get_pci_address_success(self): + def test_execute(name, dummy1, dummy2=None, dummy3=None): + if 'ethtool' in name: + out = _PCI_OUTPUT + return out, None + self.stubs.Set(processutils, 'execute', test_execute) + pci = utils._get_pci_address('nic2', False) + self.assertEqual('0000:00:19.0', pci) + + def test_get_pci_address_exception(self): + def test_execute(name, dummy1, dummy2=None, dummy3=None): + if 'ethtool' in name: + raise processutils.ProcessExecutionError + self.stubs.Set(processutils, 'execute', test_execute) + pci = utils._get_pci_address('nic2', False) + self.assertEqual(None, pci) + + def test_get_pci_address_error(self): + def test_execute(name, dummy1, dummy2=None, dummy3=None): + if 'ethtool' in name: + return None, 'Error' + self.stubs.Set(processutils, 'execute', test_execute) + pci = utils._get_pci_address('nic2', False) + self.assertEqual(None, pci) + + def test_bind_dpdk_interfaces(self): + def test_execute(name, dummy1, dummy2=None, dummy3=None): + if 'ethtool' in name: + out = _PCI_OUTPUT + return out, None + if 'driverctl' in name: + return None, None + self.stubs.Set(processutils, 'execute', test_execute) + utils.bind_dpdk_interfaces('nic2', 'vfio-pci', False) + + def test_bind_dpdk_interfaces_fail(self): + def test_execute(name, dummy1, dummy2=None, dummy3=None): + if 'ethtool' in name: + out = _PCI_OUTPUT + return out, None + if 'driverctl' in name: + return None, 'Error' + self.stubs.Set(processutils, 'execute', test_execute) + self.assertRaises(utils.OvsDpdkBindException, + utils.bind_dpdk_interfaces, 'nic2', 'vfio-pci', + False) + + def test_update_dpdk_map_new(self): + utils._update_dpdk_map('eth1', '0000:03:00.0', 'vfio-pci') + try: + contents = utils.get_file_data(utils._DPDK_MAPPING_FILE) + except IOError: + pass + + dpdk_map = yaml.load(contents) if contents else [] + self.assertEqual(1, len(dpdk_map)) + dpdk_test = [{'name': 'eth1', 'pci_address': '0000:03:00.0', + 'driver': 'vfio-pci'}] + self.assertListEqual(dpdk_test, dpdk_map) + + def test_update_dpdk_map_exist(self): + dpdk_test = [{'name': 'eth1', 'pci_address': '0000:03:00.0', + 'driver': 'vfio-pci'}] + utils.write_yaml_config(utils._DPDK_MAPPING_FILE, dpdk_test) + + utils._update_dpdk_map('eth1', '0000:03:00.0', 'vfio-pci') + try: + contents = utils.get_file_data(utils._DPDK_MAPPING_FILE) + except IOError: + pass + + dpdk_map = yaml.load(contents) if contents else [] + self.assertEqual(1, len(dpdk_map)) + self.assertListEqual(dpdk_test, dpdk_map) + + def test_update_dpdk_map_value_change(self): + dpdk_test = [{'name': 'eth1', 'pci_address': '0000:03:00.0', + 'driver': 'vfio-pci'}] + utils.write_yaml_config(utils._DPDK_MAPPING_FILE, dpdk_test) + + dpdk_test = [{'name': 'eth1', 'pci_address': '0000:03:00.0', + 'driver': 'igb_uio'}] + utils._update_dpdk_map('eth1', '0000:03:00.0', 'igb_uio') + try: + contents = utils.get_file_data(utils._DPDK_MAPPING_FILE) + except IOError: + pass + + dpdk_map = yaml.load(contents) if contents else [] + self.assertEqual(1, len(dpdk_map)) + self.assertListEqual(dpdk_test, dpdk_map) + + def test_ordered_active_nics_with_dpdk_mapping(self): + + tmpdir = tempfile.mkdtemp() + self.stubs.Set(utils, '_SYS_CLASS_NET', tmpdir) + + def test_is_active_nic(interface_name): + return True + self.stubs.Set(utils, '_is_active_nic', test_is_active_nic) + + for nic in ['a1', 'em1', 'em2', 'eth2', 'z1', + 'enp8s0', 'enp10s0', 'enp1s0f0']: + with open(os.path.join(tmpdir, nic), 'w') as f: + f.write(nic) + + utils._update_dpdk_map('eth1', '0000:03:00.0', 'igb_uio') + utils._update_dpdk_map('p3p1', '0000:04:00.0', 'igb_uio') + + nics = utils.ordered_active_nics() + + self.assertEqual('em1', nics[0]) + self.assertEqual('em2', nics[1]) + self.assertEqual('eth1', nics[2]) # DPDK bound nic + self.assertEqual('eth2', nics[3]) + self.assertEqual('a1', nics[4]) + self.assertEqual('enp1s0f0', nics[5]) + self.assertEqual('enp8s0', nics[6]) + self.assertEqual('enp10s0', nics[7]) + self.assertEqual('p3p1', nics[8]) # DPDK bound nic + self.assertEqual('z1', nics[9]) + + shutil.rmtree(tmpdir) -- cgit 1.2.3-korg