From b1e5734ef566af5d49ba17d05ca0ab7b56d6666d Mon Sep 17 00:00:00 2001 From: "Determe, Sebastien (sd378r)" Date: Tue, 9 May 2017 03:55:30 -0700 Subject: [MSO-8] Additional fixes for the second rebase DB fixes + BPMN flows and groovy fixes + Fix issue with CloudConfig file not reloaded properly when it's wrong (JSON error or model hierarchy mistake) at MSO startup Change-Id: I2853030b78499e2a761706b643ea210955e72de3 Signed-off-by: Determe, Sebastien (sd378r) [MSO-8] Restore files removed in patch set 2 Those groovy files must be there Change-Id: I9a47ac3d9c8fc06774a1b8f518491b1b0b00af04 Signed-off-by: Determe, Sebastien (sd378r) --- .../org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java | 6 +++--- .../org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'adapters/mso-sdnc-adapter/src/main/java/org') diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java index c873c9215e..55e6192ead 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/impl/SDNCAdapterRestImpl.java @@ -78,9 +78,9 @@ public class SDNCAdapterRestImpl { String operation = ""; try { - reqId = headers.getRequestHeader("att-mso-request-id").get(0); - action = headers.getRequestHeader("att-mso-request-action").get(0); - operation = headers.getRequestHeader("att-mso-request-operation").get(0); + reqId = headers.getRequestHeader("mso-request-id").get(0); + action = headers.getRequestHeader("mso-request-action").get(0); + operation = headers.getRequestHeader("mso-request-operation").get(0); MsoLogger.setLogContext(reqId, ""); diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java index c4ed50a1b1..1f8e21133a 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/openecomp/mso/adapters/sdnc/sdncrest/SDNCAdapterRest.java @@ -82,8 +82,8 @@ public class SDNCAdapterRest { @Produces({MediaType.APPLICATION_JSON}) public Response service( SDNCServiceRequest request, - @HeaderParam(value="att-mso-request-id") String msoRequestId, - @HeaderParam(value="att-mso-service-instance-id") String msoServiceInstanceId) { + @HeaderParam(value="mso-request-id") String msoRequestId, + @HeaderParam(value="mso-service-instance-id") String msoServiceInstanceId) { MsoLogger.setLogContext(msoRequestId, msoServiceInstanceId); -- cgit 1.2.3-korg