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>
---
 .../policy/apex/examples/grpc/TestApexGrpcExample.java    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'examples/examples-grpc')

diff --git a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
index 35c21d669..7f799c24f 100644
--- a/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
+++ b/examples/examples-grpc/src/test/java/org/onap/policy/apex/examples/grpc/TestApexGrpcExample.java
@@ -1,6 +1,7 @@
 /*-
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2020 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.
@@ -30,7 +31,7 @@ import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.core.Response;
 import org.junit.Test;
-import org.onap.policy.apex.auth.clieditor.ApexCommandLineEditorMain;
+import org.onap.policy.apex.auth.clieditor.tosca.ApexCliToscaEditorMain;
 import org.onap.policy.apex.service.engine.main.ApexMain;
 
 /**
@@ -48,20 +49,22 @@ public class TestApexGrpcExample {
             "src/main/resources/policy/APEXgRPCPolicy.apex",
             "-l",
             "target/APEXgRPCPolicyModel.log",
-            "-o",
+            "-ac",
+            "src/main/resources/examples/config/APEXgRPC/ApexConfig.json",
+            "-t",
+            "src/main/resources/tosca/ToscaTemplate.json",
+            "-ot",
             "target/classes/APEXgRPCPolicy.json"
         };
         // @formatter:on
 
-        new ApexCommandLineEditorMain(cliArgs);
+        new ApexCliToscaEditorMain(cliArgs);
 
         // @formatter:off
         final String[] apexArgs = {
             "-rfr",
             "target/classes",
-            "-c",
-            "src/main/resources/examples/config/APEXgRPC/ApexConfig.json",
-            "-m",
+            "-p",
             "target/classes/APEXgRPCPolicy.json"
         };
         // @formatter:on
-- 
cgit 1.2.3-korg