aboutsummaryrefslogtreecommitdiffstats
path: root/models-examples/src/main
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-08-19 19:13:23 +0000
committerGerrit Code Review <gerrit@onap.org>2020-08-19 19:13:23 +0000
commite88e4b3281fa4881093ccd1dfae8f826a5e9ff5a (patch)
tree4995aabadf79bdb0a534dccf363403f921924476 /models-examples/src/main
parent8722cb8a654ddcdcb472546a58809e041fe84eba (diff)
parent00892263e921f6ed14e895e5ab6bf642cc499072 (diff)
Merge "Upgrade new tcagen2 policy type"
Diffstat (limited to 'models-examples/src/main')
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.json4
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.monitoring.input.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vCPE.policy.monitoring.output.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.json4
-rw-r--r--models-examples/src/main/resources/policies/vDNS.policy.monitoring.input.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vDNS.policy.monitoring.output.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.json4
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.monitoring.input.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policies/vFirewall.policy.monitoring.output.tosca.yaml4
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.monitoring.tcagen2.yaml (renamed from models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml)6
10 files changed, 21 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.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