Merge "Upgrade new tcagen2 policy type"

17 files changed, 36 insertions, 36 deletions

diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
index d8bd4d42f..401559568 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json
@@ -4,7 +4,7 @@
         "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",
@@ -13,7 +13,7 @@
                         "policy-version": 1
                     },
                     "properties": {
-                        "tca_policy" : {
+                        "tca.policy" : {
                             "domain": "measurementsForVfScaling",
                             "metricsPerEventName": [
                                 {
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
index 51fcd3221..b15ab7773 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml
@@ -3,7 +3,7 @@ topology_template:
    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
@@ -11,7 +11,7 @@ topology_template:
              policy-id: onap.restart.tca
              policy-version: 1
            properties:
-             tca_policy:
+             tca.policy:
                 domain: measurementsForVfScaling
                 metricsPerEventName:
                   -
diff --git a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
index 51fcd3221..b15ab7773 100644
--- a/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml
@@ -3,7 +3,7 @@ topology_template:
    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
@@ -11,7 +11,7 @@ topology_template:
              policy-id: onap.restart.tca
              policy-version: 1
            properties:
-             tca_policy:
+             tca.policy:
                 domain: measurementsForVfScaling
                 metricsPerEventName:
                   -
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
index f17f32f0d..47cf06d53 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json
@@ -7,7 +7,7 @@
             {
                 "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",
@@ -18,7 +18,7 @@
 
                     "properties":
                     {
-                        "tca_policy":
+                        "tca.policy":
                         {
                             "domain": "measurementsForVfScaling",
                             "metricsPerEventName":
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
index d2a28f627..3775bf50e 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml
@@ -3,14 +3,14 @@ topology_template:
    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:
-               tca_policy:
+               tca.policy:
                   domain: measurementsForVfScaling
                   metricsPerEventName:
                      -
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
index ce37151f4..ed861706b 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml
@@ -3,7 +3,7 @@ topology_template:
    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
@@ -11,7 +11,7 @@ topology_template:
                policy-id: onap.scaleout.tca
                policy-version: 1
             properties:
-               tca_policy:
+               tca.policy:
                   domain: measurementsForVfScaling
                   metricsPerEventName:
                      -
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
index ffb5c25fb..012ee25c9 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json
@@ -7,7 +7,7 @@
             {
                 "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",
@@ -18,7 +18,7 @@
 
                     "properties":
                     {
-                        "tca_policy":
+                        "tca.policy":
                         {
                             "domain": "measurementsForVfScaling",
                             "metricsPerEventName":
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
index 7831380f3..384755885 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml
@@ -3,14 +3,14 @@ topology_template:
   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:
-           tca_policy:
+           tca.policy:
               domain: measurementsForVfScaling
               metricsPerEventName:
               -
diff --git a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
index c52ddac9d..8108dabf2 100644
--- a/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml
@@ -3,7 +3,7 @@ topology_template:
   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
@@ -11,7 +11,7 @@ topology_template:
            policy-id: onap.vfirewall.tca
            policy-version: 1
         properties:
-           tca_policy:
+           tca.policy:
               domain: measurementsForVfScaling
               metricsPerEventName:
               -
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.tcagen2.yaml
index f614ca469..367d2b5a4 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.monitoring.tcagen2.yaml
@@ -5,12 +5,12 @@ policy_types:
       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
-      name: onap.policies.monitoring.cdap.tca.hi.lo.app
+      name: onap.policies.monitoring.tcagen2
       properties:
-         tca_policy:
+         tca.policy:
             type: onap.datatypes.monitoring.tca_policy
             description: TCA Policy JSON
             required: true
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java
index dd19c6c15..01c5ff813 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyFilterTest.java
@@ -254,7 +254,7 @@ public class ToscaPolicyFilterTest {
         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());
 
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilterTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilterTest.java
index 82f100e89..cba6078b1 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilterTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/concepts/ToscaPolicyTypeFilterTest.java
@@ -72,7 +72,7 @@ public class ToscaPolicyTypeFilterTest {
         "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"
     };
     // @formatter:on
 
@@ -171,7 +171,7 @@ public class ToscaPolicyTypeFilterTest {
         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());
 
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java
index efb5bf037..969e24003 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/AuthorativeToscaProviderPolicyTest.java
@@ -411,7 +411,7 @@ public class AuthorativeToscaProviderPolicyTest {
     @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 =
@@ -453,7 +453,7 @@ public class AuthorativeToscaProviderPolicyTest {
 
     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 =
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/ToscaServiceTemplateMappingTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/ToscaServiceTemplateMappingTest.java
index a1a080df0..cd35f710a 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/ToscaServiceTemplateMappingTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/authorative/provider/ToscaServiceTemplateMappingTest.java
@@ -56,7 +56,7 @@ public class ToscaServiceTemplateMappingTest {
     @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);
 
@@ -85,7 +85,7 @@ public class ToscaServiceTemplateMappingTest {
     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);
 
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java
index 92c0f8286..c597cd4f6 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/provider/SimpleToscaProviderTest.java
@@ -842,7 +842,7 @@ public class SimpleToscaProviderTest {
 
     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 =
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
index fb01d5e8c..a4b3de36c 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicySerializationTest.java
@@ -61,7 +61,7 @@ public class MonitoringPolicySerializationTest {
 
     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";
 
@@ -75,7 +75,7 @@ public class MonitoringPolicySerializationTest {
 
     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";
 
@@ -96,7 +96,7 @@ public class MonitoringPolicySerializationTest {
     @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);
 
diff --git a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java
index 8061d1a0e..14d3a1980 100644
--- a/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java
+++ b/models-tosca/src/test/java/org/onap/policy/models/tosca/simple/serialization/MonitoringPolicyTypeSerializationTest.java
@@ -73,7 +73,7 @@ public class MonitoringPolicyTypeSerializationTest {
 
     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";
 
@@ -159,15 +159,15 @@ public class MonitoringPolicyTypeSerializationTest {
                 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("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("tca_policy", property.getKey().getLocalName());
+        assertEquals("tca.policy", property.getKey().getLocalName());
         assertEquals(TCA, property.getType().getName());
         assertEquals("TCA Policy JSON", property.getDescription());