Add telemetry API interface for Lifecycle

Some cleanup consolidating code in cire telemetry apis.

Issue-ID: POLICY-1687
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

Change-Id: Ic5241d45eba06796192cca1e82cba5ae53dc5aaf
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>

5 files changed, 149 insertions, 5 deletions

diff --git a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties
index 2cdc2abf..7fd6599c 100644
--- a/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties
+++ b/feature-lifecycle/src/main/feature/config/feature-lifecycle.properties
@@ -23,12 +23,10 @@ dmaap.source.topics.POLICY-PDP-PAP.servers=${env:DMAAP_SERVERS}
 dmaap.source.topics.POLICY-PDP-PAP.effectiveTopic=${env:POLICY_PDP_PAP_TOPIC}
 dmaap.source.topics.POLICY-PDP-PAP.apiKey=${env:POLICY_PDP_PAP_API_KEY}
 dmaap.source.topics.POLICY-PDP-PAP.apiSecret=${env:POLICY_PDP_PAP_API_SECRET}
-dmaap.source.topics.POLICY-PDP-PAP.managed=false
 dmaap.source.topics.POLICY-PDP-PAP.https=true
 
 dmaap.sink.topics.POLICY-PDP-PAP.servers=${env:DMAAP_SERVERS}
 dmaap.sink.topics.POLICY-PDP-PAP.effectiveTopic=${env:POLICY_PDP_PAP_TOPIC}
 dmaap.sink.topics.POLICY-PDP-PAP.apiKey=${env:POLICY_PDP_PAP_API_KEY}
 dmaap.sink.topics.POLICY-PDP-PAP.apiSecret=${env:POLICY_PDP_PAP_API_SECRET}
-dmaap.sink.topics.POLICY-PDP-PAP.managed=false
 dmaap.sink.topics.POLICY-PDP-PAP.https=true
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFeature.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFeature.java
index 9f292946..aacd5a2e 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFeature.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFeature.java
@@ -34,7 +34,7 @@ public class LifecycleFeature
     /**
      * Lifecycle FSM.
      */
-    protected static final LifecycleFsm fsm = new LifecycleFsm();
+    public static final LifecycleFsm fsm = new LifecycleFsm();
 
     @Override
     public int getSequenceNumber() {
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/server/restful/RestLifecycleManager.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/server/restful/RestLifecycleManager.java
new file mode 100644
index 00000000..e4a93310
--- /dev/null
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/server/restful/RestLifecycleManager.java
@@ -0,0 +1,58 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * 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=========================================================
+ */
+
+package org.onap.policy.drools.server.restful;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.onap.policy.drools.lifecycle.LifecycleFeature;
+import org.onap.policy.drools.lifecycle.LifecycleFsm;
+
+/**
+ * REST Lifecycle Manager.
+ */
+
+@Path("/policy/pdp")
+@Produces(MediaType.APPLICATION_JSON)
+@Consumes(MediaType.APPLICATION_JSON)
+@Api
+public class RestLifecycleManager {
+
+    @GET
+    @Path("engine/lifecycle/fsm")
+    @ApiOperation(value = "Retrieves the Lifecycle FSM",
+        notes = "Lifecycle FSM", response = LifecycleFsm.class)
+    public Response fsm() {
+        return Response.status(Response.Status.OK).entity(LifecycleFeature.fsm).build();
+    }
+
+    @GET
+    @Path("engine/lifecycle/fsm/state")
+    @ApiOperation(value = "Retrieves the Lifecycle FSM",
+        notes = "Lifecycle FSM", response = LifecycleFsm.class)
+    public Response state() {
+        return Response.status(Response.Status.OK).entity(LifecycleFeature.fsm.state()).build();
+    }
+
+}
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java
index b96779aa..181b11cf 100644
--- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java
+++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleStatePassiveTest.java
@@ -66,8 +66,6 @@ public class LifecycleStatePassiveTest extends LifecycleStateRunningTest {
         fsm = new LifecycleFsm();
         fsm.setStatusTimerSeconds(15L);
         simpleStart();
-
-        assertEquals(0, fsm.client.getSink().getRecentEvents().length);
     }
 
     @Test
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java
new file mode 100644
index 00000000..a11bc020
--- /dev/null
+++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/server/restful/RestLifecycleManagerTest.java
@@ -0,0 +1,90 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * 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=========================================================
+ */
+
+package org.onap.policy.drools.server.restful;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
+import org.onap.policy.common.endpoints.http.client.HttpClient;
+import org.onap.policy.common.endpoints.http.server.HttpServletServer;
+import org.onap.policy.common.utils.network.NetworkUtil;
+import org.onap.policy.drools.persistence.SystemPersistence;
+import org.onap.policy.models.pdp.enums.PdpState;
+
+/**
+ * REST Lifecycle Manager Test.
+ */
+public class RestLifecycleManagerTest {
+
+    /**
+     * Set up.
+     */
+    @Before
+     public void setUp() throws Exception {
+        HttpServletServer.factory.destroy();
+        HttpClient.factory.destroy();
+
+        SystemPersistence.manager.setConfigurationDir("target/test-classes");
+
+        HttpClient.factory.build(
+            BusTopicParams.builder()
+                .clientName("lifecycle")
+                .hostname("localhost")
+                .port(8765)
+                .basePath("policy/pdp/engine/lifecycle")
+                .managed(true)
+                .build());
+
+        HttpServletServer server =
+            HttpServletServer.factory.build("lifecycle", "localhost", 8765, "/", true, true);
+        server.addServletClass("/*", RestLifecycleManager.class.getName());
+        server.setSerializationProvider("org.onap.policy.common.gson.JacksonHandler");
+        server.waitedStart(5000L);
+
+        Assert.assertTrue(NetworkUtil.isTcpPortOpen("localhost", 8765, 5, 10000L));
+
+    }
+
+    /**
+     * Tear down.
+     */
+    @After
+    public void tearDown() {
+        HttpServletServer.factory.destroy();
+        HttpClient.factory.destroy();
+    }
+
+    @Test
+    public void fsm() {
+        Response response = HttpClient.factory.get("lifecycle").get("fsm");
+        assertNotNull(HttpClient.getBody(response, String.class));
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+
+        response = HttpClient.factory.get("lifecycle").get("fsm/state");
+        assertEquals(PdpState.TERMINATED, HttpClient.getBody(response, PdpState.class));
+        assertEquals(Status.OK.getStatusCode(), response.getStatus());
+    }
+}
\ No newline at end of file