Use DB field sizes instead of _MAX_LEN constants
Remove The following _MAX_LEN constants from neutron/api/v2/attributes.py and use the corresponding DB field size constants from neutron_lib.db.constants instead. NAME_MAX_LEN --> NAME_FIELD_SIZE TENANT_ID_MAX_LEN --> PROJECT_ID_FIELD_SIZE DESCRIPTION_MAX_LEN --> DESCRIPTION_FIELD_SIZE LONG_DESCRIPTION_MAX_LEN --> LONG_DESCRIPTION_FIELD_SIZE DEVICE_ID_MAX_LEN --> DEVICE_ID_FIELD_SIZE DEVICE_OWNER_MAX_LEN --> DEVICE_NAME_FIELD_SIZE In alembic migration scripts, the raw numerical value is used. For more information, see: http://lists.openstack.org/pipermail/openstack-dev/2016-October/105789.html NeutronLibImpact Change-Id: I734890372584fe27e5d6ec38c0cad2de882ff11c
This commit is contained in:
committed by
Armando Migliaccio
parent
07dfea9a02
commit
1c5bf09a03
@@ -15,12 +15,12 @@
|
||||
from neutron_lib.api import converters
|
||||
from neutron_lib.api import extensions as api_extensions
|
||||
from neutron_lib.api import validators
|
||||
from neutron_lib.db import constants as db_const
|
||||
from neutron_lib import exceptions as nexception
|
||||
from neutron_lib.plugins import directory
|
||||
|
||||
from neutron._i18n import _
|
||||
from neutron.api import extensions
|
||||
from neutron.api.v2 import attributes as attr
|
||||
from neutron.api.v2 import base
|
||||
from neutron.api.v2 import resource_helper
|
||||
from neutron.plugins.common import constants
|
||||
@@ -92,11 +92,11 @@ RESOURCE_ATTRIBUTE_MAP = {
|
||||
'is_visible': True,
|
||||
'primary_key': True},
|
||||
'name': {'allow_post': True, 'allow_put': True,
|
||||
'validate': {'type:string': attr.NAME_MAX_LEN},
|
||||
'validate': {'type:string': db_const.NAME_FIELD_SIZE},
|
||||
'is_visible': True, 'default': ''},
|
||||
'description': {'allow_post': True, 'allow_put': True,
|
||||
'validate': {'type:string_or_none':
|
||||
attr.LONG_DESCRIPTION_MAX_LEN},
|
||||
db_const.LONG_DESCRIPTION_FIELD_SIZE},
|
||||
'is_visible': True, 'default': ''},
|
||||
'service_type': {'allow_post': True, 'allow_put': False,
|
||||
'validate':
|
||||
@@ -104,7 +104,8 @@ RESOURCE_ATTRIBUTE_MAP = {
|
||||
'is_visible': True},
|
||||
'tenant_id': {'allow_post': True, 'allow_put': False,
|
||||
'required_by_policy': True,
|
||||
'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
|
||||
'validate': {
|
||||
'type:string': db_const.PROJECT_ID_FIELD_SIZE},
|
||||
'is_visible': True},
|
||||
'service_profiles': {'allow_post': True, 'allow_put': True,
|
||||
'validate': {'type:uuid_list': None},
|
||||
@@ -121,11 +122,11 @@ RESOURCE_ATTRIBUTE_MAP = {
|
||||
'primary_key': True},
|
||||
'description': {'allow_post': True, 'allow_put': True,
|
||||
'validate': {'type:string_or_none':
|
||||
attr.LONG_DESCRIPTION_MAX_LEN},
|
||||
db_const.LONG_DESCRIPTION_FIELD_SIZE},
|
||||
'is_visible': True, 'default': ''},
|
||||
'driver': {'allow_post': True, 'allow_put': True,
|
||||
'validate': {'type:string':
|
||||
attr.LONG_DESCRIPTION_MAX_LEN},
|
||||
db_const.LONG_DESCRIPTION_FIELD_SIZE},
|
||||
'is_visible': True,
|
||||
'default': ''},
|
||||
'metainfo': {'allow_post': True, 'allow_put': True,
|
||||
@@ -133,7 +134,8 @@ RESOURCE_ATTRIBUTE_MAP = {
|
||||
'default': ''},
|
||||
'tenant_id': {'allow_post': True, 'allow_put': False,
|
||||
'required_by_policy': True,
|
||||
'validate': {'type:string': attr.TENANT_ID_MAX_LEN},
|
||||
'validate': {
|
||||
'type:string': db_const.PROJECT_ID_FIELD_SIZE},
|
||||
'is_visible': True},
|
||||
'enabled': {'allow_post': True, 'allow_put': True,
|
||||
'convert_to': converters.convert_to_boolean_if_not_none,
|
||||
@@ -157,8 +159,9 @@ SUB_RESOURCE_ATTRIBUTE_MAP = {
|
||||
'is_visible': True},
|
||||
'tenant_id': {'allow_post': True, 'allow_put': False,
|
||||
'required_by_policy': True,
|
||||
'validate': {'type:string':
|
||||
attr.TENANT_ID_MAX_LEN},
|
||||
'validate': {
|
||||
'type:string':
|
||||
db_const.PROJECT_ID_FIELD_SIZE},
|
||||
'is_visible': True}}
|
||||
},
|
||||
'service_profiles': {
|
||||
@@ -169,8 +172,9 @@ SUB_RESOURCE_ATTRIBUTE_MAP = {
|
||||
'is_visible': True},
|
||||
'tenant_id': {'allow_post': True, 'allow_put': False,
|
||||
'required_by_policy': True,
|
||||
'validate': {'type:string':
|
||||
attr.TENANT_ID_MAX_LEN},
|
||||
'validate': {
|
||||
'type:string':
|
||||
db_const.PROJECT_ID_FIELD_SIZE},
|
||||
'is_visible': True}}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user