summaryrefslogtreecommitdiffstats
path: root/examples/examples-decisionmaker/src
diff options
context:
space:
mode:
authora.sreekumar <ajith.sreekumar@bell.ca>2020-09-02 17:19:26 +0100
committera.sreekumar <ajith.sreekumar@bell.ca>2020-09-09 10:18:02 +0100
commit4c5c31eb9a2513af080d60d0f537b8339856150d (patch)
tree79aaf0d50cc261f57ce77f2eeae927c3c264478f /examples/examples-decisionmaker/src
parentd350fd659d716ca0b1678029230cc799cead2056 (diff)
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>
Diffstat (limited to 'examples/examples-decisionmaker/src')
-rw-r--r--examples/examples-decisionmaker/src/main/resources/tosca/ToscaTemplate.json17
-rw-r--r--examples/examples-decisionmaker/src/test/java/org/onap/policy/apex/examples/decisionmaker/DecisionMakerRunner.java27
2 files changed, 32 insertions, 12 deletions
diff --git a/examples/examples-decisionmaker/src/main/resources/tosca/ToscaTemplate.json b/examples/examples-decisionmaker/src/main/resources/tosca/ToscaTemplate.json
new file mode 100644
index 000000000..c9e11d49b
--- /dev/null
+++ b/examples/examples-decisionmaker/src/main/resources/tosca/ToscaTemplate.json
@@ -0,0 +1,17 @@
+{
+ "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+ "topology_template": {
+ "policies": [
+ {
+ "onap.policies.native.apex.DecisionMaker": {
+ "type": "onap.policies.native.Apex",
+ "type_version": "1.0.0",
+ "name": "onap.policies.native.apex.DecisionMaker",
+ "version": "1.0.0",
+ "properties": {
+ }
+ }
+ }
+ ]
+ }
+}
diff --git a/examples/examples-decisionmaker/src/test/java/org/onap/policy/apex/examples/decisionmaker/DecisionMakerRunner.java b/examples/examples-decisionmaker/src/test/java/org/onap/policy/apex/examples/decisionmaker/DecisionMakerRunner.java
index 1e264ab2c..47558a497 100644
--- a/examples/examples-decisionmaker/src/test/java/org/onap/policy/apex/examples/decisionmaker/DecisionMakerRunner.java
+++ b/examples/examples-decisionmaker/src/test/java/org/onap/policy/apex/examples/decisionmaker/DecisionMakerRunner.java
@@ -1,26 +1,27 @@
/*-
* ============LICENSE_START=======================================================
* Copyright (C) 2019 Nordix Foundation.
+ * Modifications Copyright (C) 2020 Bell Canada. 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.
- *
+ *
* SPDX-License-Identifier: Apache-2.0
* ============LICENSE_END=========================================================
*/
package org.onap.policy.apex.examples.decisionmaker;
-import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain;
+import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain;
import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
import org.onap.policy.apex.service.engine.main.ApexMain;
@@ -37,22 +38,24 @@ public class DecisionMakerRunner {
"-c",
"src/main/resources/policy/DecisionMakerPolicyModel.apex",
"-l",
- "target/DecisionMakerPolicyModel.log",
- "-o",
- "target/classes/DecisionMakerPolicyModel.json"
+ "target/DecisionMakerPolicy.log",
+ "-ac",
+ "src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServerNoModel.json",
+ "-t",
+ "src/main/resources/tosca/ToscaTemplate.json",
+ "-ot",
+ "target/classes/DecisionMakerPolicy.json"
};
// @formatter:on
- new ApexCommandLineEditorMain(cliArgs);
+ new ApexCliToscaEditorMain(cliArgs);
// @formatter:off
final String[] apexArgs = {
"-rfr",
"target/classes",
- "-c",
- "src/main/resources/examples/config/DecisionMaker/ApexConfigRESTServerNoModel.json",
- "-m",
- "target/classes/DecisionMakerPolicyModel.json"
+ "-p",
+ "target/classes/DecisionMakerPolicy.json"
};
// @formatter:on