openstack
/
magnum
Code Issues Proposed changes

Merge "Use oslo.i18n in magnum/api/controllers/v1/service.py"

This commit is contained in:
Jenkins 2016-01-17 06:05:33 +00:00 committed by Gerrit Code Review
parent 44a5a41d6f 471469e95a
commit 9211f85ff0
4 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
magnum/api/controllers/v1/pod.py
View File

@ -27,6 +27,7 @@ from magnum.api import validation
from magnum.common import exception
from magnum.common import k8s_manifest
from magnum.common import policy
from magnum.i18n import _
from magnum import objects
@ -126,7 +127,7 @@ class Pod(v1_base.K8sResourceBase):
self.name = manifest["metadata"]["name"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field metadata['name'] can't be empty in manifest.")
_("Field metadata['name'] can't be empty in manifest."))
images = []
try:
for container in manifest["spec"]["containers"]:
@ -134,7 +135,7 @@ class Pod(v1_base.K8sResourceBase):
self.images = images
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['containers'] can't be empty in manifest.")
_("Field spec['containers'] can't be empty in manifest."))
if "labels" in manifest["metadata"]:
self.labels = manifest["metadata"]["labels"]

13
magnum/api/controllers/v1/replicationcontroller.py
View File

@ -28,6 +28,7 @@ from magnum.api import validation
from magnum.common import exception
from magnum.common import k8s_manifest
from magnum.common import policy
from magnum.i18n import _
from magnum import objects
@ -142,7 +143,7 @@ class ReplicationController(v1_base.K8sResourceBase):
self.name = manifest["metadata"]["name"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field metadata['name'] can't be empty in manifest.")
_("Field metadata['name'] can't be empty in manifest."))
try:
self.replicas = manifest["spec"]["replicas"]
except (KeyError, TypeError):
@ -151,22 +152,22 @@ class ReplicationController(v1_base.K8sResourceBase):
self.selector = manifest["spec"]["selector"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['selector'] can't be empty in manifest.")
_("Field spec['selector'] can't be empty in manifest."))
try:
self.labels = manifest["spec"]["template"]["metadata"]["labels"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
raise exception.InvalidParameterValue(_(
"Field spec['template']['metadata']['labels'] "
"can't be empty in manifest.")
"can't be empty in manifest."))
try:
images = []
for cont in manifest["spec"]["template"]["spec"]["containers"]:
images.append(cont["image"])
self.images = images
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
raise exception.InvalidParameterValue(_(
"Field spec['template']['spec']['containers'] "
"can't be empty in manifest.")
"can't be empty in manifest."))
class ReplicationControllerCollection(collection.Collection):

5
magnum/api/controllers/v1/service.py
View File

@ -26,6 +26,7 @@ from magnum.api import validation
from magnum.common import exception
from magnum.common import k8s_manifest
from magnum.common import policy
from magnum.i18n import _
from magnum import objects
@ -129,12 +130,12 @@ class Service(v1_base.K8sResourceBase):
self.name = manifest["metadata"]["name"]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field metadata['name'] can't be empty in manifest.")
_("Field metadata['name'] can't be empty in manifest."))
try:
self.ports = manifest["spec"]["ports"][:]
except (KeyError, TypeError):
raise exception.InvalidParameterValue(
"Field spec['ports'] can't be empty in manifest.")
_("Field spec['ports'] can't be empty in manifest."))
if "selector" in manifest["spec"]:
self.selector = manifest["spec"]["selector"]

45
magnum/api/validation.py
View File

@ -20,37 +20,38 @@ import pecan
from magnum.api import utils as api_utils
from magnum.common import exception
from magnum.common import utils
from magnum.i18n import _
from magnum import objects
baymodel_opts = [
cfg.ListOpt('kubernetes_allowed_network_drivers',
default=['all'],
help="Allowed network drivers for kubernetes baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for kubernetes baymodels. Supported network drivers "
"include flannel."),
help=_("Allowed network drivers for kubernetes baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for kubernetes baymodels. Supported network drivers "
"include flannel.")),
cfg.StrOpt('kubernetes_default_network_driver',
default='flannel',
help="Default network driver for kubernetes baymodels."),
help=_("Default network driver for kubernetes baymodels.")),
cfg.ListOpt('swarm_allowed_network_drivers',
default=['all'],
help="Allowed network drivers for docker swarm baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for swarm baymodels. Supported network drivers "
"include docker and flannel."),
help=_("Allowed network drivers for docker swarm baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for swarm baymodels. Supported network drivers "
"include docker and flannel.")),
cfg.StrOpt('swarm_default_network_driver',
default='docker',
help="Default network driver for docker swarm baymodels."),
help=_("Default network driver for docker swarm baymodels.")),
cfg.ListOpt('mesos_allowed_network_drivers',
default=['all'],
help="Allowed network drivers for mesos baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for mesos baymodels. Supported network drivers "
"include docker."),
help=_("Allowed network drivers for mesos baymodels. "
"Use 'all' keyword to allow all drivers supported "
"for mesos baymodels. Supported network drivers "
"include docker.")),
cfg.StrOpt('mesos_default_network_driver',
default='docker',
help="Default network driver for mesos baymodels."),
help=_("Default network driver for mesos baymodels.")),
]
cfg.CONF.register_opts(baymodel_opts, group='baymodel')
@ -73,9 +74,9 @@ def enforce_bay_types(*bay_types):
bay = objects.Bay.get_by_name(pecan.request.context, bay_ident)
if bay.baymodel.coe not in bay_types:
raise exception.InvalidParameterValue(
raise exception.InvalidParameterValue(_(
'Cannot fulfill request with a %(bay_type)s bay, '
'expecting a %(supported_bay_types)s bay.' %
'expecting a %(supported_bay_types)s bay.') %
{'bay_type': bay.baymodel.coe,
'supported_bay_types': '/'.join(bay_types)})
@ -128,7 +129,7 @@ class Validator(object):
return cls.validators[coe]
else:
raise exception.InvalidParameterValue(
'Requested COE type %s is not supported.' % coe)
_('Requested COE type %s is not supported.') % coe)
@classmethod
def validate_network_driver(cls, driver):
@ -139,9 +140,9 @@ class Validator(object):
def _validate_network_driver_supported(cls, driver):
"""Confirm that driver is supported by Magnum for this COE."""
if driver not in cls.supported_drivers:
raise exception.InvalidParameterValue(
raise exception.InvalidParameterValue(_(
'Network driver type %(driver)s is not supported, '
'expecting a %(supported_drivers)s network driver.' % {
'expecting a %(supported_drivers)s network driver.') % {
'driver': driver,
'supported_drivers': '/'.join(
cls.supported_drivers + ['unspecified'])})
@ -151,9 +152,9 @@ class Validator(object):
"""Confirm that driver is allowed via configuration for this COE."""
if ('all' not in cls.allowed_drivers and
driver not in cls.allowed_drivers):
raise exception.InvalidParameterValue(
raise exception.InvalidParameterValue(_(
'Network driver type %(driver)s is not allowed, '
'expecting a %(allowed_drivers)s network driver. ' % {
'expecting a %(allowed_drivers)s network driver. ') % {
'driver': driver,
'allowed_drivers': '/'.join(
cls.allowed_drivers + ['unspecified'])})