Merge "Add merge utility for service templates"

diff --git a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
index 793334e..6f3545b 100644 (file)
--- a/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
+++ b/models-examples/src/main/resources/policies/vCPE.policy.operational.input.tosca.json
@@ -42,4 +42,4 @@
       }
     ]
   }
-}
\ No newline at end of file
+}

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
index dfc96ba..2dc6ba8 100644 (file)
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
@@ -31,13 +31,6 @@ policy_types:
                 entry_schema:
                     type: onap.datatype.controlloop.Operation
 
-    onap.policies.controlloop.operational.common.Apex:
-        derived_from: onap.policies.controlloop.operational.Common
-        type_version: 1.0.0
-        version: 1.0.0
-        description: Operational policies for Apex PDP
-        properties:
-
     onap.policies.controlloop.operational.common.Drools:
         derived_from: onap.policies.controlloop.operational.Common
         type_version: 1.0.0
@@ -166,4 +159,4 @@ data_types:
                 type: String
                 description: Points to the operation to invoke when the current operation is blocked due to guard policy enforcement.
                 required: false
-                default: final_failure_guard     
+                default: final_failure_guard

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml
new file mode 100644 (file)
index 0000000..dba6567
--- /dev/null
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.common.Apex.yaml
@@ -0,0 +1,23 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+policy_types:
+    onap.policies.controlloop.operational.common.Apex:
+        derived_from: onap.policies.controlloop.operational.Common
+        version: 1.0.0
+        description: Operational policies for Apex PDP
+        properties:
+            engineServiceParameters:
+                type: String
+                description: The engine parameters like name, instanceCount, policy implementation, parameters etc.
+                required: true
+            eventInputParameters:
+                type: String
+                description: The event input parameters.
+                required: true
+            eventOutputParameters:
+                type: String
+                description: The event output parameters.
+                required: true
+            javaProperties:
+                type: String
+                description: Name/value pairs of properties to be set for APEX if needed.
+                required: false

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml b/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
index 74db202..63f8fd6 100644 (file)
--- a/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.drools.Controller.yaml
@@ -45,7 +45,7 @@ data_types:
     onap.datatypes.dmaap.serialization:
         derived_from: tosca.datatypes.Root
         properties:
-            eventCanonicalName:
+            eventClass:
                 type: string
                 required: true
                 description: the event canonical class for serialization

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
index 1166394..1a394cd 100644 (file)
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Apex.yaml
@@ -1,4 +1,4 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0,
+tosca_definitions_version: tosca_simple_yaml_1_0_0
 policy_types:
     onap.policies.Native:
         derived_from: tosca.policies.Root
@@ -204,4 +204,4 @@ data_types:
                 required: true
             plugin_class_name:
                 type: string
-                description: The class path of the plugin class for this executor
\ No newline at end of file
+                description: The class path of the plugin class for this executor

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
index 39b9c7f..c36796e 100644 (file)
--- a/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.native.Drools.yaml
@@ -9,8 +9,8 @@ policy_types:
         description: a policy type for native drools policies
         version: 1.0.0
         properties:
-            rule_artifact:
-                type: onap.datatypes.native.rule_artifact
+            rulesArtifact:
+                type: onap.datatypes.native.rules_artifact
                 required: true
                 description: the GAV information of the maven artifact
             controller:
@@ -19,7 +19,7 @@ policy_types:
                 description: the drools controller to which the current native policy is assigned
 
 data_types:
-    onap.datatypes.native.rule_artifact:
+    onap.datatypes.native.rules_artifact:
         derived_from: tosca.datatypes.Root
         properties:
             groupId:
@@ -37,11 +37,11 @@ data_types:
     onap.datatypes.drools.controller.relation:
         derived_from: tosca.datatypes.Root
         properties:
-            controllerPolicyName:
+            controllerName:
                 type: string
                 required: true
                 description: the name of drools controller policy
-            controllerPolicyVersion:
+            controllerVersion:
                 type: string
-                required: true
+                required: false
                 description: the version of drools controller policy
\ No newline at end of file