From fd79f7920d454c35d6a8c02d430d9beba434dcc2 Mon Sep 17 00:00:00 2001 From: liamfallon Date: Mon, 10 Feb 2020 15:23:33 +0000 Subject: Get the tree of parent entities for an entity in a container Utilityu method to filter out all bit an entity and its parents from a service template entity container. Issue-ID: POLICY-1402 Change-Id: I8c3b4c21b27fd8787cdfde0e1b726646f52c437b Signed-off-by: liamfallon --- .../policies/vCPE.policy.monitoring.input.tosca.yaml | 10 +++++----- .../policies/vDNS.policy.monitoring.input.tosca.json | 16 ++++++++-------- .../policies/vDNS.policy.monitoring.input.tosca.yaml | 2 +- .../vFirewall.policy.monitoring.input.tosca.json | 16 ++++++++-------- 4 files changed, 22 insertions(+), 22 deletions(-) (limited to 'models-examples') 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 74961ef0f..7f01101c3 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 @@ -11,15 +11,15 @@ topology_template: properties: tca_policy: domain: measurementsForVfScaling - metricsPerEventName: - - + metricsPerEventName: + - eventName: Measurement_vGMUX controlLoopSchemaType: VNF policyScope: DCAE policyName: "DCAE.Config_tca-hi-lo" policyVersion: "v0.0.1" - thresholds: - - + thresholds: + - closedLoopControlName: "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e" version: "1.0.2" fieldPath: "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value" @@ -27,7 +27,7 @@ topology_template: 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" 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 19b0e8e51..bb31f4b2c 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 @@ -1,26 +1,26 @@ { "tosca_definitions_version": "tosca_simple_yaml_1_0_0", - "topology_template": + "topology_template": { - "policies": + "policies": [ { - "onap.scaleout.tca": + "onap.scaleout.tca": { "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", "type_version": "1.0.0", "version": "1.0.0", - "metadata": + "metadata": { "policy-id": "onap.scaleout.tca" }, - "properties": + "properties": { - "tca_policy": + "tca_policy": { "domain": "measurementsForVfScaling", - "metricsPerEventName": + "metricsPerEventName": [ { "eventName": "vLoadBalancer", @@ -28,7 +28,7 @@ "policyScope": "type=configuration", "policyName": "onap.scaleout.tca", "policyVersion": "v0.0.1", - "thresholds": + "thresholds": [ { "closedLoopControlName": "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3", 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 4cf17ccba..d8e37da00 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 @@ -19,7 +19,7 @@ topology_template: policyName: "onap.scaleout.tca" policyVersion: "v0.0.1" thresholds: - - + - closedLoopControlName: "ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3" closedLoopEventStatus: ONSET version: "1.0.2" 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 f96e26d3c..b247672eb 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 @@ -1,26 +1,26 @@ { "tosca_definitions_version": "tosca_simple_yaml_1_0_0", - "topology_template": + "topology_template": { - "policies": + "policies": [ { - "onap.vfirewall.tca": + "onap.vfirewall.tca": { "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", "type_version": "1.0.0", "version": "1.0.0", - "metadata": + "metadata": { "policy-id": "onap.vfirewall.tca" }, - "properties": + "properties": { - "tca_policy": + "tca_policy": { "domain": "measurementsForVfScaling", - "metricsPerEventName": + "metricsPerEventName": [ { "eventName": "vLoadBalancer", @@ -28,7 +28,7 @@ "policyScope": "resource=vLoadBalancer;type=configuration", "policyName": "onap.vfirewall.tca", "policyVersion": "v0.0.1", - "thresholds": + "thresholds": [ { "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a", -- cgit 1.2.3-korg