From 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 Mon Sep 17 00:00:00 2001
From: asteroide <thomas.duval@orange.com>
Date: Tue, 1 Sep 2015 16:03:26 +0200
Subject: Update Keystone code from official Github repository with branch
 Master on 09/01/2015.

Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498
---
 .../keystone/contrib/federation/routers.py         | 50 ++++++++++++----------
 1 file changed, 28 insertions(+), 22 deletions(-)

(limited to 'keystone-moon/keystone/contrib/federation/routers.py')

diff --git a/keystone-moon/keystone/contrib/federation/routers.py b/keystone-moon/keystone/contrib/federation/routers.py
index 9a6224b7..d8fa8175 100644
--- a/keystone-moon/keystone/contrib/federation/routers.py
+++ b/keystone-moon/keystone/contrib/federation/routers.py
@@ -36,44 +36,45 @@ class FederationExtension(wsgi.V3ExtensionRouter):
 
     The API looks like::
 
-        PUT /OS-FEDERATION/identity_providers/$identity_provider
+        PUT /OS-FEDERATION/identity_providers/{idp_id}
         GET /OS-FEDERATION/identity_providers
-        GET /OS-FEDERATION/identity_providers/$identity_provider
-        DELETE /OS-FEDERATION/identity_providers/$identity_provider
-        PATCH /OS-FEDERATION/identity_providers/$identity_provider
+        GET /OS-FEDERATION/identity_providers/{idp_id}
+        DELETE /OS-FEDERATION/identity_providers/{idp_id}
+        PATCH /OS-FEDERATION/identity_providers/{idp_id}
 
         PUT /OS-FEDERATION/identity_providers/
-            $identity_provider/protocols/$protocol
+            {idp_id}/protocols/{protocol_id}
         GET /OS-FEDERATION/identity_providers/
-            $identity_provider/protocols
+            {idp_id}/protocols
         GET /OS-FEDERATION/identity_providers/
-            $identity_provider/protocols/$protocol
+            {idp_id}/protocols/{protocol_id}
         PATCH /OS-FEDERATION/identity_providers/
-            $identity_provider/protocols/$protocol
+            {idp_id}/protocols/{protocol_id}
         DELETE /OS-FEDERATION/identity_providers/
-            $identity_provider/protocols/$protocol
+            {idp_id}/protocols/{protocol_id}
 
         PUT /OS-FEDERATION/mappings
         GET /OS-FEDERATION/mappings
-        PATCH /OS-FEDERATION/mappings/$mapping_id
-        GET /OS-FEDERATION/mappings/$mapping_id
-        DELETE /OS-FEDERATION/mappings/$mapping_id
+        PATCH /OS-FEDERATION/mappings/{mapping_id}
+        GET /OS-FEDERATION/mappings/{mapping_id}
+        DELETE /OS-FEDERATION/mappings/{mapping_id}
 
         GET /OS-FEDERATION/projects
         GET /OS-FEDERATION/domains
 
-        PUT /OS-FEDERATION/service_providers/$service_provider
+        PUT /OS-FEDERATION/service_providers/{sp_id}
         GET /OS-FEDERATION/service_providers
-        GET /OS-FEDERATION/service_providers/$service_provider
-        DELETE /OS-FEDERATION/service_providers/$service_provider
-        PATCH /OS-FEDERATION/service_providers/$service_provider
+        GET /OS-FEDERATION/service_providers/{sp_id}
+        DELETE /OS-FEDERATION/service_providers/{sp_id}
+        PATCH /OS-FEDERATION/service_providers/{sp_id}
 
-        GET /OS-FEDERATION/identity_providers/$identity_provider/
-            protocols/$protocol/auth
-        POST /OS-FEDERATION/identity_providers/$identity_provider/
-            protocols/$protocol/auth
+        GET /OS-FEDERATION/identity_providers/{identity_provider}/
+            protocols/{protocol}/auth
+        POST /OS-FEDERATION/identity_providers/{identity_provider}/
+            protocols/{protocol}/auth
 
         POST /auth/OS-FEDERATION/saml2
+        POST /auth/OS-FEDERATION/saml2/ecp
         GET /OS-FEDERATION/saml2/metadata
 
         GET /auth/OS-FEDERATION/websso/{protocol_id}
@@ -191,6 +192,8 @@ class FederationExtension(wsgi.V3ExtensionRouter):
             path=self._construct_url('projects'),
             get_action='list_projects_for_groups',
             rel=build_resource_relation(resource_name='projects'))
+
+        # Auth operations
         self._add_resource(
             mapper, auth_controller,
             path=self._construct_url('identity_providers/{identity_provider}/'
@@ -202,13 +205,16 @@ class FederationExtension(wsgi.V3ExtensionRouter):
                 'identity_provider': IDP_ID_PARAMETER_RELATION,
                 'protocol': PROTOCOL_ID_PARAMETER_RELATION,
             })
-
-        # Auth operations
         self._add_resource(
             mapper, auth_controller,
             path='/auth' + self._construct_url('saml2'),
             post_action='create_saml_assertion',
             rel=build_resource_relation(resource_name='saml2'))
+        self._add_resource(
+            mapper, auth_controller,
+            path='/auth' + self._construct_url('saml2/ecp'),
+            post_action='create_ecp_assertion',
+            rel=build_resource_relation(resource_name='ecp'))
         self._add_resource(
             mapper, auth_controller,
             path='/auth' + self._construct_url('websso/{protocol_id}'),
-- 
cgit 1.2.3-korg