separate error status from progression status
Re-ordered statuses, capitalized, and added delimiters
added retrystatusmessage to to string in infrarequests
Added retryStatusMessage to OrchestrationRequests
removed the word min from retry status message string
added retry status message to infra active requests
Began adding retryStatusMessage
Added rollback status and flow status to status message
added flow status table to separate errors from status
Change-Id: If756fa4523955e4e4b6bfd10aad730b715892b62
Issue-ID: SO-1205
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
index 2f824d0..051ac16 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json
@@ -27,7 +27,7 @@
},
"requestStatus": {
"requestState": "COMPLETE",
- "statusMessage": "COMPLETED",
+ "statusMessage": "STATUS: COMPLETED",
"percentProgress": 100,
"finishTime": "Tue, 02 May 2017 06:33:34 GMT"
}
@@ -61,8 +61,7 @@
},
"requestStatus": {
"requestState": "COMPLETE",
- "statusMessage": "Vf Module has been deleted successfully.",
- "rollbackStatusMessage": "Rollback has been completed successfully.",
+ "statusMessage": "STATUS: Vf Module has been deleted successfully./FLOW STATUS: Building blocks 1 of 3 completed./ROLLBACK STATUS: Rollback has been completed successfully.",
"percentProgress": 100,
"finishTime": "Thu, 22 Dec 2016 08:30:28 GMT"
}
@@ -96,7 +95,7 @@
},
"requestStatus": {
"requestState": "PENDING",
- "statusMessage": "Vf Module deletion pending.",
+ "statusMessage": "STATUS: Vf Module deletion pending.",
"percentProgress": 0,
"finishTime": "Thu, 22 Dec 2016 08:30:28 GMT"
}
@@ -180,7 +179,7 @@
},
"requestStatus": {
"requestState": "UNLOCKED",
- "statusMessage": "Vf Module deletion pending.",
+ "statusMessage": "STATUS: Vf Module deletion pending.",
"percentProgress": 0,
"finishTime": "Thu, 22 Dec 2016 08:30:28 GMT"
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
index 6f928e4..d24b48b 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json
@@ -26,7 +26,7 @@
},
"requestStatus":{
"requestState":"COMPLETE",
- "statusMessage":"Vf Module has been deleted successfully.",
+ "statusMessage":"STATUS: Vf Module has been deleted successfully.",
"percentProgress":100
}
}
@@ -57,8 +57,7 @@
},
"requestStatus":{
"requestState":"PENDING",
- "statusMessage":"Vf Module deletion pending.",
- "rollbackStatusMessage": "Rollback has been completed successfully.",
+ "statusMessage":"STATUS: Vf Module deletion pending./FLOW STATUS: Building blocks 1 of 3 completed./RETRY STATUS: Retry 2/5 will be started in 8 min./ROLLBACK STATUS: Rollback has been completed successfully.",
"percentProgress":0
}
}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json
index 231b929..97132fa 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json
@@ -43,6 +43,8 @@
"operationalEnvId": null,
"operationalEnvName": null,
"rollbackStatusMessage": "Rollback has been completed successfully.",
+ "flowStatus": "Building blocks 1 of 3 completed.",
+ "retryStatusMessage": "Retry 2/5 will be started in 8 min.",
"requestURI": "00032ab7-na18-42e5-965d-8ea592502018",
"_links": {
"self": {
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json
index a335930..0f71dd4 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json
@@ -92,7 +92,8 @@
"operationalEnvId": null,
"operationalEnvName": null,
"requestURI": "00032ab7-3fb3-42e5-965d-8ea592502017",
- "rollbackStatusMessage": "Rollback has been completed successfully."
+ "rollbackStatusMessage": "Rollback has been completed successfully.",
+ "flowStatus":"Building blocks 1 of 3 completed."
},
{
"requestId": "00032ab7-na18-42e5-965d-8ea592502018",