Fix BBS use case APEX policies

JSON payload for deploying BBS APEX policies needs to be corrected

Issue-ID: INT-1499
Signed-off-by: Pérez Caparrós David, INI-ONE-MBL-MEE <David.PerezCaparros@swisscom.com>
Change-Id: Ia9c1120f3961dfa2c4ee81a6ebd3be69b7b7163c

1 files changed, 16 insertions, 22 deletions

diff --git a/policy/apex/json/bbs_policytypes.json b/policy/apex/json/bbs_policytypes.json
index 69096b6..ba62a17 100644
--- a/policy/apex/json/bbs_policytypes.json
+++ b/policy/apex/json/bbs_policytypes.json
@@ -1,5 +1,5 @@
 {
-  "tosca_definitions_version": "tosca_simple_yaml_1_0_0",
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
   "policy_types": {
     "onap.policies.controlloop.operational.Apex": {
       "version": "1.0.0",
@@ -50,17 +50,17 @@
           "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
@@ -68,14 +68,12 @@
         "policy_model_file_name": {
           "type": "string",
           "description": "The name of the file from which to read the APEX policy model",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "policy_type_impl": {
           "type": "string",
           "description": "The policy type implementation from which to read the APEX policy model",
-          "required": false,
-          "default": ""
+          "required": false
         },
         "periodic_event_period": {
           "type": "string",
@@ -119,7 +117,7 @@
           "required": false
         },
         "synchronous_mode": {
-          "type": "bool",
+          "type": "boolean",
           "description": "Specifies the event handler is syncronous (receive event and send response)",
           "required": false,
           "default": false
@@ -127,17 +125,15 @@
         "synchronous_peer": {
           "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": ""
+          "required": false
         },
         "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": ""
+          "required": false
         },
         "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
@@ -145,14 +141,12 @@
         "requestor_peer": {
           "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": ""
+          "required": false
         },
         "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": ""
+          "required": false
         }
       }
     },
@@ -186,7 +180,7 @@
         }
       }
     },
-    "onap.datatypes.policies.controlloop.operational.apex.Environmental": {
+    "onap.datatypes.policies.controlloop.operational.apex.Environment": {
       "derived_from": "tosca.datatypes.Root",
       "properties": {
         "name": {
@@ -237,7 +231,7 @@
           }
         },
         "locking": {
-          "type": "onap.datatypes.policies.controlloop.operational.apex.plugin",
+          "type": "onap.datatypes.policies.controlloop.operational.apex.Plugin",
           "description": "The plugin to be used for locking context in and between APEX PDPs at runtime",
           "required": false
         },