Update Keystone code from official Github repository with branch Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498

2 files changed, 42 insertions, 1 deletions

diff --git a/keystone-moon/keystone/common/validation/__init__.py b/keystone-moon/keystone/common/validation/__init__.py
index f9c58eaf..1e5cc6a5 100644
--- a/keystone-moon/keystone/common/validation/__init__.py
+++ b/keystone-moon/keystone/common/validation/__init__.py
@@ -12,8 +12,11 @@
 """Request body validating middleware for OpenStack Identity resources."""
 
 import functools
+import inspect
 
 from keystone.common.validation import validators
+from keystone import exception
+from keystone.i18n import _
 
 
 def validated(request_body_schema, resource_to_validate):
@@ -24,15 +27,47 @@ def validated(request_body_schema, resource_to_validate):
 
     :param request_body_schema: a schema to validate the resource reference
     :param resource_to_validate: the reference to validate
+    :raises keystone.exception.ValidationError: if `resource_to_validate` is
+            not passed by or passed with an empty value (see wrapper method
+            below).
+    :raises TypeError: at decoration time when the expected resource to
+                       validate isn't found in the decorated method's
+                       signature
 
     """
     schema_validator = validators.SchemaValidator(request_body_schema)
 
     def add_validator(func):
+        argspec = inspect.getargspec(func)
+        try:
+            arg_index = argspec.args.index(resource_to_validate)
+        except ValueError:
+            raise TypeError(_('validated expected to find %(param_name)r in '
+                              'function signature for %(func_name)r.') %
+                            {'param_name': resource_to_validate,
+                             'func_name': func.__name__})
+
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
-            if resource_to_validate in kwargs:
+            if kwargs.get(resource_to_validate):
                 schema_validator.validate(kwargs[resource_to_validate])
+            else:
+                try:
+                    resource = args[arg_index]
+                    # If resource to be validated is empty, no need to do
+                    # validation since the message given by jsonschema doesn't
+                    # help in this case.
+                    if resource:
+                        schema_validator.validate(resource)
+                    else:
+                        raise exception.ValidationError(
+                            attribute=resource_to_validate,
+                            target='request body')
+                # We cannot find the resource neither from kwargs nor args.
+                except IndexError:
+                    raise exception.ValidationError(
+                        attribute=resource_to_validate,
+                        target='request body')
             return func(*args, **kwargs)
         return wrapper
     return add_validator
diff --git a/keystone-moon/keystone/common/validation/parameter_types.py b/keystone-moon/keystone/common/validation/parameter_types.py
index c5908836..1bc81383 100644
--- a/keystone-moon/keystone/common/validation/parameter_types.py
+++ b/keystone-moon/keystone/common/validation/parameter_types.py
@@ -28,6 +28,12 @@ name = {
     'maxLength': 255
 }
 
+external_id_string = {
+    'type': 'string',
+    'minLength': 1,
+    'maxLength': 64
+}
+
 id_string = {
     'type': 'string',
     'minLength': 1,