openstack/rally-openstack
Code Issues Proposed changes

Merge "Simplify jsonschema of existin@openstack plugin"

Browse Source
This commit is contained in:
Zuul 2018-12-01 06:26:54 +00:00 committed by Gerrit Code Review
commit c3d1f032c1
1 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
rally_openstack/platforms/existing.py
View File

@ -45,31 +45,26 @@ class OpenStack(platform.Platform):
"definitions": {
"user": {
"type": "object",
"oneOf": [
"properties": {
"username": {"type": "string"},
"password": {"type": "string"},
"project_name": {"type": "string"},
"tenant_name": {"type": "string"},
"domain_name": {"type": "string"},
"user_domain_name": {"type": "string"},
"project_domain_name": {"type": "string"},
},
"additionalProperties": False,
"anyOf": [
{
"description": "Keystone V2.0",
"properties": {
"username": {"type": "string"},
"password": {"type": "string"},
"tenant_name": {"type": "string"},
},
"required": ["username", "password", "tenant_name"],
"additionalProperties": False
"description": "Keystone V2.0 (old-style)",
"required": ["username", "password", "tenant_name"]
},
{
"description": "Keystone V3.0",
"properties": {
"username": {"type": "string"},
"password": {"type": "string"},
"project_name": {"type": "string"},
"domain_name": {"type": "string"},
"user_domain_name": {"type": "string"},
"project_domain_name": {"type": "string"},
},
"required": ["username", "password", "project_name"],
"additionalProperties": False
"description": "Keystone V3.0 (modern terms)",
"required": ["username", "password", "project_name"]
}
],
]
},
"api_info": {
"type": "object",