From 0b477ebe952a088c278482f2d30b843559266a37 Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Tue, 26 Mar 2019 13:55:08 -0400
Subject: Updates to support create API changes

Issue-ID: OPTFRA-458
Change-Id: Ia4dcb0e0282bfa35379c580ab2afa2f522f83e01
Signed-off-by: Jerry Flood <jflood@att.com>
---
 ...fOneChangeWindowEmptyScheduleName.json.template |  2 +-
 ...fOneChangeWindowIncorrectPolicyId.json.template |  2 +-
 ...fOneChangeWindowIncorrectWorkflow.json.template |  2 +-
 .../OneVnfImmediateEmptyScheduleName.json.template |  2 +-
 .../changemanagement/VidCallbackData.json.template | 66 ++++++++++------------
 5 files changed, 35 insertions(+), 39 deletions(-)

(limited to 'cmso-robot/robot/assets')

diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleName.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleName.json.template
index 29a0a6a..f93d82d 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleName.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleName.json.template
@@ -17,7 +17,7 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				],
 				"changeWindow" : [{
 						"startTime" : "${start_time1}",
diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectPolicyId.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectPolicyId.json.template
index c5bab19..01c59a4 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectPolicyId.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectPolicyId.json.template
@@ -17,7 +17,7 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				],
 				"changeWindow" : [{
 						"startTime" : "${start_time1}",
diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectWorkflow.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectWorkflow.json.template
index b7eedc5..989f774 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectWorkflow.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectWorkflow.json.template
@@ -17,7 +17,7 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				],
 				"changeWindow" : [{
 						"startTime" : "${start_time1}",
diff --git a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleName.json.template b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleName.json.template
index b5cf73e..a8ebe1e 100644
--- a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleName.json.template
+++ b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleName.json.template
@@ -15,7 +15,7 @@
 	
 		"vnfDetails" : [{
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/changemanagement/VidCallbackData.json.template b/cmso-robot/robot/assets/templates/changemanagement/VidCallbackData.json.template
index ed3be93..9abf9b9 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/VidCallbackData.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/VidCallbackData.json.template
@@ -1,40 +1,36 @@
 {
-	"requestType" : "Update",
-	"requestDetails" : [{
-			"vnfName" : "dummy-vnf",
-			"vnfInstanceId" : "dummy-vnfinstance-id",
-			"modelInfo" : {
-				"modelType" : "vnf",
-				"modelInvariantId" : "dummy-id",
-				"modelVersionId" : "dummy-id",
-				"modelName" : "dummy",
-				"modelCustomizationId" : "dummy-id"
-			},
-			"cloudConfiguration" : {
-				"lcpCloudRegionId" : "dummy",
-				"tenantId" : "dummy-id"
-			},
-			"requestInfo" : {
-				"source" : "VID",
-				"suppressRollback" : false,
-				"requestorId" : "az2016"
-			},
-			"relatedInstanceList" : [{
-					"relatedInstance" : {
-						"instanceId" : "dummy-id",
-						"modelInfo" : {
-							"modelType" : "service",
-							"modelInvariantId" : "dummy-id",
-							"modelVersionId" : "dummy-id",
-							"modelName" : "dummy-id",
-							"modelVersion" : "4.0"
-						}
-					}
+	"vnfName" : "${vnfName}",
+	"vnfInstanceId" : "dummy-vnfinstance-id",
+	"modelInfo" : {
+		"modelType" : "vnf",
+		"modelInvariantId" : "dummy-id",
+		"modelVersionId" : "dummy-id",
+		"modelName" : "dummy",
+		"modelCustomizationId" : "dummy-id"
+	},
+	"cloudConfiguration" : {
+		"lcpCloudRegionId" : "dummy",
+		"tenantId" : "dummy-id"
+	},
+	"requestInfo" : {
+		"source" : "VID",
+		"suppressRollback" : false,
+		"requestorId" : "az2016"
+	},
+	"relatedInstanceList" : [{
+			"relatedInstance" : {
+				"instanceId" : "dummy-id",
+				"modelInfo" : {
+					"modelType" : "service",
+					"modelInvariantId" : "dummy-id",
+					"modelVersionId" : "dummy-id",
+					"modelName" : "dummy-id",
+					"modelVersion" : "4.0"
 				}
-			],
-			"requestParameters" : {
-				"usePreload" : true
 			}
 		}
-	]
+	],
+	"requestParameters" : {
+		"usePreload" : true
+	}
 }
-- 
cgit 1.2.3-korg