From 736fee18e6df968ed3fde55c94099302477b5b0e Mon Sep 17 00:00:00 2001
From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 11 Jul 2019 09:58:27 -0400
Subject: Update optimization policy type

Per work with Optimization team, identifying common attributes for matchable
optimization policies.

Fixed TOSCA syntax errors - use map instead of list.

Removed identity from PciPolicy, QueryPolicy and OptimizationPolicy.

Added example of how vCPE policies now look.

Updated the example for HPA Policy based on Ruoyo input. Fixed syntax
errors due to JSON conversion. Trailing spaces.

Added back in list for applicableResources and required scope attribute
for example policies.

Issue-ID: POLICY-1899
Change-Id: Ic8ae6db0575fb21fca6103ab2ed015c8524def80
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---
 .../onap.policies.optimization.PciPolicy.yaml      | 32 +---------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

(limited to 'main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml')

diff --git a/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml b/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml
index 2cc6d418..81187964 100644
--- a/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml
+++ b/main/src/test/resources/policytypes/onap.policies.optimization.PciPolicy.yaml
@@ -1,44 +1,14 @@
 tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
-    - onap.policies.Optimization:
-        derived_from: tosca.policies.Root
-        version: 1.0.0
-        description: a base policy type for all policies that govern optimization
-    - onap.policies.optimization.PciPolicy:
+    onap.policies.optimization.PciPolicy:
         derived_from: onap.policies.Optimization
         properties:
-            policyScope:
-                type: list
-                description: scope where the policy is applicable
-                required: true
-                matchable: true
-                entry_schema:
-                    type: string
-            policyType:
-                type: list
-                description: type of a policy
-                required: true
-                matchable: true
-                entry_schema:
-                    type: string
-                    constraints:
-                    -   valid_values:
-                        - pciPolicy
-            identity:
-                type: string
-                required: true
-            resources:
-                type: list
-                required: true
-                entry_schema:
-                    type: string
             pciProperties:
                 type: list
                 required: false
                 entry_schema:
                   type: policy.data.pciProperties_properties
 data_types:
-  -
     policy.data.pciProperties_properties:
         derived_from: tosca.nodes.Root
         properties:
-- 
cgit 1.2.3-korg