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=a71a5f3753681016cd33488cad81f7dba0d95a44;hpb=0710cdbd323ee5828045fd30d56c6a3edba8bb84;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 a71a5f37..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,10 +72,10 @@ 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).replace("content", createPolicyContent(refProp, modelProperties, service, policyName, tca));
+            ((ObjectNode) rootNode.get("content")).replace("tca_policy", createPolicyContent(refProp, modelProperties, service, policyName, tca));
 
             String tcaPolicyReq = rootNode.toString();
             logger.info("tcaPolicyReq=" + tcaPolicyReq);
@@ -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());