diff options
Diffstat (limited to 'examples/examples-onap-vcpe')
3 files changed, 26 insertions, 26 deletions
diff --git a/examples/examples-onap-vcpe/src/main/resources/tosca/ToscaTemplate.json b/examples/examples-onap-vcpe/src/main/resources/tosca/ToscaTemplate.json index ca80a2ea0..12ed0b5c0 100644 --- a/examples/examples-onap-vcpe/src/main/resources/tosca/ToscaTemplate.json +++ b/examples/examples-onap-vcpe/src/main/resources/tosca/ToscaTemplate.json @@ -1,5 +1,5 @@ { - "tosca_definitions_version": "tosca_simple_yaml_1_0_0", + "tosca_definitions_version": "tosca_simple_yaml_1_1_0", "topology_template": { "policies": [ { diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java index 4f6b6101c..768f372de 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeRunner.java @@ -1,26 +1,27 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2018 Ericsson. All rights reserved. + * 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.domains.onap.vcpe; -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; @@ -38,21 +39,23 @@ public class OnapVcpeRunner { "src/main/resources/policy/ONAPvCPEPolicyModel.apex", "-l", "target/ONAPvCPEPolicyModel.log", - "-o", - "target/classes/ONAPvCPEPolicyModel.json" + "-ac", + "src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json", + "-t", + "src/main/resources/tosca/ToscaTemplate.json", + "-ot", + "target/classes/ONAPvCPEPolicy.json" }; // @formatter:on - new ApexCommandLineEditorMain(cliArgs); + new ApexCliToscaEditorMain(cliArgs); // @formatter:off final String[] apexArgs = { "-rfr", "target/classes", - "-c", - "src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json", - "-m", - "target/classes/ONAPvCPEPolicyModel.json" + "-p", + "target/classes/ONAPvCPEPolicy.json" }; // @formatter:on @@ -61,7 +64,7 @@ public class OnapVcpeRunner { ThreadUtilities.sleep(1000000); apexMain.shutdown(); } - + public static void main(String[] args) throws ApexException { new OnapVcpeRunner(); } diff --git a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java index f3bf30837..310c0c08b 100644 --- a/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java +++ b/examples/examples-onap-vcpe/src/test/java/org/onap/policy/apex/domains/onap/vcpe/OnapVcpeStandaloneRunner.java @@ -20,7 +20,7 @@ package org.onap.policy.apex.domains.onap.vcpe; -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; @@ -36,26 +36,23 @@ public class OnapVcpeStandaloneRunner { final String[] cliArgs = new String[] { "-c", "src/main/resources/policy/ONAPvCPEPolicyModelStandalone.apex", - "-l", - "target/ONAPvCPEPolicyModel.log", - "-o", - "target/classes/ONAPvCPEPolicyModelStandalone.json" + "-ac", + "src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json", + "-t", + "src/main/resources/tosca/ToscaTemplate.json", + "-ot", + "target/classes/APEXPolicy.json" }; // @formatter:on - new ApexCommandLineEditorMain(cliArgs); + new ApexCliToscaEditorMain(cliArgs); // @formatter:off final String[] apexArgs = { - "-rfr", - "target/classes", - "-c", - "src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json", - "-m", - "target/classes/ONAPvCPEPolicyModelStandalone.json" + "-p", + "target/classes/APEXPolicy.json" }; // @formatter:on - final ApexMain apexMain = new ApexMain(apexArgs); ThreadUtilities.sleep(1000000); |