aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShankaranarayanan Puzhavakath Narayanan <snarayanan@research.att.com>2019-03-26 18:29:28 +0000
committerGerrit Code Review <gerrit@onap.org>2019-03-26 18:29:28 +0000
commite91151478fa2b4904de7cdd9b9a7b6eca8e1a374 (patch)
tree9cff8e0041f54b76a9337c4f1f13ab2848217d72
parentad57f63428e52a170398fdf70c8de3c20e0dd332 (diff)
parent0b477ebe952a088c278482f2d30b843559266a37 (diff)
Merge "Updates to support create API changes"
-rw-r--r--cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleName.json.template2
-rw-r--r--cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectPolicyId.json.template2
-rw-r--r--cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowIncorrectWorkflow.json.template2
-rw-r--r--cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleName.json.template2
-rw-r--r--cmso-robot/robot/assets/templates/changemanagement/VidCallbackData.json.template66
-rw-r--r--cmso-robot/robot/resources/scheduler_requests/create_schedule.robot18
6 files changed, 49 insertions, 43 deletions
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
+ }
}
diff --git a/cmso-robot/robot/resources/scheduler_requests/create_schedule.robot b/cmso-robot/robot/resources/scheduler_requests/create_schedule.robot
index 44443f8..978d443 100644
--- a/cmso-robot/robot/resources/scheduler_requests/create_schedule.robot
+++ b/cmso-robot/robot/resources/scheduler_requests/create_schedule.robot
@@ -22,9 +22,7 @@ Create Schedule
${testid}= Catenate ${uuid}
${testid}= Get Substring ${testid} -4
${dict}= Create Dictionary serviceInstanceId=${uuid} parent_service_model_name=${uuid}
- ${callbackData}= Fill JSON Template File ${VID_TEMPLATES}/VidCallbackData.json.template ${dict}
- ${callbackDataString}= Json Escape ${callbackData}
- ${map}= Create Dictionary uuid=${uuid} callbackUrl=${GLOBAL_CALLBACK_URL} callbackData=${callbackDataString} testid=${testid} workflow=${workflow} userId=${GLOBAL_CALLBACK_USERID}
+ ${map}= Create Dictionary uuid=${uuid} callbackUrl=${GLOBAL_CALLBACK_URL} testid=${testid} workflow=${workflow} userId=${GLOBAL_CALLBACK_USERID}
${nodelist}= Split String ${NODES} ,
${nn}= Catenate 1
# Support up to 4 ChangeWindows
@@ -36,10 +34,22 @@ Create Schedule
\ ${end_time}= Get Current Date UTC + ${tomorrow} minutes result_format=${UTC}
\ Set To Dictionary ${map} start_time${i}=${start_time} end_time${i}=${end_time}
+ ${requestList}= Create List
+
: For ${vnf} IN @{nodelist}
\ Set To Dictionary ${map} node${nn} ${vnf}
- \ ${nn}= Evaluate ${nn}+1
+ \ ${nn}= Evaluate ${nn}+1
+ \ Set To DIctionary ${dict} vnfName=${vnf}
+ \ ${requestInfo}= Fill JSON Template File ${VID_TEMPLATES}/VidCallbackData.json.template ${dict}
+ \ Append To List ${requestList} ${requestInfo}
+
+
+ ${callBackDataMap}= Create Dictionary requestType=Update requestDetails=${requestList}
+
+ ${callbackDataString}= Json Escape ${callbackDataMap}
+ Log ${callbackDataString}
+ Set To Dictionary ${map} callbackData=${callbackDataString}
${data}= Fill JSON Template File ${TEMPLATES}/${request_file} ${map}
${resp}= Post Change Management auth schedules/${uuid} data=${data}