Merge "Use is_uuid_like in quantum.extensions.securitygroup.py"

This commit is contained in:
Jenkins 2012-11-06 08:05:11 +00:00 committed by Gerrit Code Review
commit aace56f2ab

View File

@ -158,7 +158,7 @@ attr.validators['type:external_id_and_mode'] = _validate_external_id_and_mode
RESOURCE_ATTRIBUTE_MAP = { RESOURCE_ATTRIBUTE_MAP = {
'security_groups': { 'security_groups': {
'id': {'allow_post': False, 'allow_put': False, 'id': {'allow_post': False, 'allow_put': False,
'validate': {'type:regex': attr.UUID_PATTERN}, 'validate': {'type:uuid': None},
'is_visible': True}, 'is_visible': True},
'name': {'allow_post': True, 'allow_put': False, 'name': {'allow_post': True, 'allow_put': False,
'is_visible': True, 'default': '', 'is_visible': True, 'default': '',
@ -174,7 +174,7 @@ RESOURCE_ATTRIBUTE_MAP = {
}, },
'security_group_rules': { 'security_group_rules': {
'id': {'allow_post': False, 'allow_put': False, 'id': {'allow_post': False, 'allow_put': False,
'validate': {'type:regex': attr.UUID_PATTERN}, 'validate': {'type:uuid': None},
'is_visible': True}, 'is_visible': True},
# external_id can be used to be backwards compatible with nova # external_id can be used to be backwards compatible with nova
'external_id': {'allow_post': True, 'allow_put': False, 'external_id': {'allow_post': True, 'allow_put': False,