Adding 'name' to yamls and json in model

[policy/models.git] / models-examples / src / main / resources / policytypes / onap.policies.native.Apex.yaml

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..9a17ece 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,13 +1,15 @@
-tosca_definitions_version: tosca_simple_yaml_1_0_0,
+tosca_definitions_version: tosca_simple_yaml_1_1_0
 policy_types:
     onap.policies.Native:
         derived_from: tosca.policies.Root
         description: a base policy type for all native PDP policies
         version: 1.0.0
+        name: onap.policies.Native
     onap.policies.native.Apex:
         derived_from: onap.policies.Native
         description: a policy type for native apex policies
         version: 1.0.0
+        name: onap.policies.native.Apex
         properties:
             engine_service:
                 type: onap.datatypes.native.apex.EngineService
@@ -43,15 +45,15 @@ data_types:
                 required: false
                 default: "1.0.0"
             id:
-                type: int
+                type: integer
                 description: Specifies the engine id
                 required: true
             instance_count:
-                type: int
+                type: integer
                 description: Specifies the number of engine threads that should be run
                 required: true
             deployment_port:
-                type: int
+                type: integer
                 description: Specifies the port to connect to for engine administration
                 required: false
                 default: 1
@@ -59,17 +61,14 @@ data_types:
                 type: string
                 description: The name of the file from which to read the APEX policy model
                 required: false
-                default: ""
             policy_type_impl:
                 type: string
                 description: The policy type implementation from which to read the APEX policy model
                 required: false
-                default: ""
             periodic_event_period:
                 type: string
                 description: The time interval in milliseconds for the periodic scanning event, 0 means don't scan
                 required: false
-                default: 0
             engine:
                 type: onap.datatypes.native.apex.engineservice.Engine
                 description: The parameters for all engines in the APEX engine service
@@ -98,7 +97,7 @@ data_types:
                 description: Specifies a filter as a regular expression, events that do not match the filter are dropped, the default is to let all events through
                 required: false
             synchronous_mode:
-                type: bool
+                type: boolean
                 description: Specifies the event handler is syncronous (receive event and send response)
                 required: false
                 default: false
@@ -106,14 +105,12 @@ data_types:
                 type: string
                 description: The peer event handler (output for input or input for output) of this event handler in synchronous mode, this parameter is mandatory if the event handler is in synchronous mode
                 required: false
-                default: ""
             synchronous_timeout:
-                type: int
+                type: integer
                 description: The timeout in milliseconds for responses to be issued by APEX torequests, this parameter is mandatory if the event handler is in synchronous mode
                 required: false
-                default: ""
             requestor_mode:
-                type: bool
+                type: boolean
                 description: Specifies the event handler is in requestor mode (send event and wait for response mode)
                 required: false
                 default: false
@@ -121,12 +118,10 @@ data_types:
                 type: string
                 description: The peer event handler (output for input or input for output) of this event handler in requestor mode, this parameter is mandatory if the event handler is in requestor mode
                 required: false
-                default: ""
             requestor_timeout:
-                type: int
+                type: integer
                 description: The timeout in milliseconds for wait for responses to requests, this parameter is mandatory if the event handler is in requestor mode
                 required: false
-                default: ""
     onap.datatypes.native.apex.CarrierTechnology:
         derived_from: tosca.datatypes.Root
         properties:
@@ -149,7 +144,7 @@ data_types:
                 type: string
                 description: The class name of the class that overrides default handling of the event protocol for this carrier technology, defaults to the supplied event protocol class
                 required: false
-    onap.datatypes.native.apex.Environmental:
+    onap.datatypes.native.apex.Environment:
         derived_from: tosca.datatypes.Root
         properties:
             name:
@@ -188,7 +183,7 @@ data_types:
                 entry_schema:
                     type: onap.datatypes.native.apex.Plugin
             locking:
-                type: onap.datatypes.native.apex.plugin
+                type: onap.datatypes.native.apex.Plugin
                 description: The plugin to be used for locking context in and between APEX PDPs at runtime
                 required: false
             persistence:
@@ -204,4 +199,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