Allow semantic versioning in all templates in api

Issue-ID: POLICY-4888
Change-Id: I824618039f49581cf82ea2ca570960b41cead6bd
Signed-off-by: FrancescoFioraEst <francesco.fiora@est.tech>

3 files changed, 278 insertions, 0 deletions

diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
index 4bcd86ca..5896b352 100644
--- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
+++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java
@@ -107,7 +107,10 @@ class TestApiRestServer extends CommonTestRestController {
 
     private static final String POLICIES = "policies";
 
+    private static final String TOSCA_POLICY_VER_RESOURCE =
+        "policytypes/onap.restart.tca.snapshot.yaml";
     // @formatter:off
+
     private static final String[] TOSCA_POLICY_RESOURCE_NAMES = {"policies/vCPE.policy.monitoring.input.tosca.json",
         "policies/vCPE.policy.monitoring.input.tosca.yaml", "policies/vDNS.policy.monitoring.input.tosca.json",
         "policies/vDNS.policy.monitoring.input.tosca.v2.yaml"};
@@ -118,6 +121,9 @@ class TestApiRestServer extends CommonTestRestController {
     private static final String TOSCA_POLICYTYPE_OP_RESOURCE =
         "policytypes/onap.policies.controlloop.operational.Common.yaml";
 
+    private static final String TOSCA_POLICYTYPE_VER_RESOURCE =
+        "policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml";
+
     private static final String[] TOSCA_POLICYTYPE_RESOURCE_NAMES = {
         "policytypes/onap.policies.monitoring.tcagen2.yaml",
         "policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml",
@@ -250,6 +256,15 @@ class TestApiRestServer extends CommonTestRestController {
                 .contains("item \"policy type\" value \"IDontExist:1.0.0\" INVALID, not found");
     }
 
+    @Test
+    void testPoliciesVersioning() throws Exception {
+        var rawResponse = createResource(POLICYTYPES, TOSCA_POLICYTYPE_VER_RESOURCE, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+
+        rawResponse = createResource(POLICIES, TOSCA_POLICY_VER_RESOURCE, apiPort);
+        assertEquals(Response.Status.OK.getStatusCode(), rawResponse.getStatus());
+    }
+
     @SuppressWarnings("unchecked")
     @Test
     void testToscaCompliantOpDroolsPolicies() throws Exception {
diff --git a/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml
new file mode 100755
index 00000000..184f877e
--- /dev/null
+++ b/main/src/test/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.snapshot.yaml
@@ -0,0 +1,212 @@
+{

+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",

+  "policy_types": {

+    "onap.policies.Monitoring": {

+      "derived_from": "tosca.policies.Root",

+      "version": "6.0.0",

+      "description": "a base policy type for all policies that govern monitoring provisioning"

+    },

+    "onap.policies.monitoring.cdap.tca.hi.lo.app": {

+      "derived_from": "onap.policies.Monitoring",

+      "version": "6.0.1-snapshot",

+      "properties": {

+        "tca_policy": {

+          "type": "onap.datatypes.monitoring.tca_policy",

+          "description": "TCA Policy JSON",

+          "required": true

+        }

+      }

+    }

+  },

+  "data_types": {

+    "onap.datatypes.monitoring.metricsPerEventName": {

+      "derived_from": "tosca.datatypes.Root",

+      "properties": {

+        "controlLoopSchemaType": {

+          "type": "string",

+          "required": true,

+          "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM",

+          "constraints": [

+            {

+              "valid_values": [

+                "VM",

+                "VNF"

+              ]

+            }

+          ]

+        },

+        "eventName": {

+          "type": "string",

+          "required": true,

+          "description": "Event name to which thresholds need to be applied"

+        },

+        "policyName": {

+          "type": "string",

+          "required": true,

+          "description": "TCA Policy Scope Name"

+        },

+        "policyScope": {

+          "type": "string",

+          "required": true,

+          "description": "TCA Policy Scope"

+        },

+        "policyVersion": {

+          "type": "string",

+          "required": true,

+          "description": "TCA Policy Scope Version"

+        },

+        "thresholds": {

+          "type": "list",

+          "required": true,

+          "description": "Thresholds associated with eventName",

+          "entry_schema": {

+            "type": "onap.datatypes.monitoring.thresholds"

+          }

+        }

+      }

+    },

+    "onap.datatypes.monitoring.tca_policy": {

+      "derived_from": "tosca.datatypes.Root",

+      "properties": {

+        "domain": {

+          "type": "string",

+          "required": true,

+          "description": "Domain name to which TCA needs to be applied",

+          "default": "measurementsForVfScaling",

+          "constraints": [

+            {

+              "equal": "measurementsForVfScaling"

+            }

+          ]

+        },

+        "metricsPerEventName": {

+          "type": "list",

+          "required": true,

+          "description": "Contains eventName and threshold details that need to be applied to given eventName",

+          "entry_schema": {

+            "type": "onap.datatypes.monitoring.metricsPerEventName"

+          }

+        }

+      }

+    },

+    "onap.datatypes.monitoring.thresholds": {

+      "derived_from": "tosca.datatypes.Root",

+      "properties": {

+        "closedLoopControlName": {

+          "type": "string",

+          "required": true,

+          "description": "Closed Loop Control Name associated with the threshold"

+        },

+        "closedLoopEventStatus": {

+          "type": "string",

+          "required": true,

+          "description": "Closed Loop Event Status of the threshold",

+          "constraints": [

+            {

+              "valid_values": [

+                "ONSET",

+                "ABATED"

+              ]

+            }

+          ]

+        },

+        "direction": {

+          "type": "string",

+          "required": true,

+          "description": "Direction of the threshold",

+          "constraints": [

+            {

+              "valid_values": [

+                "LESS",

+                "LESS_OR_EQUAL",

+                "GREATER",

+                "GREATER_OR_EQUAL",

+                "EQUAL"

+              ]

+            }

+          ]

+        },

+        "fieldPath": {

+          "type": "string",

+          "required": true,

+          "description": "Json field Path as per CEF message which needs to be analyzed for TCA",

+          "constraints": [

+            {

+              "valid_values": [

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait",

+                "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage",

+                "$.event.measurementsForVfScalingFields.meanRequestLatency",

+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered",

+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached",

+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured",

+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree",

+                "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed",

+                "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value"

+              ]

+            }

+          ]

+        },

+        "severity": {

+          "type": "string",

+          "required": true,

+          "description": "Threshold Event Severity",

+          "constraints": [

+            {

+              "valid_values": [

+                "CRITICAL",

+                "MAJOR",

+                "MINOR",

+                "WARNING",

+                "NORMAL"

+              ]

+            }

+          ]

+        },

+        "thresholdValue": {

+          "type": "integer",

+          "required": true,

+          "description": "Threshold value for the field Path inside CEF message"

+        },

+        "version": {

+          "type": "string",

+          "required": true,

+          "description": "Version number associated with the threshold"

+        }

+      }

+    }

+  }

+}

diff --git a/main/src/test/resources/policytypes/onap.restart.tca.snapshot.yaml b/main/src/test/resources/policytypes/onap.restart.tca.snapshot.yaml
new file mode 100755
index 00000000..4d68df9c
--- /dev/null
+++ b/main/src/test/resources/policytypes/onap.restart.tca.snapshot.yaml
@@ -0,0 +1,51 @@
+{

+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",

+  "topology_template": {

+    "policies": [

+      {

+        "onap.restart.mytca": {

+          "type": "onap.policies.monitoring.cdap.tca.hi.lo.app",

+          "type_version": "6.0.1-snapshot",

+          "version": "6.0.1-snapshot",

+          "metadata": {

+            "policy-id": "onap.restart.mytca"

+          },

+          "properties": {

+            "tca_policy": {

+              "domain": "measurementsForVfScaling",

+              "metricsPerEventName": [

+                {

+                  "eventName": "Measurement_vGMUX",

+                  "controlLoopSchemaType": "VNF",

+                  "policyScope": "DCAE",

+                  "policyName": "DCAE.Config_tca-hi-lo",

+                  "policyVersion": "v0.0.1",

+                  "thresholds": [

+                    {

+                      "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",

+                      "version": "1.0.2",

+                      "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",

+                      "thresholdValue": 0,

+                      "direction": "EQUAL",

+                      "severity": "MAJOR",

+                      "closedLoopEventStatus": "ABATED"

+                    },

+                    {

+                      "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e",

+                      "version": "1.0.2",

+                      "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value",

+                      "thresholdValue": 0,

+                      "direction": "GREATER",

+                      "severity": "CRITICAL",

+                      "closedLoopEventStatus": "ONSET"

+                    }

+                  ]

+                }

+              ]

+            }

+          }

+        }

+      }

+    ]

+  }

+}
\ No newline at end of file