summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-10-20 00:51:25 +0000
committerGerrit Code Review <review@openstack.org>2014-10-20 00:51:25 +0000
commit85194d72a0d15b11e807d4f43703d700fe6ab187 (patch)
tree1b2c7ebaf446911b84432d4490a4ca2a756cc2d7
parent88cc4b6b91c3481040cb30c5e26fc911e4a52c88 (diff)
parentd5ec4f725030538d44ecf914e48e12e1ee7bfa78 (diff)
downloadpython-keystoneclient-85194d72a0d15b11e807d4f43703d700fe6ab187.tar.gz
Merge "Fix mappings.Mapping docstring"
-rw-r--r--keystoneclient/v3/contrib/federation/mappings.py107
1 files changed, 49 insertions, 58 deletions
diff --git a/keystoneclient/v3/contrib/federation/mappings.py b/keystoneclient/v3/contrib/federation/mappings.py
index d0c033f..1cdb879 100644
--- a/keystoneclient/v3/contrib/federation/mappings.py
+++ b/keystoneclient/v3/contrib/federation/mappings.py
@@ -48,35 +48,30 @@ class MappingManager(base.CrudManager):
:param mapping_id: user defined string identifier of the federation
mapping.
- :param rules: a JSON dictionary with list a list
- of mapping rules.
-
- Example of the ``rules``::
-
- {
- "mapping": {
- "rules": [
- {
- "local": [
- {
- "group": {
- "id": "0cd5e9"
- }
- }
- ],
- "remote": [
- {
- "type": "orgPersonType",
- "not_any_of": [
- "Contractor",
- "Guest"
- ]
- }
- ]
- }
- ]
- }
- }
+ :param rules: a list of mapping rules.
+
+ Example of the ``rules`` parameter::
+
+ [
+ {
+ "local": [
+ {
+ "group": {
+ "id": "0cd5e9"
+ }
+ }
+ ],
+ "remote": [
+ {
+ "type": "orgPersonType",
+ "not_any_of": [
+ "Contractor",
+ "Guest"
+ ]
+ }
+ ]
+ }
+ ]
"""
return self._build_url_and_put(
@@ -112,35 +107,31 @@ class MappingManager(base.CrudManager):
:param mapping: a Mapping type object with mapping id
stored inside.
- :param rules: a JSON dictionary with list a list
- of mapping rules.
-
- Example of the ``rules``::
-
- {
- "mapping": {
- "rules": [
- {
- "local": [
- {
- "group": {
- "id": "0cd5e9"
- }
- }
- ],
- "remote": [
- {
- "type": "orgPersonType",
- "not_any_of": [
- "Contractor",
- "Guest"
- ]
- }
- ]
- }
- ]
- }
- }
+ :param rules: a list of mapping rules.
+
+ Example of the ``rules`` parameter::
+
+
+ [
+ {
+ "local": [
+ {
+ "group": {
+ "id": "0cd5e9"
+ }
+ }
+ ],
+ "remote": [
+ {
+ "type": "orgPersonType",
+ "not_any_of": [
+ "Contractor",
+ "Guest"
+ ]
+ }
+ ]
+ }
+ ]
"""
return super(MappingManager, self).update(