X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fonap%2Fclamp%2Fclds%2Fclient%2Freq%2FTcaRequestFormatter.java;h=8a6f7e8aa95451bc371da593db1d0d9541641137;hb=da4caf492050e17c1aaa8915064659a16e060d8d;hp=9698a9958364fd88988fe1aa2262842a4a0d2ad4;hpb=be0c6335f150d36bf50518e42dc2a03eae69dfb3;p=clamp.git diff --git a/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java b/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java index 9698a995..8a6f7e8a 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java +++ b/src/main/java/org/onap/clamp/clds/client/req/TcaRequestFormatter.java @@ -72,7 +72,7 @@ public class TcaRequestFormatter { Tca tca = modelProperties.getType(Tca.class); modelProperties.setCurrentModelElementId(tca.getId()); ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("tca.policy.template", service); - String policyName = refProp.getStringValue("tca.policyid.prefix") + modelProperties.getCurrentPolicyScopeAndPolicyName(); + String policyName = modelProperties.getCurrentPolicyScopeAndPolicyName(); ((ObjectNode) rootNode).put("policyName", policyName); ((ObjectNode) rootNode).put("description", "MicroService vCPE Policy"); ((ObjectNode) rootNode.get("content")).replace("tca_policy", createPolicyContent(refProp, modelProperties, service, policyName, tca)); @@ -105,7 +105,7 @@ public class TcaRequestFormatter { modelProperties.setCurrentModelElementId(tca.getId()); } if (null == policyName) { - policyName = refProp.getStringValue("tca.policyid.prefix") + modelProperties.getCurrentPolicyScopeAndPolicyName(); + policyName = modelProperties.getCurrentPolicyScopeAndPolicyName(); } ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("tca.template", service); ((ObjectNode) rootNode.get("metricsPerEventName").get(0)).put("eventName", tca.getTcaItem().getEventName());