From 7fb6242e113efb3653c7846ffe7ac2959612daf3 Mon Sep 17 00:00:00 2001
From: "puthuparambil.aditya" <aditya.puthuparambil@bell.ca>
Date: Wed, 23 Sep 2020 12:39:46 +0100
Subject: Enhance gRPC Simulator:

1.Make gRPC Simulator respond to different actions by generating the response on the basis of received request.
2.Include CDS Simulator in policy-models-simulator
3.Introduce a packages module in models-sim to package the docker image of policy-models-simulator which includes all the simulators(pdp-simulator to be added in future) in models.
4.The Jenkins job changes to push this newly created Docker image may be taken in the next release.

Issue-ID: POLICY-2828
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: Ic1663bbe8205c64a8133ea0b0c28152f21d0732a
---
 .../org/onap/policy/simulators/CdsSimulatorTest.java    | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'models-interactions/model-simulators/src/test/java/org')

diff --git a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/CdsSimulatorTest.java b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/CdsSimulatorTest.java
index 5f82b7e94..fea03e3e4 100644
--- a/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/CdsSimulatorTest.java
+++ b/models-interactions/model-simulators/src/test/java/org/onap/policy/simulators/CdsSimulatorTest.java
@@ -3,6 +3,7 @@
  * ONAP
  * ================================================================================
  * Copyright (C) 2020 AT&T Intellectual Property. 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.
@@ -28,11 +29,13 @@ import io.grpc.internal.DnsNameResolverProvider;
 import io.grpc.internal.PickFirstLoadBalancerProvider;
 import io.grpc.netty.NettyChannelBuilder;
 import io.grpc.stub.StreamObserver;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import org.apache.commons.io.IOUtils;
+import org.json.simple.parser.ParseException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -40,7 +43,9 @@ import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessin
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.BluePrintProcessingServiceGrpc.BluePrintProcessingServiceStub;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceInput;
 import org.onap.ccsdk.cds.controllerblueprints.processing.api.ExecutionServiceOutput;
+import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.common.utils.coder.StandardCoder;
+import org.onap.policy.common.utils.resources.ResourceUtils;
 
 public class CdsSimulatorTest {
     private static final StandardCoder coder = new StandardCoder();
@@ -61,7 +66,6 @@ public class CdsSimulatorTest {
     public void test() throws Exception {
         String reqstr = IOUtils.toString(getClass().getResource("cds/cds.request.json"), StandardCharsets.UTF_8);
         ExecutionServiceInput request = coder.decode(reqstr, ExecutionServiceInput.class);
-
         ManagedChannel channel = NettyChannelBuilder.forAddress("localhost", sim.getPort())
             .nameResolverFactory(new DnsNameResolverProvider())
             .loadBalancerFactory(new PickFirstLoadBalancerProvider()).usePlaintext().build();
@@ -111,4 +115,15 @@ public class CdsSimulatorTest {
             channel.shutdown();
         }
     }
+
+    @Test
+    public void testGetResponseString() throws IOException, CoderException, ParseException {
+        CdsSimulator cdsSimulator = new CdsSimulator("localhost", sim.getPort());
+        String reqstr = ResourceUtils.getResourceAsString(
+            "org/onap/policy/simulators/cds/cds.request.json");
+        String responseqstr = ResourceUtils.getResourceAsString(
+            "org/onap/policy/simulators/cds/pm_control-create-subscription.json");
+        ExecutionServiceInput request = coder.decode(reqstr, ExecutionServiceInput.class);
+        assertEquals(responseqstr, cdsSimulator.getResponseString(request, 0));
+    }
 }
-- 
cgit 1.2.3-korg