Merge "Robot changes to support API changes"

20 files changed, 37 insertions, 36 deletions

diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template
index d806855..764e59e 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyDomain.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/OneVnfOneChangeWindowEmptyScheduleID.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template
index a8315f6..2dc071a 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyScheduleID.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/OneVnfOneChangeWindowEmptyUserID.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template
index e239d7d..ea3740c 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowEmptyUserID.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/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template
index 8cd0703..40a72fb 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNegativeNormalDurationInSeconds.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/OneVnfOneChangeWindowNoEndTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template
index 2973c89..e2e0c4a 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoEndTime.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/OneVnfOneChangeWindowNoStartTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template
index e97c46e..bdc541d 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowNoStartTime.json.template
@@ -17,7 +17,7 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				],
 				"changeWindow" : [{
 						"startTime" : "",
diff --git a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template
index 1c2c3ce..e4b88e9 100644
--- a/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template
+++ b/cmso-robot/robot/assets/templates/FailureCasesChangeManagement/OneVnfOneChangeWindowSwitchedTime.json.template
@@ -17,7 +17,7 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				],
 				"changeWindow" : [{
 						"startTime" : "${end_time1}",
diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template
index 5c9e0a3..db65877 100644
--- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template
+++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyAdditionalDuration.json.template
@@ -13,9 +13,9 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"VNFName1${testid}",
-					"VNFName2${testid}",
-					"VNFName3${testid}"
+					"${node1}",
+					"${node2}",
+					"${node3}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template
index 19c1d87..19b18f8 100644
--- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template
+++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyDomain.json.template
@@ -13,9 +13,9 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"VNFName1${testid}",
-					"VNFName2${testid}",
-					"VNFName3${testid}"
+					"${node1}",
+					"${node2}",
+					"${node3}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template
index ab92d18..e65ae63 100644
--- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template
+++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyScheduleId.json.template
@@ -13,9 +13,9 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"VNFName1${testid}",
-					"VNFName2${testid}",
-					"VNFName3${testid}"
+					"${node1}",
+					"${node2}",
+					"${node3}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template
index 9de749c..44b148a 100644
--- a/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template
+++ b/cmso-robot/robot/assets/templates/MutipleVNFImmediateFailureCases/MultipleVnfImmediateEmptyUserId.json.template
@@ -13,9 +13,9 @@
 		"vnfDetails" : [{
 				"groupId" : "",
 				"node" : [
-					"VNFName1${testid}",
-					"VNFName2${testid}",
-					"VNFName3${testid}"
+					"${node1}",
+					"${node2}",
+					"${node3}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template
index 86ae4b8..fceef79 100644
--- a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template
+++ b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyDomain.json.template
@@ -12,7 +12,7 @@
 	"schedulingInfo" : {
 		"vnfDetails" : [{
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template
index ba555ac..6ec74ad 100644
--- a/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template
+++ b/cmso-robot/robot/assets/templates/OneVNFImmediateFailureCases/OneVnfImmediateEmptyScheduleId.json.template
@@ -12,7 +12,7 @@
 	"schedulingInfo" : {
 		"vnfDetails" : [{
 				"node" : [
-					"dummy{node}"
+					"${node1}"
 				]
 			}
 		]
diff --git a/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template b/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template
index 542e19e..da460ae 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/MultipleVnfImmediate.json.template
@@ -9,8 +9,8 @@
 		}
 	],
 	"schedulingInfo" : {
-		"normalDurationInSeconds" : 100,
-		"additionalDurationInSeconds" : 10,
+		"normalDurationInSeconds" : 3000,
+		"additionalDurationInSeconds" : 600,
 		"vnfDetails" : [{
 				"groupId" : "group",
 				"node" : [
diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template
index 4630faa..5e14756 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNFsOneChangeWindow.json.template
@@ -10,10 +10,10 @@
 		}
 	],
 	"schedulingInfo" : {
-		"normalDurationInSeconds" : 100,
-		"additionalDurationInSeconds" : 10,
+		"normalDurationInSeconds" : 3600,
+		"additionalDurationInSeconds" : 0,
 		"concurrencyLimit" : 10,
-		"policyId" : "dummy-policy-id",
+		"policyId" : "AllDayEveryDay",
 		"vnfDetails" : [{
 				"groupId" : "group",
 				"node" : [
diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template
index 061b4f6..fa2e4c6 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/OneGroupMultipleVNSsTwoChangeWindows.json.template
@@ -10,10 +10,10 @@
 		}
 	],
 	"schedulingInfo" : {
-		"normalDurationInSeconds" : 100,
-		"additionalDurationInSeconds" : 10,
+		"normalDurationInSeconds" : 3000,
+		"additionalDurationInSeconds" : 600,
 		"concurrencyLimit" : 10,
-		"policyId" : "dummy-policy-id",
+		"policyId" : "AllDayEveryDay",
 		"vnfDetails" : [{
 				"groupId" : "Group1",
 				"node" : [
diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template
index a3ada80..158f591 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindow.json.template
@@ -10,10 +10,10 @@
 		}
 	],
 	"schedulingInfo" : {
-		"normalDurationInSeconds" : 100,
-		"additionalDurationInSeconds" : 10,
+		"normalDurationInSeconds" : 3600,
+		"additionalDurationInSeconds" : 0,
 		"concurrencyLimit" : 10,
-		"policyId" : "dummy-policy-id",
+		"policyId" : "AllDayEveryDay",
 		"vnfDetails" : [{
 				"groupId" : "group",
 				"node" : [
diff --git a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template
index 11a50cb..1db0e45 100644
--- a/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template
+++ b/cmso-robot/robot/assets/templates/changemanagement/OneVnfOneChangeWindowReplaceVNFInfra.json.template
@@ -13,7 +13,7 @@
 		"normalDurationInSeconds" : 100,
 		"additionalDurationInSeconds" : 10,
 		"concurrencyLimit" : 10,
-		"policyId" : "dummy-policy-id",
+		"policyId" : "AllDayEveryDay",
 		"vnfDetails" : [{
 				"groupId" : "group",
 				"node" : [
diff --git a/cmso-robot/robot/resources/misc.robot b/cmso-robot/robot/resources/misc.robot
index 0dd15e9..fe0154d 100644
--- a/cmso-robot/robot/resources/misc.robot
+++ b/cmso-robot/robot/resources/misc.robot
@@ -22,7 +22,7 @@ Validate Status
     
 Validate JSON Error
     [Documentation]     Fails if messageIds do not match. expected_errors should be a list but a string would likely work as well
-    [Arguments]    ${resp_json}    ${expected_errors}    ${listVars}
+    [Arguments]    ${resp_json}    ${expected_errors}    ${listVars}=[]
     ${result}=   Get From Dictionary   ${resp_json['requestError']}   messageId   
     ${variables}=   Get From Dictionary   ${resp_json['requestError']}   variables   
     Should Contain    ${expected_errors}    ${result}    #checks expected_errors list for the actual error received from schedule
diff --git a/cmso-robot/robot/resources/test_templates/change_management.robot b/cmso-robot/robot/resources/test_templates/change_management.robot
index 6f4167d..cfa958f 100644
--- a/cmso-robot/robot/resources/test_templates/change_management.robot
+++ b/cmso-robot/robot/resources/test_templates/change_management.robot
@@ -46,14 +46,15 @@ Change Management Rejection Template
 
 Change Management Failure Template
    [Documentation]    Sends a post request expecting a failure. expected_status_code should be whatever code is expected for this call
-   [Arguments]    ${request_file}    ${expected_status_code}    ${template_folder}
+   [Arguments]    ${request_file}    ${expected_status_code}    ${template_folder}   ${variables}=[]
    ${uuid}=   Generate UUID
    ${resp}=   Create Schedule   ${uuid}   ${request_file}    ${template_folder}
    Should Be Equal as Strings    ${resp.status_code}    ${expected_status_code}
    Return from Keyword If   '${resp.status_code}' == '202'
    #List of possible reasons that the request should fail - we should look for exact message.....
    @{status_list}=    Create List    Scheduler.INVALID_ATTRIBUTE   Scheduler.MISSING_REQUIRED_ATTRIBUTE    Scheduler.NODE_LIST_CONTAINS_EMTPY_NODE    Scheduler.INVALID_CHANGE_WINDOW   
-   Validate Json Error    ${resp.json()}    ${status_list}
+   @{listVars}=   Evaluate   ${variables}
+   Validate Json Error    ${resp.json()}    ${status_list}   ${listVars}
    
 Change Management Immediate Template
    [Arguments]    ${request_file}    ${expected_status_code}    ${template_folder}