From ceacbbbc139ea848c14a7896d2a895810cadfa00 Mon Sep 17 00:00:00 2001
From: Ah <Ashwini.Ah@arris.com>
Date: Thu, 4 Oct 2018 12:08:25 +0530
Subject: Programmatically determining keystone api version

Issue-ID: TEST-39
Change-Id: Iae3c27af601a82d5e15744c682741841f76e839e
Signed-off-by: Ah <Ashwini.Ah@arris.com>
---
 robot/assets/templates/keystone_get_auth.template  |  9 --------
 .../assets/templates/keystone_get_v2_auth.template | 10 +++++++++
 .../assets/templates/keystone_get_v3_auth.template | 26 ++++++++++++++++++++++
 3 files changed, 36 insertions(+), 9 deletions(-)
 delete mode 100644 robot/assets/templates/keystone_get_auth.template
 create mode 100644 robot/assets/templates/keystone_get_v2_auth.template
 create mode 100644 robot/assets/templates/keystone_get_v3_auth.template

diff --git a/robot/assets/templates/keystone_get_auth.template b/robot/assets/templates/keystone_get_auth.template
deleted file mode 100644
index c3fa82f6..00000000
--- a/robot/assets/templates/keystone_get_auth.template
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "auth": {
-    "tenantId" : "${tenantId}",
-    "passwordCredentials": {
-      "username": "${username}",
-      "password": "${password}"
-    }
-  }
-}
diff --git a/robot/assets/templates/keystone_get_v2_auth.template b/robot/assets/templates/keystone_get_v2_auth.template
new file mode 100644
index 00000000..97182b02
--- /dev/null
+++ b/robot/assets/templates/keystone_get_v2_auth.template
@@ -0,0 +1,10 @@
+{
+  "auth": {
+    "tenantId" : "${tenantId}",
+    "passwordCredentials": {
+      "username": "${username}",
+      "password": "${password}"
+    }
+  }
+}
+
diff --git a/robot/assets/templates/keystone_get_v3_auth.template b/robot/assets/templates/keystone_get_v3_auth.template
new file mode 100644
index 00000000..49623367
--- /dev/null
+++ b/robot/assets/templates/keystone_get_v3_auth.template
@@ -0,0 +1,26 @@
+{
+    "auth": {
+        "identity": {
+            "methods": [
+                "password"
+            ],
+            "password": {
+                "user": {
+                    "name": "${username}",
+                    "domain": {
+                        "id": "${domain_id}"
+                    },
+                    "password": "${password}"
+                }
+            }
+        
+    },
+    "scope": {
+      "project": {
+        "name": "${project_name}",
+        "domain": { "id": "${domain_id}" }
+      }
+    }
+  }
+}
+
-- 
cgit 1.2.3-korg