summaryrefslogtreecommitdiffstats
path: root/models-examples/src/main
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-03-08 10:39:21 -0400
committerPamela Dragosh <pdragosh@research.att.com>2020-03-09 08:58:18 -0400
commite90d37c87fdc81b1ee95963f42f53edb48fec88a (patch)
tree78e3d3fefd868e1314b71b5b639dc23cbaa243a9 /models-examples/src/main
parent8021fe6aa24b4a4c586cda78255c143eca3e3520 (diff)
Fix guard policy types and policies
Ensured the correct properties are available for each guard Policy Type. Added vDNS blacklist policy for testing. Issue-ID: POLICY-2243 Change-Id: I1cdcd3810f226446cd12f2123f8a9f41e6b5b4b2 Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'models-examples/src/main')
-rw-r--r--models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml15
-rw-r--r--models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml28
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml2
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml1
-rw-r--r--models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml10
5 files changed, 39 insertions, 17 deletions
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml
new file mode 100644
index 000000000..78a2de6b3
--- /dev/null
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.blacklist.input.tosca.yaml
@@ -0,0 +1,15 @@
+tosca_definitions_version: tosca_simple_yaml_1_1_0
+topology_template:
+ policies:
+ - guard.blacklist.scaleout:
+ type: onap.policies.controlloop.guard.common.Blacklist
+ type_version: 1.0.0
+ version: 1.0.0
+ metadata:
+ policy-id: guard.blacklist.scaleout
+ properties:
+ actor: SO
+ operation: VF Module Create
+ id: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+ blacklist:
+ - the-vfmodule-where-root-is-true \ No newline at end of file
diff --git a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
index dafc524b5..4c3afb745 100644
--- a/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
+++ b/models-examples/src/main/resources/policies/vDNS.policy.guard.minmaxvnfs.input.tosca.yaml
@@ -1,16 +1,16 @@
tosca_definitions_version: tosca_simple_yaml_1_1_0
topology_template:
- policies:
- -
- guard.minmax.scaleout:
- type: onap.policies.controlloop.guard.common.MinMax
- type_version: 1.0.0
- version: 1.0.0
- metadata:
- policy-id : guard.minmax.scaleout
- properties:
- actor: SO
- operation: VF Module Create
- id: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
- min: 1
- max: 2 \ No newline at end of file
+ policies:
+ - guard.minmax.scaleout:
+ type: onap.policies.controlloop.guard.common.MinMax
+ type_version: 1.0.0
+ version: 1.0.0
+ metadata:
+ policy-id: guard.minmax.scaleout
+ properties:
+ actor: SO
+ operation: VF Module Create
+ id: ControlLoop-vDNS-6f37f56d-a87d-4b85-b6a9-cc953cf779b3
+ target: e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e
+ min: 1
+ max: 2 \ No newline at end of file
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
index 058066c04..0456f43cb 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.Blacklist.yaml
@@ -8,7 +8,7 @@ policy_types:
properties:
blacklist:
type: list
- description: List of entity id's
+ description: List of entity id's not allowed to have control loop operations on.
required: true
entry_schema:
type: string \ No newline at end of file
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
index af8efe851..bda3e4cc5 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.FrequencyLimiter.yaml
@@ -13,6 +13,7 @@ policy_types:
timeUnits:
type: string
description: The units of time the window is counting.
+ required: true
constraints:
- valid_values: ["second", "minute", "hour", "day", "week", "month", "year"]
limit:
diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
index 257515179..fb376d432 100644
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.guard.common.MinMax.yaml
@@ -4,11 +4,17 @@ policy_types:
derived_from: onap.policies.controlloop.guard.Common
type_version: 1.0.0
version: 1.0.0
- description: Supports Min/Max number of entity for scaling operations
+ description: |
+ Supports Min/Max number of entity for scaling operations. Although min and max fields are marked as not
+ required, you need to have at least one or the other.
properties:
+ target:
+ type: string
+ required: true
+ description: The target entity that has scaling restricted
min:
type: integer
- required: true
+ required: false
description: The minimum instances of this entity
max:
type: integer