From e279f0ec53147f53d7a48041c7b433b7738ae37d Mon Sep 17 00:00:00 2001
From: Jim Hahn <jrh3@att.com>
Date: Wed, 11 Dec 2019 11:32:01 -0500
Subject: Fix timeout bug in dmaap simulator

Also added a start script that can be used to execute the simulator
in stand-alone mode (i.e., outside of a docker container).

Change-Id: I26550ad36cfd2448c96cf0c09fec24e60ffd815b
Issue-ID: POLICY-2298
Signed-off-by: Jim Hahn <jrh3@att.com>
---
 .../sim/dmaap/provider/DmaapSimProvider.java       | 12 ++------
 .../src/main/package/tarball/assembly.xml          | 10 +++++++
 .../src/main/resources/startDmaap.sh               | 32 ++++++++++++++++++++++
 .../sim/dmaap/provider/DmaapSimProviderTest.java   |  2 +-
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh

(limited to 'models-sim')

diff --git a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java
index d11d1b397..c954ab8dc 100644
--- a/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java
+++ b/models-sim/models-sim-dmaap/src/main/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProvider.java
@@ -129,15 +129,9 @@ public class DmaapSimProvider extends ServiceManagerContainer {
             List<String> lst = topic2data.computeIfAbsent(topicName, this::makeTopicData).read(consumerGroup, limit,
                             timeoutMs);
 
-            if (lst.isEmpty() && timeoutMs > 0) {
-                LOGGER.debug("Topic: {}, Timed out waiting for messages: {}: {}", topicName, consumerGroup, consumerId);
-                return Response.status(Status.REQUEST_TIMEOUT).entity(lst).build();
-
-            } else {
-                LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, consumerGroup, lst.size(),
-                                consumerId);
-                return Response.status(Status.OK).entity(lst).build();
-            }
+            LOGGER.debug("Topic: {}, Retrieved {} messages for: {}: {}", topicName, lst.size(), consumerGroup,
+                            consumerId);
+            return Response.status(Status.OK).entity(lst).build();
 
         } catch (InterruptedException e) {
             LOGGER.warn("Topic: {}, Request for DMaaP message interrupted: {}: {}", topicName, consumerGroup,
diff --git a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
index e4671f81a..8717701b6 100644
--- a/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
+++ b/models-sim/models-sim-dmaap/src/main/package/tarball/assembly.xml
@@ -36,6 +36,16 @@
         </dependencySet>
     </dependencySets>
     <fileSets>
+        <fileSet>
+            <directory>${project.basedir}/src/main/resources
+            </directory>
+            <includes>
+                <include>startDmaap.sh</include>
+            </includes>
+            <outputDirectory>bin</outputDirectory>
+            <lineEnding>unix</lineEnding>
+            <fileMode>755</fileMode>
+        </fileSet>
         <fileSet>
             <directory>${project.basedir}/src/main/resources
             </directory>
diff --git a/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh b/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh
new file mode 100644
index 000000000..1d04e7cb4
--- /dev/null
+++ b/models-sim/models-sim-dmaap/src/main/resources/startDmaap.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+#
+# ============LICENSE_START=======================================================
+# ONAP Policy Models
+# ================================================================================
+# Copyright (C) 2019 AT&T Intellectual Property. 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.
+# ============LICENSE_END=========================================================
+#
+
+#
+# Starts the DMaaP simulator using the default configuration.
+#
+
+trap 'exit 1' ERR
+
+cd ${0%/*}/..
+
+java -cp "lib/*" \
+    org.onap.policy.models.sim.dmaap.startstop.Main -c etc/DefaultConfig.json
diff --git a/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProviderTest.java b/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProviderTest.java
index f8c141614..1473e0242 100644
--- a/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProviderTest.java
+++ b/models-sim/models-sim-dmaap/src/test/java/org/onap/policy/models/sim/dmaap/provider/DmaapSimProviderTest.java
@@ -192,7 +192,7 @@ public class DmaapSimProviderTest {
         when(data1.read(any(), anyInt(), anyLong())).thenReturn(Collections.emptyList());
 
         Response resp = prov.processDmaapMessageGet(TOPIC1, CONSUMER1, CONSUMER_ID1, 3, 300L);
-        assertEquals(Status.REQUEST_TIMEOUT.getStatusCode(), resp.getStatus());
+        assertEquals(Status.OK.getStatusCode(), resp.getStatus());
         assertEquals("[]", resp.getEntity().toString());
     }
 
-- 
cgit 1.2.3-korg