Updates to support create API changes

Issue-ID: OPTFRA-458
Change-Id: Ia4dcb0e0282bfa35379c580ab2afa2f522f83e01
Signed-off-by: Jerry Flood <jflood@att.com>

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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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 (file)
--- 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}