diff options
Diffstat (limited to 'models-examples/src')
11 files changed, 86 insertions, 21 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.controlloop.guard.common.Filter.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml new file mode 100644 index 000000000..2d96c5235 --- /dev/null +++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Filter.yaml @@ -0,0 +1,65 @@ +tosca_definitions_version: tosca_simple_yaml_1_1_0 +policy_types: + onap.policies.controlloop.guard.common.Filter: + derived_from: onap.policies.controlloop.guard.Common + type_version: 1.0.0 + version: 1.0.0 + name: onap.policies.controlloop.guard.common.Filter + description: Supports filtering of A&AI entities such as vnf-id, type, service, geographic region, etc. + properties: + algorithm: + type: string + description: Designates the precendence of blacklist vs whitelist + required: true + default: blacklist-overrides + constraints: + - valid_values: ["blacklist-overrides", "whitelist-overrides"] + filters: + type: list + description: List of filters to be applied. + required: true + entry_schema: + type: onap.datatypes.guard.filter +data_types: + onap.datatypes.guard.filter: + derived_from: tosca.nodes.Root + properties: + field: + type: string + description: Name of the field to perform the filter on using the A&AI <node>.<property> syntax. + required: true + constraints: + - valid_values: + - generic-vnf.vnf-name + - generic-vnf.vnf-id + - generic-vnf.vnf-type + - generic-vnf.nf-naming-code + - vserver.vserver-id + - cloud-region.cloud-region-id + filter: + type: string + description: The filter value itself. For example, "RegionOne" "vFWCL*" + required: true + function: + type: string + description: The function applied to the filter. + required: true + constraints: + - valid_values: + - string-equal + - string-equal-ignore-case + - string-regexp-match + - string-contains + - string-greater-than + - string-greater-than-or-equal + - string-less-than + - string-less-than-or-equal + - string-starts-with + - string-ends-with + blacklist: + type: boolean + description: | + Indicates if the filter should be treated as a blacklist (true) + or whitelist (false). + required: true + default: true
\ No newline at end of file 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 |