openstack
/
magnum
Code Issues Proposed changes

Merge "Rename network driver name in Validator class"

This commit is contained in:
Jenkins 2016-02-24 23:00:41 +00:00 committed by Gerrit Code Review
parent 7c349eafc6 f58431d67d
commit 55007d2803
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
magnum/api/validation.py
View File

@ -119,7 +119,7 @@ def enforce_network_driver_types_update():
def _enforce_network_driver_types(baymodel):
validator = Validator.get_coe_validator(baymodel.coe)
if not baymodel.network_driver:
baymodel.network_driver = validator.default_driver
baymodel.network_driver = validator.default_network_driver
validator.validate_network_driver(baymodel.network_driver)
@ -192,25 +192,25 @@ class Validator(object):
@classmethod
def _validate_network_driver_supported(cls, driver):
"""Confirm that driver is supported by Magnum for this COE."""
if driver not in cls.supported_drivers:
if driver not in cls.supported_network_drivers:
raise exception.InvalidParameterValue(_(
'Network driver type %(driver)s is not supported, '
'expecting a %(supported_drivers)s network driver.') % {
'driver': driver,
'supported_drivers': '/'.join(
cls.supported_drivers + ['unspecified'])})
cls.supported_network_drivers + ['unspecified'])})
@classmethod
def _validate_network_driver_allowed(cls, driver):
"""Confirm that driver is allowed via configuration for this COE."""
if ('all' not in cls.allowed_drivers and
driver not in cls.allowed_drivers):
if ('all' not in cls.allowed_network_drivers and
driver not in cls.allowed_network_drivers):
raise exception.InvalidParameterValue(_(
'Network driver type %(driver)s is not allowed, '
'expecting a %(allowed_drivers)s network driver. ') % {
'driver': driver,
'allowed_drivers': '/'.join(
cls.allowed_drivers + ['unspecified'])})
cls.allowed_network_drivers + ['unspecified'])})
@classmethod
def validate_volume_driver(cls, driver):
@ -230,23 +230,28 @@ class Validator(object):
class K8sValidator(Validator):
supported_drivers = ['flannel']
allowed_drivers = cfg.CONF.baymodel.kubernetes_allowed_network_drivers
default_driver = cfg.CONF.baymodel.kubernetes_default_network_driver
supported_network_drivers = ['flannel']
allowed_network_drivers = (
cfg.CONF.baymodel.kubernetes_allowed_network_drivers)
default_network_driver = (
cfg.CONF.baymodel.kubernetes_default_network_driver)
supported_volume_driver = ['cinder']
class SwarmValidator(Validator):
supported_drivers = ['docker', 'flannel']
allowed_drivers = cfg.CONF.baymodel.swarm_allowed_network_drivers
default_driver = cfg.CONF.baymodel.swarm_default_network_driver
supported_network_drivers = ['docker', 'flannel']
allowed_network_drivers = cfg.CONF.baymodel.swarm_allowed_network_drivers
default_network_driver = cfg.CONF.baymodel.swarm_default_network_driver
supported_volume_driver = ['rexray']
class MesosValidator(Validator):
supported_drivers = ['docker']
allowed_drivers = cfg.CONF.baymodel.mesos_allowed_network_drivers
default_driver = cfg.CONF.baymodel.mesos_default_network_driver
supported_network_drivers = ['docker']
allowed_network_drivers = cfg.CONF.baymodel.mesos_allowed_network_drivers
default_network_driver = cfg.CONF.baymodel.mesos_default_network_driver
supported_volume_driver = ['rexray']

6
magnum/tests/unit/api/test_validation.py
View File

@ -191,7 +191,7 @@ class TestValidation(base.BaseTestCase):
# re-evaluated.
reload_module(v)
validator = v.K8sValidator
validator.supported_drivers = ['flannel', 'type1', 'type2']
validator.supported_network_drivers = ['flannel', 'type1', 'type2']
if assert_raised:
self.assertRaises(exception.InvalidParameterValue,
@ -283,7 +283,7 @@ class TestValidation(base.BaseTestCase):
# re-evaluated.
reload(v)
validator = v.K8sValidator
validator.supported_drivers = ['flannel', 'type1', 'type2']
validator.supported_network_drivers = ['flannel', 'type1', 'type2']
if assert_raised:
self.assertRaises(exception.InvalidParameterValue,
@ -375,7 +375,7 @@ class TestValidation(base.BaseTestCase):
# re-evaluated.
reload(v)
validator = v.K8sValidator
validator.supported_drivers = ['cinder']
validator.supported_volume_driver = ['cinder']
if assert_raised:
self.assertRaises(exception.InvalidParameterValue,