X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fclient%2Freq%2FSdcReq.java;h=cb8af0a1de63a36a8d700139134152054130feb3;hb=878b157b7e3a0784015a8def9f2daa4588215ebf;hp=32846ed0150f1255871264e70dee8af96fe67d8a;hpb=0332719940cc8110f8fec62dd46cce3bd88e56aa;p=clamp.git diff --git a/src/main/java/org/onap/clamp/clds/client/req/SdcReq.java b/src/main/java/org/onap/clamp/clds/client/req/SdcReq.java index 32846ed0..cb8af0a1 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/SdcReq.java +++ b/src/main/java/org/onap/clamp/clds/client/req/SdcReq.java @@ -88,8 +88,8 @@ public class SdcReq { String updatedBlueprint = ""; Tca tca = prop.getType(Tca.class); if (tca.isFound()) { - updatedBlueprint = TcaRequestFormatter.updatedBlueprintWithConfiguration(refProp, prop, yamlvalue); - } + updatedBlueprint = TcaRequestFormatter.updatedBlueprintWithConfiguration(refProp, prop, yamlvalue); + } logger.info("value of blueprint:" + updatedBlueprint); return updatedBlueprint; } @@ -124,6 +124,11 @@ public class SdcReq { deployJsonNode.set("configuration", serviceConf); propsObject.put("deployment_JSON", deployJsonNode.toString()); blueprint = yaml.dump(loadedYaml); + // To remove new lines in blueprint for deployment_json + String[] deploymentJson = blueprint.split(" deployment_JSON:"); + String beforeJson = deploymentJson[0]; + String afterJson = deploymentJson[1].replaceAll("\\s+", " "); + blueprint = beforeJson + " deployment_JSON:" + afterJson; logger.info("value of updated Yaml File:" + blueprint); return blueprint; @@ -207,7 +212,6 @@ public class SdcReq { String svcUrl = baseUrl + "/" + serviceUUID + "/resourceInstances/" + normalizedResourceInstanceName + "/artifacts"; urlList.add(svcUrl); - } } }