openstack
/
kuryr
Code Issues Proposed changes

Remove six 

Change-Id: I9f6f057fde95f378071c25dba7f27ed3f3a4c27b
This commit is contained in:
xuanyandong 2020-09-30 08:41:19 +08:00
parent d9f4b79160
commit e1edbc4661
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kuryr/lib/segmentation_type_drivers/vlan.py
View File

@ -11,8 +11,6 @@
# under the License. # under the License.
import random import random
from six import moves
from kuryr.lib import constants as const from kuryr.lib import constants as const
from kuryr.lib import exceptions from kuryr.lib import exceptions
@ -21,8 +19,8 @@ DEFAULT_MAX_RETRY_COUNT = 3
class SegmentationDriver(object): class SegmentationDriver(object):
def __init__(self): def __init__(self):
self.available_local_vlans = set(moves.range(const.MIN_VLAN_TAG, self.available_local_vlans = set(range(const.MIN_VLAN_TAG,
const.MAX_VLAN_TAG + 1)) const.MAX_VLAN_TAG + 1))
def allocate_segmentation_id(self, allocated_ids=set()): def allocate_segmentation_id(self, allocated_ids=set()):
self.available_local_vlans.difference_update(allocated_ids) self.available_local_vlans.difference_update(allocated_ids)

13
kuryr/tests/unit/segmentation_type_drivers/test_vlan.py
View File

@ -15,7 +15,6 @@
from unittest import mock from unittest import mock
from oslo_config import cfg from oslo_config import cfg
from six import moves
from kuryr.lib import constants as const from kuryr.lib import constants as const
from kuryr.lib import exceptions from kuryr.lib import exceptions
@ -42,8 +41,8 @@ class VlanSegmentationDriverTest(base.TestCase):
def test_allocate_segmentation_id_only_1_available(self): def test_allocate_segmentation_id_only_1_available(self):
vlan_seg_driver = vlan.SegmentationDriver() vlan_seg_driver = vlan.SegmentationDriver()
allocated_ids = set(moves.range(const.MIN_VLAN_TAG, allocated_ids = set(range(const.MIN_VLAN_TAG,
const.MAX_VLAN_TAG + 1)) const.MAX_VLAN_TAG + 1))
allocated_ids.remove(const.MAX_VLAN_TAG) allocated_ids.remove(const.MAX_VLAN_TAG)
vlan_id = vlan_seg_driver.allocate_segmentation_id(allocated_ids) vlan_id = vlan_seg_driver.allocate_segmentation_id(allocated_ids)
@ -59,8 +58,8 @@ class VlanSegmentationDriverTest(base.TestCase):
def test_allocate_segmentation_id_no_available_vlans(self): def test_allocate_segmentation_id_no_available_vlans(self):
vlan_seg_driver = vlan.SegmentationDriver() vlan_seg_driver = vlan.SegmentationDriver()
allocated_ids = set(moves.range(const.MIN_VLAN_TAG, allocated_ids = set(range(const.MIN_VLAN_TAG,
const.MAX_VLAN_TAG + 1)) const.MAX_VLAN_TAG + 1))
self.assertRaises(exceptions.SegmentationIdAllocationFailure, self.assertRaises(exceptions.SegmentationIdAllocationFailure,
vlan_seg_driver.allocate_segmentation_id, vlan_seg_driver.allocate_segmentation_id,
@ -80,7 +79,7 @@ class VlanSegmentationDriverTest(base.TestCase):
@mock.patch('random.choice') @mock.patch('random.choice')
def test_allocate_segmentation_id_2_retries(self, mock_choice): def test_allocate_segmentation_id_2_retries(self, mock_choice):
vlan_seg_driver = vlan.SegmentationDriver() vlan_seg_driver = vlan.SegmentationDriver()
vlan_seg_driver.available_local_vlans = set(moves.range(1, 10)) vlan_seg_driver.available_local_vlans = set(range(1, 10))
allocated_ids = set([1, 2, 3]) allocated_ids = set([1, 2, 3])
mock_choice.side_effect = [1, 1, 5] mock_choice.side_effect = [1, 1, 5]
@ -91,7 +90,7 @@ class VlanSegmentationDriverTest(base.TestCase):
def test_release_segmentation_id(self): def test_release_segmentation_id(self):
vlan_seg_driver = vlan.SegmentationDriver() vlan_seg_driver = vlan.SegmentationDriver()
vlan_seg_driver.available_local_vlans = set(moves.range(1, 10)) vlan_seg_driver.available_local_vlans = set(range(1, 10))
vlan_id = 20 vlan_id = 20
vlan_seg_driver.release_segmentation_id(vlan_id) vlan_seg_driver.release_segmentation_id(vlan_id)