Merge "CLAMP Model policy creation support"

2 files changed, 107 insertions, 85 deletions

diff --git a/ONAP-REST/src/test/resources/TESTMODEL-v1806.yml b/ONAP-REST/src/test/resources/TESTMODEL-v1806.yml
new file mode 100644
index 000000000..8f35e6fc1
--- /dev/null
+++ b/ONAP-REST/src/test/resources/TESTMODEL-v1806.yml
@@ -0,0 +1,107 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+
+node_types: 
+    
+    # policy root node
+    policy.nodes.Root:
+        derived_from: tosca.nodes.Root
+        properties:
+            policyName:
+                type: string
+                required: true
+            policyVersion:
+                type: string
+                required: true
+            policyScope:
+                type: string
+                required: true
+            policyDescription:
+                type: string
+                required: false
+
+    # virtual policy node for naming 
+    policy.nodes.naming-model:
+        derived_from: policy.nodes.Root
+        properties:
+            Correlation Priority:
+                type: string
+                required: true
+            Correlation Window:
+                type: String
+                required: true
+            Email Notification for failures:
+                type: String
+                required: true
+            Select Server Scope: # Need Dictionary
+                type: String
+                required: true
+            Parent Correlation Name:
+                type: String
+                required: true
+            Parent Correlation Traversal: # Need Dictionary
+                type: String
+                required: true
+            triggerSignature:
+                type: list
+                required: true
+                entry_schema:
+                    - type:policy.data.resource-model-entity 
+            logicalConnector: 
+                type: list
+                required: true
+                entry_schema:
+                    type: string
+                    constraints:
+                       - valid_values: ["OR", "AND"]                    
+data_types:
+    # custom data type
+    policy.data.resource-model-entity:
+        derived_from: tosca.nodes.Root
+        properties:
+            signatures:
+                    type: policy.data.element
+                    required: false        
+
+    policy.data.element:
+        derived_from: tosca.nodes.Root
+        properties:
+            alarmSignatures:
+                type: list
+                required: true
+                entry_schema:
+                    type: policy.data.range
+             
+    policy.data.range:
+        derived_from: tosca.nodes.Root
+        properties:
+            traversal:
+                type: string
+                required: true
+            alarmSignature:
+                type: list
+                required: true
+                entry_schema:
+                    type: policy.data.alarms
+
+    policy.data.alarms:
+        derived_from: tosca.nodes.Root
+        properties:
+            VnfType:
+                type: list
+                required: true
+                entry_schema:
+                    type: string
+                    constraints:
+                       - valid_values: ["dictionary:GocVNFType#Rules"]  
+            Contains:
+                type: list
+                required: true
+                entry_schema:
+                    type: string
+                    constraints:
+                       - valid_values: ["OR", "AND", "CONTAINS", "EQUALS", "NOTEQUALS", "ENDSWITH", "STARTSWITH"]
+            FilterValue:
+                type: string
+                required: true     
+
+JSON_MODEL: signatures.alarmSignatures.alarmSignature               
\ No newline at end of file
diff --git a/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml b/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml
deleted file mode 100644
index b29ebcfa9..000000000
--- a/ONAP-REST/src/test/resources/policy_tosca_tca-v1707.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-#============LICENSE_START==================================================
-#  ONAP Policy Engine
-#===========================================================================
-#  Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
-#===========================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#============LICENSE_END==================================================
-#
-
-tosca_definitions_version: tosca_simple_yaml_1_0_0
-
-node_types: 
-    # policy root node
-    policy.nodes.Root:
-        derived_from: tosca.nodes.Root
-        properties:
-            policyName:
-                type: string
-                required: true
-            policyVersion:
-                type: string
-                required: true
-            policyScope:
-                type: string
-                required: true
-            policyDescription:
-                type: string
-                required: false
-
-    # virtual policy node for string matcher
-    policy.nodes.tca:
-        derived_from: policy.nodes.Root
-        properties:
-            functionalRole:
-                type: string
-                required: true
-                default: "ClosedLoop_F5-d925ed73-8231-4d02-9545-db4e101f88f8" 
-            policyName:
-                type: string
-                required: true
-                default: "configuration.dcae.microservice.tca.xml"
-            policyVersion:
-                type: string
-                required: true
-                default: "v0.0.1"
-            threshholds:
-                type: list
-                entry_schema:
-                    - type:policy.data.Threshold                    
-            
-data_types:
-    policy.data.Threshold:
-        derived_from: tosca.nodes.Root
-        properties:
-            closedLoopControlName:
-                type: string
-                required: true
-            version:
-                type: string
-                required: true
-                default: "1.0.2"
-            fieldPath:
-                type: string
-                required: true
-            thresholdValue:
-                type: integer
-                required: true
-            direction:
-                type: string
-                required: true
-            severity:
-                type: string
-                required: true
-