x/ranger
Code Issues Proposed changes

Merge "Update customer yaml builder"

Browse Source
This commit is contained in:
Zuul 2019-04-12 16:00:26 +00:00 committed by Gerrit Code Review
commit 512ecfda57
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
orm/services/resource_distributor/rds/services/yaml_customer_builder.py
View File

@ -129,6 +129,7 @@ def yamlbuilder(alldata, region):
resources['resources'][user['id']] = \ resources['resources'][user['id']] = \
{'type': 'OS::Keystone::UserRoleAssignment\n', {'type': 'OS::Keystone::UserRoleAssignment\n',
'properties': {'user': user['id'], 'properties': {'user': user['id'],
'user_domain': domain,
'roles': user_roles}} 'roles': user_roles}}
# create the output for users # create the output for users

4
orm/tests/unit/rds/services/test_customer_yaml.py
View File

@ -218,11 +218,11 @@ full_yaml_ldap = 'heat_template_version: 2015-1-2\n\ndescription: yaml file' \
'- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \ '- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: admin\n - project: ' \ 'role: admin\n - project: ' \
'{get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \ '{get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: other\n user: userId1\n ' \ 'role: other\n user_domain: default\n user: userId1\n ' \
'type: OS::Keystone::UserRoleAssignment\n\n \n ' \ 'type: OS::Keystone::UserRoleAssignment\n\n \n ' \
'userId2:\n properties:\n roles:\n ' \ 'userId2:\n properties:\n roles:\n ' \
'- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \ '- project: {get_resource: 1e24981a-fa51-11e5-86aa-5e5517507c66}\n ' \
'role: storage\n user: userId2\n ' \ 'role: storage\n user_domain: default\n user: userId2\n ' \
'type: OS::Keystone::UserRoleAssignment\n\n \n ' \ 'type: OS::Keystone::UserRoleAssignment\n\n \n ' \
'1e24981a-fa51-11e5-86aa-5e5517507c66:\n properties:\n ' \ '1e24981a-fa51-11e5-86aa-5e5517507c66:\n properties:\n ' \
'description: this is a description\n ' \ 'description: this is a description\n ' \