summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2020-03-25 17:26:48 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-25 17:26:48 +0000
commit47e74ec900616c7afc2a81f4851ea2b557be0abd (patch)
treefa83121d98da9600c4e9df64e80e0a2d4ecf4447
parentb0bb4733ee29dabfe024dc93869a2ede09ef010f (diff)
parentd82646cefc266063382d09f1bd3ed256eca0887b (diff)
Merge "Update Subprocess to use COMPLETE status"
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/db/migration/V8.2__Fix_Invalid_Request_Status.sql4
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy2
2 files changed, 5 insertions, 1 deletions
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V8.2__Fix_Invalid_Request_Status.sql b/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V8.2__Fix_Invalid_Request_Status.sql
new file mode 100644
index 0000000000..9fee716326
--- /dev/null
+++ b/adapters/mso-requests-db-adapter/src/main/resources/db/migration/V8.2__Fix_Invalid_Request_Status.sql
@@ -0,0 +1,4 @@
+USE `requestdb`;
+
+UPDATE infra_active_requests SET request_status='COMPLETE' where request_status = 'COMPLETED';
+UPDATE archived_infra_requests SET request_status='COMPLETE' where request_status = 'COMPLETED'; \ No newline at end of file
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
index 48a8e60095..ff628346b5 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CompleteMsoProcess.groovy
@@ -89,7 +89,7 @@ public class CompleteMsoProcess extends AbstractServiceTaskProcessor {
}
infraRequest.setLastModifiedBy("BPMN")
infraRequest.setStatusMessage(statusMessage)
- infraRequest.setRequestStatus("COMPLETED")
+ infraRequest.setRequestStatus("COMPLETE")
infraRequest.setProgress(100)
if(utils.nodeExists(xml, "vnfId")){