openstack
/
os-net-config
Code Issues Proposed changes

Merge "Drop six"

This commit is contained in:
Zuul 2021-10-05 13:02:13 +00:00 committed by Gerrit Code Review
parent 0692a49e0c 6dc407b11e
commit 62ee9216da
5 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
os_net_config/sriov_config.py
View File

@ -25,8 +25,8 @@ import argparse
import logging
import os
import pyudev
import queue
import re
from six.moves import queue as Queue
import sys
import time
import yaml
@ -59,7 +59,7 @@ echo "NUMBER=${PORT##pf*vf}"
'''
# Create a queue for passing the udev network events
vf_queue = Queue.Queue()
vf_queue = queue.Queue()
# File to contain the list of SR-IOV PF, VF and their configurations
@ -140,7 +140,7 @@ def _wait_for_vf_creation(pf_name, numvfs):
logger.warning(f"Unable to parse event {event['device']}")
else:
logger.warning(f"{pf_path} is not a directory")
except Queue.Empty:
except queue.Empty:
logger.info(f"Timeout in the creation of VFs for PF {pf_name}")
return
logger.info(f"Required VFs are created for PF {pf_name}")

6
os_net_config/tests/test_cli.py
View File

@ -14,6 +14,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from io import StringIO
import os.path
import random
import sys
@ -24,7 +25,6 @@ from os_net_config import cli
from os_net_config import sriov_config
from os_net_config.tests import base
from os_net_config import utils
import six
REALPATH = os.path.dirname(os.path.realpath(__file__))
@ -53,8 +53,8 @@ class TestCli(base.TestCase):
orig = sys.stdout
orig_stderr = sys.stderr
sys.stdout = six.StringIO()
sys.stderr = six.StringIO()
sys.stdout = StringIO()
sys.stderr = StringIO()
ret = cli.main(argstr.split())
self.assertIn(ret, exitcodes)

31
os_net_config/tests/test_objects.py
View File

@ -17,7 +17,6 @@
import json
import os
import random
import six
import yaml
from os_net_config import objects
@ -987,7 +986,7 @@ class TestIvsInterface(base.TestCase):
objects.IvsBridge.from_json,
json.loads(data))
expected = 'IVS does not support bond interfaces.'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
class TestNfvswitchBridge(base.TestCase):
@ -1052,7 +1051,7 @@ class TestNfvswitchInterface(base.TestCase):
objects.NfvswitchBridge.from_json,
json.loads(data))
expected = 'NFVSwitch does not support bond interfaces.'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
class TestBond(base.TestCase):
@ -1746,7 +1745,7 @@ class TestNicMapping(base.TestCase):
err = self.assertRaises(objects.InvalidConfigException,
objects.mapped_nics, nic_mapping=mapping)
expected = 'em1 already mapped, check mapping file for duplicates'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_mapped_nics_map_invalid_nic(self):
self._stub_active_nics(['em1'])
@ -1799,7 +1798,7 @@ class TestNicMapping(base.TestCase):
err = self.assertRaises(objects.InvalidConfigException,
objects.mapped_nics, nic_mapping=mapping)
expected = 'cannot map em2 to alias em1, alias overlaps'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_mapped_nics_mapping_inactive_name_as_alias(self):
def dummy_is_active_nic(nic):
@ -1982,7 +1981,7 @@ class TestSriovPF(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Expecting link_mode to match legacy/switchdev'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_vdpa_link_mode_invalid(self):
data = '{"type": "sriov_pf", "name": "p6p1", "numvfs": 8,' \
@ -1992,7 +1991,7 @@ class TestSriovPF(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Expecting link_mode to be switchdev when vdpa is enabled'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_vdpa_no_numvfs(self):
data = '{"type": "sriov_pf", "name": "p6p1", "numvfs": 0,' \
@ -2002,7 +2001,7 @@ class TestSriovPF(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Expecting to have at least 1 numvfs when vdpa is enabled'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_ethtool_opts(self):
data = '{"type": "sriov_pf", "name": "em1", "numvfs": 16, ' \
@ -2054,7 +2053,7 @@ class TestSriovVF(base.TestCase):
json.loads(data))
expected = 'SriovVF JSON objects require \'vfid\' to be configured ' \
'as %s' % (str(int))
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_no_vfid(self):
def test_get_vf_devname(device, vfid):
@ -2073,7 +2072,7 @@ class TestSriovVF(base.TestCase):
json.loads(data))
expected = 'SriovVF JSON objects require \'vfid\' to be configured ' \
'as %s' % (str(int))
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_vfid(self):
def test_get_vf_devname(device, vfid):
@ -2191,7 +2190,7 @@ class TestSriovVF(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Expecting state to match auto/enable/disable'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_vfid_invalid_qos(self):
def test_get_vf_devname(device, vfid):
@ -2212,7 +2211,7 @@ class TestSriovVF(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Vlan tag not set for QOS - VF: em4:16'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_from_json_vfid_nic1(self):
def test_get_vf_devname(device, vfid):
@ -2392,7 +2391,7 @@ class TestVppBond(base.TestCase):
objects.object_from_json,
json.loads(data))
expected = 'Members must be of type vpp_interface'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
class TestOvsRequiredObjects(base.TestCase):
@ -2424,7 +2423,7 @@ class TestOvsRequiredObjects(base.TestCase):
objects.OvsBond.from_json,
json.loads(data))
expected = 'OvsBond cannot be created as OpenvSwitch is not installed.'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_ovs_bridge(self):
data = """{
@ -2445,7 +2444,7 @@ class TestOvsRequiredObjects(base.TestCase):
json.loads(data))
expected = 'OvsBridge cannot be created as OpenvSwitch is not ' \
'installed.'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
def test_dpdk_port(self):
data = """{
@ -2462,7 +2461,7 @@ class TestOvsRequiredObjects(base.TestCase):
json.loads(data))
expected = 'OvsDpdkPort cannot be created as OpenvSwitch is not ' \
'installed.'
self.assertIn(expected, six.text_type(err))
self.assertIn(expected, str(err))
class TestLinuxTap(base.TestCase):

3
os_net_config/utils.py
View File

@ -18,7 +18,6 @@ import glob
import logging
import os
import re
import six
import time
import yaml
@ -547,7 +546,7 @@ def _set_vf_fields(vf_name, vlan_id, qos, spoofcheck, trust, state, macaddr,
def _clear_empty_values(vf_config):
for (key, val) in list(six.iteritems(vf_config)):
for (key, val) in list(vf_config.items()):
if val is None:
del vf_config[key]

1
requirements.txt
View File

@ -2,7 +2,6 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=2.0.0 # Apache-2.0
six>=1.9.0 # MIT
netaddr>=0.7.13 # BSD
oslo.concurrency>=3.8.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0