From 9f48bf3ea3f15bd2c2b6a7bf10f1a3f34dd5b406 Mon Sep 17 00:00:00 2001
From: Rob Daugherty <rd472p@att.com>
Date: Thu, 19 Oct 2017 21:42:19 -0400
Subject: Flows fail to update status in requests DB

The fallout and completion handlers are not updating
the request status in the mso_requests database.

The cause is a missing URN mapping that defines the
service endpoint for these updates.

Issue: SO-230
Change-Id: I5b4ff6e9ca2cde6605b3ed7cb7b086041111d31c
Signed-off-by: Rob Daugherty <rd472p@att.com>
---
 .../src/main/resources/subprocess/CompleteMsoProcess.bpmn            | 2 +-
 bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn | 2 +-
 .../test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java  | 5 +++++
 bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties        | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'bpmn/MSOCommonBPMN/src')

diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
index 2629ea7437..9bfd4535ea 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/CompleteMsoProcess.bpmn
@@ -50,7 +50,7 @@ completeMsoProcess.setUpdateDBstatustoSuccessPayload(execution)]]></bpmn2:script
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="payload"><![CDATA[${execution.getVariable("CMSO_setUpdateDBstatustoSuccessPayload")}]]></camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
index 4ac34f9210..4f27e0026a 100644
--- a/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
+++ b/bpmn/MSOCommonBPMN/src/main/resources/subprocess/FalloutHandler.bpmn
@@ -133,7 +133,7 @@ falloutHandler.buildDBWorkflowException(execution, "FH_updateRequestInfraRespons
       <bpmn2:extensionElements>
         <camunda:connector>
           <camunda:inputOutput>
-            <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
+            <camunda:inputParameter name="url">${URN_mso_adapters_openecomp_db_endpoint}</camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
index 7c9247addb..8281687dec 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/bpmn/common/FalloutHandlerTest.java
@@ -40,6 +40,11 @@ import org.openecomp.mso.bpmn.common.workflow.service.WorkflowResponse;
  */
 public class FalloutHandlerTest extends WorkflowTest {
 	private void setupMocks() {
+		stubFor(post(urlEqualTo("/dbadapters/MsoRequestsDbAdapter"))
+				.willReturn(aResponse()
+				.withStatus(200)
+				.withHeader("Content-Type", "text/xml")
+				.withBody("<DbTag>Notified</DbTag>")));
 		stubFor(post(urlEqualTo("/dbadapters/RequestsDbAdapter"))
 				.willReturn(aResponse()
 				.withStatus(200)
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
index ba45f545c8..5520d187be 100644
--- a/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOCommonBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -13,8 +13,8 @@ mso.healthcheck.log.debug=false
 
 mso.adapters.completemsoprocess.endpoint=http://localhost:28090/CompleteMsoProcess
 
-mso.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
-mso.openecomp.adapters.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
+mso.adapters.db.endpoint=http://localhost:28090/dbadapters/MsoRequestsDbAdapter
+mso.adapters.openecomp.db.endpoint=http://localhost:28090/dbadapters/RequestsDbAdapter
 mso.adapters.db.auth=757A94191D685FD2092AC1490730A4FC
 
 mso.adapters.network.endpoint=http://localhost:28090/networks/NetworkAdapter
-- 
cgit