Merge "Fix for MDONS usecase SO-2967"

2 files changed, 7 insertions, 4 deletions

diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java
index b8977f05d8..4ad32909b0 100644
--- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java
+++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/impl/SDNCRestClient.java
@@ -24,7 +24,6 @@
 
 package org.onap.so.adapters.sdnc.impl;
 
-
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.InputStream;
@@ -65,7 +64,6 @@ import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-
 @Component
 public class SDNCRestClient {
 
@@ -153,10 +151,15 @@ public class SDNCRestClient {
             String basicAuth = "Basic " + DatatypeConverter.printBase64Binary(userCredentials.getBytes());
             con.setRequestProperty("Authorization", basicAuth);
             con.setRequestMethod(rt.getReqMethod());
+            String msoAction = rt.getMsoAction();
 
             // Add request headers
             if ("POST".equals(rt.getReqMethod()) || "PUT".equals(rt.getReqMethod())) {
-                con.setRequestProperty("Content-type", "application/xml");
+                if (Constants.MSO_ACTION_MDONS.equals(msoAction)) {
+                    con.setRequestProperty("Content-type", "application/json");
+                } else {
+                    con.setRequestProperty("Content-type", "application/xml");
+                }
                 con.setRequestProperty("Content-length", String.valueOf(sdncReqBody.length()));
                 con.setDoOutput(true);
                 out = new DataOutputStream(con.getOutputStream());
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
index 21fc50c9b6..0a7753e9e5 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoDeleteE2EServiceInstance.groovy
@@ -450,6 +450,7 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
             execution.setVariable("serviceModelInfo", serviceDecomposition.getModelInfo())
 
             List<Resource> deleteResourceList = serviceDecomposition.getServiceResources()
+            List<ImmutablePair<Resource, List<Resource>>> deleteRealResourceList = new ArrayList<ImmutablePair<Resource, List<Resource>>>()
 			if (serviceDecomposition.getServiceType().equals("MDONS_OTN")){
 			   for (Resource resource : deleteResourceList) {
 			        String serviceName = execution.getVariable("serviceInstanceName")
@@ -469,7 +470,6 @@ public class DoDeleteE2EServiceInstance extends AbstractServiceTaskProcessor {
                 relationShipList = jsonSlurper.parseText(serviceRelationShip)
             }
 
-            List<ImmutablePair<Resource, List<Resource>>> deleteRealResourceList = new ArrayList<ImmutablePair<Resource, List<Resource>>>()
 
             //Set the real resource instance id to the decomosed resource list
             //reset the resource instance id , because in the decompose flow ,its a random one.