From ab58a3215c13909c108e31f57bf592149c76cfd8 Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Tue, 6 Nov 2018 12:47:40 +0200
Subject: [PATCH] Simplify jsonschema of existin@openstack plugin

Change-Id: Ie554342a0fa0d8cce815937144f6c2dc52d0a44d
---
 rally_openstack/platforms/existing.py | 37 ++++++++++++---------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/rally_openstack/platforms/existing.py b/rally_openstack/platforms/existing.py
index c8e72148..37f9807c 100644
--- a/rally_openstack/platforms/existing.py
+++ b/rally_openstack/platforms/existing.py
@@ -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",