From 4c5c31eb9a2513af080d60d0f537b8339856150d Mon Sep 17 00:00:00 2001
From: "a.sreekumar" <ajith.sreekumar@bell.ca>
Date: Wed, 2 Sep 2020 17:19:26 +0100
Subject: APEX standalone support for ToscaPolicy format

Legacy format support is removed, and Tosca format support is added.

Change-Id: I3cfc181ccb5471a5d224c0162af18c1fa0fdbc70
Issue-ID: POLICY-2812
Signed-off-by: a.sreekumar <ajith.sreekumar@bell.ca>
---
 .../serviceExecutorBadPluginNameParams.json        | 47 +++++++++++++++-------
 1 file changed, 32 insertions(+), 15 deletions(-)

(limited to 'services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json')

diff --git a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json
index 4a28d58aa..df53f5d63 100644
--- a/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json
+++ b/services/services-engine/src/test/resources/parameters/serviceExecutorBadPluginNameParams.json
@@ -1,23 +1,40 @@
 {
-    "engineServiceParameters": {
-        "name": "MyApexEngine",
-        "version": "0.0.1",
-        "id": 45,
-        "instanceCount": 345,
-        "deploymentPort": 65522,
-        "policyModelFileName": "src/test/resources/policymodels/SmallModel.json",
-        "engineParameters": {
-            "executorParameters": {
-                "JAVASCRIPT": {
+  "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+  "topology_template": {
+    "policies": [
+      {
+        "onap.policies.apex.Simplecontrolloop": {
+          "type": "onap.policies.native.Apex",
+          "type_version": "1.0.0",
+          "name": "onap.policies.apex.Simplecontrolloop",
+          "version": "1.0.0",
+          "properties": {
+            "engineServiceParameters": {
+              "name": "MyApexEngine",
+              "version": "0.0.1",
+              "id": 45,
+              "instanceCount": 345,
+              "deploymentPort": 65522,
+              "policy_type_impl": {
+                "apexPolicyModel": {}
+              },
+              "engineParameters": {
+                "executorParameters": {
+                  "JAVASCRIPT": {
                     "parameterClassName": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters"
-                },
-                "ZOOBY": {
+                  },
+                  "ZOOBY": {
                     "parameterClassNamelooby": "org.onap.policy.apex.service.engine.parameters.dummyclasses.SuperDooperExecutorParameters"
-                },
-                "LOOBY": {
+                  },
+                  "LOOBY": {
                     "parameterClassNamelooby": ""
+                  }
                 }
+              }
             }
+          }
         }
-    }
+      }
+    ]
+  }
 }
\ No newline at end of file
-- 
cgit 1.2.3-korg