The old cdap policy type is deprecated by DCAE. Thus,
we are simply replacing with the new tcagen2 policy type.
Issue-ID: POLICY-2772
Change-Id: I1442340729b5f820f2e265b9b86f6f6f84f49bca
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
17 files changed:
"policies": [
{
"onap.restart.tca": {
"policies": [
{
"onap.restart.tca": {
- "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+ "type": "onap.policies.monitoring.tcagen2",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.restart.tca",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.restart.tca",
"policy-version": 1
},
"properties": {
"policy-version": 1
},
"properties": {
"domain": "measurementsForVfScaling",
"metricsPerEventName": [
{
"domain": "measurementsForVfScaling",
"metricsPerEventName": [
{
policies:
-
onap.restart.tca:
policies:
-
onap.restart.tca:
- type: onap.policies.monitoring.cdap.tca.hi.lo.app
+ type: onap.policies.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.restart.tca
type_version: 1.0.0
version: 1.0.0
name: onap.restart.tca
policy-id: onap.restart.tca
policy-version: 1
properties:
policy-id: onap.restart.tca
policy-version: 1
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
policies:
-
onap.restart.tca:
policies:
-
onap.restart.tca:
- type: onap.policies.monitoring.cdap.tca.hi.lo.app
+ type: onap.policies.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.restart.tca
type_version: 1.0.0
version: 1.0.0
name: onap.restart.tca
policy-id: onap.restart.tca
policy-version: 1
properties:
policy-id: onap.restart.tca
policy-version: 1
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
- "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+ "type": "onap.policies.monitoring.tcagen2",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.scaleout.tca",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.scaleout.tca",
{
"domain": "measurementsForVfScaling",
"metricsPerEventName":
{
"domain": "measurementsForVfScaling",
"metricsPerEventName":
policies:
-
onap.scaleout.tca:
policies:
-
onap.scaleout.tca:
- type: onap.policies.monitoring.cdap.tca.hi.lo.app
+ type: onap.policies.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.scaleout.tca
metadata:
policy-id: onap.scaleout.tca
properties:
type_version: 1.0.0
version: 1.0.0
name: onap.scaleout.tca
metadata:
policy-id: onap.scaleout.tca
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
policies:
-
onap.scaleout.tca:
policies:
-
onap.scaleout.tca:
- type: onap.policies.monitoring.cdap.tca.hi.lo.app
+ type: onap.policies.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.scaleout.tca
type_version: 1.0.0
version: 1.0.0
name: onap.scaleout.tca
policy-id: onap.scaleout.tca
policy-version: 1
properties:
policy-id: onap.scaleout.tca
policy-version: 1
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
{
"onap.vfirewall.tca":
{
{
"onap.vfirewall.tca":
{
- "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+ "type": "onap.policies.monitoring.tcagen2",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.vfirewall.tca",
"type_version": "1.0.0",
"version": "1.0.0",
"name": "onap.vfirewall.tca",
{
"domain": "measurementsForVfScaling",
"metricsPerEventName":
{
"domain": "measurementsForVfScaling",
"metricsPerEventName":
policies:
-
onap.vfirewall.tca:
policies:
-
onap.vfirewall.tca:
- type: onap.policies.monitoring.cdap.tca.hi.lo.app
+ type: onap.policies.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.vfirewall.tca
metadata:
policy-id: onap.vfirewall.tca
properties:
type_version: 1.0.0
version: 1.0.0
name: onap.vfirewall.tca
metadata:
policy-id: onap.vfirewall.tca
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
policies:
-
onap.vfirewall.tca:
policies:
-
onap.vfirewall.tca:
- type: onap.policy.monitoring.cdap.tca.hi.lo.app
+ type: onap.policy.monitoring.tcagen2
type_version: 1.0.0
version: 1.0.0
name: onap.vfirewall.tca
type_version: 1.0.0
version: 1.0.0
name: onap.vfirewall.tca
policy-id: onap.vfirewall.tca
policy-version: 1
properties:
policy-id: onap.vfirewall.tca
policy-version: 1
properties:
domain: measurementsForVfScaling
metricsPerEventName:
-
domain: measurementsForVfScaling
metricsPerEventName:
-
version: 1.0.0
name: onap.policies.Monitoring
description: a base policy type for all policies that govern monitoring provisioning
version: 1.0.0
name: onap.policies.Monitoring
description: a base policy type for all policies that govern monitoring provisioning
- onap.policies.monitoring.cdap.tca.hi.lo.app:
+ onap.policies.monitoring.tcagen2:
derived_from: onap.policies.Monitoring
version: 1.0.0
derived_from: onap.policies.Monitoring
version: 1.0.0
- name: onap.policies.monitoring.cdap.tca.hi.lo.app
+ name: onap.policies.monitoring.tcagen2
type: onap.datatypes.monitoring.tca_policy
description: TCA Policy JSON
required: true
type: onap.datatypes.monitoring.tca_policy
description: TCA Policy JSON
required: true
filteredList = filter.filter(policyList);
assertEquals(3, filteredList.size());
filteredList = filter.filter(policyList);
assertEquals(3, filteredList.size());
- filter = ToscaPolicyFilter.builder().type("onap.policies.monitoring.cdap.tca.hi.lo.app").build();
+ filter = ToscaPolicyFilter.builder().type("onap.policies.monitoring.tcagen2").build();
filteredList = filter.filter(policyList);
assertEquals(3, filteredList.size());
filteredList = filter.filter(policyList);
assertEquals(3, filteredList.size());
"policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.Optimization.yaml",
"policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml",
"policytypes/onap.policies.controlloop.guard.coordination.FirstBlocksSecond.yaml",
"policytypes/onap.policies.Optimization.yaml",
- "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml"
+ "policytypes/onap.policies.monitoring.tcagen2.yaml"
List<ToscaPolicyType> filteredList = filter.filter(typeList);
assertEquals(1, filteredList.size());
List<ToscaPolicyType> filteredList = filter.filter(typeList);
assertEquals(1, filteredList.size());
- filter = ToscaPolicyTypeFilter.builder().name("onap.policies.monitoring.cdap.tca.hi.lo.app").build();
+ filter = ToscaPolicyTypeFilter.builder().name("onap.policies.monitoring.tcagen2").build();
filteredList = filter.filter(typeList);
assertEquals(1, filteredList.size());
filteredList = filter.filter(typeList);
assertEquals(1, filteredList.size());
@Test
public void testEntityMaps() throws CoderException, PfModelException {
Object yamlObject = new Yaml().load(
@Test
public void testEntityMaps() throws CoderException, PfModelException {
Object yamlObject = new Yaml().load(
- ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml"));
+ ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
private void createPolicyTypes() throws CoderException, PfModelException {
Object yamlObject = new Yaml().load(
private void createPolicyTypes() throws CoderException, PfModelException {
Object yamlObject = new Yaml().load(
- ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml"));
+ ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
@Test
public void testPlainToscaPolicies() throws Exception {
String policyTypeInputJson =
@Test
public void testPlainToscaPolicies() throws Exception {
String policyTypeInputJson =
- ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml");
+ ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml");
ToscaServiceTemplate plainPolicyTypes =
yamlJsonTranslator.fromYaml(policyTypeInputJson, ToscaServiceTemplate.class);
ToscaServiceTemplate plainPolicyTypes =
yamlJsonTranslator.fromYaml(policyTypeInputJson, ToscaServiceTemplate.class);
public void testPlainToscaPolicyTypes() throws Exception {
Yaml yaml = new Yaml();
String inputYaml =
public void testPlainToscaPolicyTypes() throws Exception {
Yaml yaml = new Yaml();
String inputYaml =
- ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml");
+ ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml");
Object yamlObject = yaml.load(inputYaml);
String yamlAsJsonString = standardCoder.encode(yamlObject);
Object yamlObject = yaml.load(inputYaml);
String yamlAsJsonString = standardCoder.encode(yamlObject);
private void createPolicyTypes() throws CoderException, PfModelException {
Object yamlObject = new Yaml()
private void createPolicyTypes() throws CoderException, PfModelException {
Object yamlObject = new Yaml()
- .load(ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml"));
+ .load(ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml"));
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
String yamlAsJsonString = new StandardCoder().encode(yamlObject);
ToscaServiceTemplate toscaServiceTemplatePolicyType =
private static final String TOPOLOGY_TEMPLATE = "topology_template";
private static final String TOPOLOGY_TEMPLATE = "topology_template";
- private static final String TCA_POLICY = "tca_policy";
+ private static final String TCA_POLICY = "tca.policy";
private static final String PROPERTIES2 = "properties";
private static final String PROPERTIES2 = "properties";
private static final String POLICY1 = "onap.restart.tca";
private static final String POLICY1 = "onap.restart.tca";
- private static final String TYPE1 = "onap.policies.monitoring.cdap.tca.hi.lo.app";
+ private static final String TYPE1 = "onap.policies.monitoring.tcagen2";
private static final String METADATA = "metadata";
private static final String METADATA = "metadata";
@Test
public void testDeserialization() throws Exception {
String policyTypeInputJson =
@Test
public void testDeserialization() throws Exception {
String policyTypeInputJson =
- ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml");
+ ResourceUtils.getResourceAsString("policytypes/onap.policies.monitoring.tcagen2.yaml");
ToscaServiceTemplate plainPolicyTypes =
yamlJsonTranslator.fromYaml(policyTypeInputJson, ToscaServiceTemplate.class);
ToscaServiceTemplate plainPolicyTypes =
yamlJsonTranslator.fromYaml(policyTypeInputJson, ToscaServiceTemplate.class);
private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringPolicyTypeSerializationTest.class);
private static final Logger LOGGER = LoggerFactory.getLogger(MonitoringPolicyTypeSerializationTest.class);
- private static final String MONITORING_TCA_YAML = "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml";
+ private static final String MONITORING_TCA_YAML = "policytypes/onap.policies.monitoring.tcagen2.yaml";
private static final String MONITORING_COLLECTORS_YAML =
"policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml";
private static final String MONITORING_COLLECTORS_YAML =
"policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml";
firstPolicyType.getValue().getDescription());
Entry<PfConceptKey, JpaToscaPolicyType> secondPolicyType = policyTypesIter.next();
firstPolicyType.getValue().getDescription());
Entry<PfConceptKey, JpaToscaPolicyType> secondPolicyType = policyTypesIter.next();
- assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", secondPolicyType.getKey().getName());
+ assertEquals("onap.policies.monitoring.tcagen2", secondPolicyType.getKey().getName());
assertEquals(VERSION_100, secondPolicyType.getKey().getVersion());
assertEquals(MONITORING, secondPolicyType.getValue().getDerivedFrom().getName());
assertTrue(secondPolicyType.getValue().getProperties().size() == 1);
JpaToscaProperty property = secondPolicyType.getValue().getProperties().values().iterator().next();
assertEquals(VERSION_100, secondPolicyType.getKey().getVersion());
assertEquals(MONITORING, secondPolicyType.getValue().getDerivedFrom().getName());
assertTrue(secondPolicyType.getValue().getProperties().size() == 1);
JpaToscaProperty property = secondPolicyType.getValue().getProperties().values().iterator().next();
- assertEquals("onap.policies.monitoring.cdap.tca.hi.lo.app", property.getKey().getParentKeyName());
+ assertEquals("onap.policies.monitoring.tcagen2", property.getKey().getParentKeyName());
assertEquals(VERSION_100, property.getKey().getParentKeyVersion());
assertEquals(VERSION_100, property.getKey().getParentKeyVersion());
- assertEquals("tca_policy", property.getKey().getLocalName());
+ assertEquals("tca.policy", property.getKey().getLocalName());
assertEquals(TCA, property.getType().getName());
assertEquals("TCA Policy JSON", property.getDescription());
assertEquals(TCA, property.getType().getName());
assertEquals("TCA Policy JSON", property.getDescription());