openstack
/
kuryr
Code Issues Proposed changes

Make segmentation driver testable 

This allows import vlan segmentation driver for unit testing

Change-Id: Ic69b1481d5815b900608a8ad99a99b686724246c
This commit is contained in:
Luis Tomas Bolivar 2017-01-31 12:20:02 +00:00
parent 6a12fc5547
commit 2ddf65f2b4
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
kuryr/lib/segmentation_type_drivers/__init__.py
View File

@ -16,17 +16,25 @@ from kuryr.lib import exceptions as ex
BASE_PATH = 'kuryr.lib.segmentation_type_drivers'
driver_name = cfg.CONF.binding.driver.rsplit('.', 1)[1]
_driver = ""
# REVISIT(vikasc): Need to remove this if check
if driver_name == 'vlan':
seg_driver_path = '.'.join([BASE_PATH, driver_name])
segmentation_driver = importutils.import_module(seg_driver_path)
driver = segmentation_driver.SegmentationDriver()
def _get_driver():
global _driver
if not _driver:
driver_name = cfg.CONF.binding.driver.rsplit('.', 1)[1]
# REVISIT(vikasc): Need to remove this if check
if driver_name == 'vlan':
seg_driver_path = '.'.join([BASE_PATH, driver_name])
segmentation_driver = importutils.import_module(seg_driver_path)
_driver = segmentation_driver.SegmentationDriver()
return _driver
def allocate_segmentation_id(allocated_ids=set()):
"""Allocates a segmentation ID."""
driver = _get_driver()
try:
id = driver.allocate_segmentation_id(allocated_ids)
except NameError:
@ -36,6 +44,7 @@ def allocate_segmentation_id(allocated_ids=set()):
def release_segmentation_id(id):
"""Releases the segmentation ID."""
driver = _get_driver()
try:
driver.release_segmentation_id(id)
except NameError: