diff options
Diffstat (limited to 'src/main')
4 files changed, 4 insertions, 6 deletions
diff --git a/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java b/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java index f51469159..282da983a 100644 --- a/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java +++ b/src/main/java/org/onap/clamp/clds/client/req/tca/TcaRequestFormatter.java @@ -72,7 +72,6 @@ public class TcaRequestFormatter { ObjectNode rootNode = (ObjectNode) refProp.getJsonTemplate("tca.policy.template", service); String policyName = modelProperties.getCurrentPolicyScopeAndPolicyName(); rootNode.put("policyName", policyName); - rootNode.put("description", "MicroService vCPE Policy"); ((ObjectNode) rootNode.get("content")).replace("tca_policy", createPolicyContent(refProp, modelProperties, service, policyName, tca)); String tcaPolicyReq = rootNode.toString(); diff --git a/src/main/resources/clds/templates/dcae-template.json b/src/main/resources/clds/templates/dcae-template.json index b7cfb232e..33162971d 100644 --- a/src/main/resources/clds/templates/dcae-template.json +++ b/src/main/resources/clds/templates/dcae-template.json @@ -16,7 +16,7 @@ "closedLoopControlName": "", "closedLoopEventClient": "configuration.dcae.microservice.tca.xml", "policyName": "", - "policyScope": "service=vSCP;resource=F5;type=configuration", + "policyScope": "CLAMP", "policyVersion": "v0.0.1", "serviceConfigurations": { } diff --git a/src/main/resources/clds/templates/tca-policy-template.json b/src/main/resources/clds/templates/tca-policy-template.json index eca4d467c..275b6a4c3 100644 --- a/src/main/resources/clds/templates/tca-policy-template.json +++ b/src/main/resources/clds/templates/tca-policy-template.json @@ -1,12 +1,11 @@ { "service": "tca_policy", - "version": "1.0.0", + "version": "1.1.0", "location": "SampleServiceLocation", "configName": "SampleConfigName", "uuid": "test", - "policyScope": "resource=SampleResource,service=SampleService,type=SampleType,closedLoopControlName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", "templateVersion": "OpenSource.version.1", - "policyName": "MicroServicevCPE", + "policyName": "MicroService", "description": "MicroService Policy", "priority": "1", "riskType": "SampleRiskType", diff --git a/src/main/resources/clds/templates/tca-template.json b/src/main/resources/clds/templates/tca-template.json index 892fc0d62..d2c04bf11 100644 --- a/src/main/resources/clds/templates/tca-template.json +++ b/src/main/resources/clds/templates/tca-template.json @@ -4,7 +4,7 @@ { "eventName": "???", "controlLoopSchemaType": "VNF", - "policyScope": "DCAE", + "policyScope": "CLAMP", "policyName": "???", "policyVersion": "v0.0.1", "thresholds": [ |