summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2020-09-08 14:41:11 +0000
committerGerrit Code Review <gerrit@onap.org>2020-09-08 14:41:11 +0000
commit2329ed4ea29caa5358cf1cd95b4bb54136e0f436 (patch)
tree876a9a7e913e76d903a4d3dd8ac30cba0a934031
parent963fc801d8a38f047e67b0b8aa2bdfeba6a58c81 (diff)
parente73281177c4d6069d410a47d152cdaf598d09dac (diff)
Merge "DMAAP Listener for ranSlice Feature support"
-rw-r--r--dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncRANSliceDmaapConsumer.java92
-rw-r--r--dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestSdncRANSliceDmaapConsumer.java166
2 files changed, 258 insertions, 0 deletions
diff --git a/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncRANSliceDmaapConsumer.java b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncRANSliceDmaapConsumer.java
new file mode 100644
index 000000000..f1749f99b
--- /dev/null
+++ b/dmaap-listener/src/main/java/org/onap/ccsdk/sli/northbound/dmaapclient/SdncRANSliceDmaapConsumer.java
@@ -0,0 +1,92 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * reserved.
+ * Modifications Copyright © 2018 IBM.
+ * ================================================================================
+ * 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.ccsdk.sli.northbound.dmaapclient;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SdncRANSliceDmaapConsumer extends SdncDmaapConsumerImpl {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SdncRANSliceDmaapConsumer.class);
+
+ private static final String BODY = "body";
+ private static final String RPC = "rpc-name";
+
+ @Override
+ public void processMsg(String msg) throws InvalidMessageException {
+
+ if (msg == null) {
+ throw new InvalidMessageException("Null RANSlice message");
+ }
+
+ ObjectMapper oMapper = new ObjectMapper();
+ JsonNode ranSliceRootNode;
+ try {
+ ranSliceRootNode = oMapper.readTree(msg);
+ } catch (Exception e) {
+ throw new InvalidMessageException("Cannot parse RANSlice json input", e);
+ }
+
+ JsonNode bodyNode = ranSliceRootNode.get(BODY);
+ if(bodyNode == null) {
+ LOG.warn("Missing body in RANSlice message");
+ return;
+ }
+ String rpcMsgbody;
+ try {
+ ObjectMapper mapper = new ObjectMapper();
+ rpcMsgbody = mapper.writeValueAsString(bodyNode);
+
+ } catch (Exception e) {
+ LOG.error("Unable to parse body in RANSlice message", e);
+ return;
+ }
+
+ JsonNode rpcNode = ranSliceRootNode.get(RPC);
+ if(rpcNode == null) {
+ LOG.warn("Missing node in RANSlice message- " + RPC);
+ return;
+ }
+ String rpc = rpcNode.textValue();
+ String sdncEndpoint = "ran-slice-api:" + rpc;
+
+ try {
+ String odlUrlBase = getProperty("sdnc.odl.url-base");
+ String odlUser = getProperty("sdnc.odl.user");
+ String odlPassword = getProperty("sdnc.odl.password");
+ LOG.info("POST RANSlice Request " + rpcMsgbody);
+ if ((odlUrlBase != null) && (odlUrlBase.length() > 0)) {
+ SdncOdlConnection conn = SdncOdlConnection.newInstance(odlUrlBase + "/" + sdncEndpoint, odlUser, odlPassword);
+
+ conn.send("POST", "application/json", rpcMsgbody);
+ } else {
+ LOG.warn("Unable to POST RANSlice message. SDNC URL not available. body:\n" + rpcMsgbody);
+ }
+ } catch (Exception e) {
+ LOG.error("Unable to process message", e);
+ }
+ }
+}
diff --git a/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestSdncRANSliceDmaapConsumer.java b/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestSdncRANSliceDmaapConsumer.java
new file mode 100644
index 000000000..50c427ec1
--- /dev/null
+++ b/dmaap-listener/src/test/java/org/onap/ccsdk/sli/northbound/dmaapclient/TestSdncRANSliceDmaapConsumer.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright (c) 2017. Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+ * Morbi non lorem porttitor neque feugiat blandit. Ut vitae ipsum eget quam lacinia accumsan.
+ * Etiam sed turpis ac ipsum condimentum fringilla. Maecenas magna.
+ * Proin dapibus sapien vel ante. Aliquam erat volutpat. Pellentesque sagittis ligula eget metus.
+ * Vestibulum commodo. Ut rhoncus gravida arcu.
+ */
+
+package org.onap.ccsdk.sli.northbound.dmaapclient;
+
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.util.Map;
+import java.util.Properties;
+
+import org.apache.commons.io.FileUtils;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class TestSdncRANSliceDmaapConsumer {
+ private static final String ranSliceInput =
+ "{\r\n" +
+ " \"version\": \"ranSlice-dmaap.version\",\r\n" +
+ " \"cambria.partition\": \"SDNC\",\r\n" +
+ " \"correlation-id\": \"ranSlice-dmaap.correlation-id\",\r\n" +
+ " \"rpc-name\": \"upgrade-software\",\r\n" +
+ " \"type\": \"ranSlice-dmaap.type\",\r\n" +
+ " \"body\": {\r\n" +
+ " \"input\": {\r\n" +
+ " \"common-header\": {\r\n" +
+ " \"api-ver\": \"ranSlice-dmaap.api-ver\",\r\n" +
+ " \"flags\": {\r\n" +
+ " \"ttl\": \"ranSlice-dmaap.flags.mode\",\r\n" +
+ " \"force\": \"ranSlice-dmaap.flags.force\",\r\n" +
+ " \"mode\": \"ranSlice-dmaap.flags.mode\"\r\n" +
+ " },\r\n" +
+ " \"originator-id\": \"ranSlice-dmaap.originator-id\",\r\n" +
+ " \"request-id\": \"ranSlice-dmaap.request-id\",\r\n" +
+ " \"sub-request-id\": \"ranSlice-dmaap.sub-request-id\",\r\n" +
+ " \"timestamp\": \"ranSlice-dmaap.timestamp\"\r\n" +
+ " },\r\n" +
+ " \"payload\": \"ranSlice-dmaap.payload\"\r\n" +
+ " }\r\n" +
+ " }\r\n" +
+ "}";
+
+
+ @Test
+ public void test() throws Exception {
+ Properties props = new Properties();
+
+ SdncRANSliceDmaapConsumer consumer = new SdncRANSliceDmaapConsumer();
+ InputStream propStr = TestSdncRANSliceDmaapConsumer.class.getResourceAsStream("/dmaap-consumer-1.properties");
+ props.load(propStr);
+ consumer.init(props, "src/test/resources/dmaap-consumer-1.properties");
+ consumer.processMsg(ranSliceInput);
+ }
+
+ @Test(expected = InvalidMessageException.class)
+ public void testProcessMsgNullMessage() throws Exception {
+ SdncRANSliceDmaapConsumer consumer = new SdncRANSliceDmaapConsumer();
+ consumer.processMsg(null);
+ }
+
+ @Test
+ public void testProcessMsgMissingBody() throws Exception {
+ String msg = "{\r\n" +
+ " \"version\": \"ranSlice-dmaap.version\",\r\n" +
+ " \"cambria.partition\": \"SDNC\",\r\n" +
+ " \"correlation-id\": \"ranSlice-dmaap.correlation-id\",\r\n" +
+ " \"rpc-name\": \"upgrade-software\",\r\n" +
+ " \"type\": \"ranSlice-dmaap.type\",\r\n" +
+ " \"body1\": {\r\n" +
+ " \"input\": {\r\n" +
+ " \"common-header\": {\r\n" +
+ " \"api-ver\": \"ranSlice-dmaap.api-ver\",\r\n" +
+ " \"flags\": {\r\n" +
+ " \"ttl\": \"ranSlice-dmaap.flags.mode\",\r\n" +
+ " \"force\": \"ranSlice-dmaap.flags.force\",\r\n" +
+ " \"mode\": \"ranSlice-dmaap.flags.mode\"\r\n" +
+ " },\r\n" +
+ " \"originator-id\": \"ranSlice-dmaap.originator-id\",\r\n" +
+ " \"request-id\": \"ranSlice-dmaap.request-id\",\r\n" +
+ " \"sub-request-id\": \"ranSlice-dmaap.sub-request-id\",\r\n" +
+ " \"timestamp\": \"ranSlice-dmaap.timestamp\"\r\n" +
+ " },\r\n" +
+ " \"payload\": \"ranSlice-dmaap.payload\"\r\n" +
+ " }\r\n" +
+ " }\r\n" +
+ "}";
+
+ SdncRANSliceDmaapConsumer consumer = new SdncRANSliceDmaapConsumer();
+ consumer.processMsg(msg);
+ }
+
+ @Test
+ public void testProcessMsgInvalidRPC() throws Exception {
+ String msg = "{\r\n" +
+ " \"version\": \"ranSlice-dmaap.version\",\r\n" +
+ " \"cambria.partition\": \"SDNC\",\r\n" +
+ " \"correlation-id\": \"ranSlice-dmaap.correlation-id\",\r\n" +
+ " \"rpc-name1\": \"upgrade-software\",\r\n" +
+ " \"type\": \"ranSlice-dmaap.type\",\r\n" +
+ " \"body\": {\r\n" +
+ " \"input\": {\r\n" +
+ " \"common-header\": {\r\n" +
+ " \"api-ver\": \"ranSlice-dmaap.api-ver\",\r\n" +
+ " \"flags\": {\r\n" +
+ " \"ttl\": \"ranSlice-dmaap.flags.mode\",\r\n" +
+ " \"force\": \"ranSlice-dmaap.flags.force\",\r\n" +
+ " \"mode\": \"ranSlice-dmaap.flags.mode\"\r\n" +
+ " },\r\n" +
+ " \"originator-id\": \"ranSlice-dmaap.originator-id\",\r\n" +
+ " \"request-id\": \"ranSlice-dmaap.request-id\",\r\n" +
+ " \"sub-request-id\": \"ranSlice-dmaap.sub-request-id\",\r\n" +
+ " \"timestamp\": \"ranSlice-dmaap.timestamp\"\r\n" +
+ " },\r\n" +
+ " \"payload\": \"ranSlice-dmaap.payload\"\r\n" +
+ " }\r\n" +
+ " }\r\n" +
+ "}";
+
+ SdncRANSliceDmaapConsumer consumer = new SdncRANSliceDmaapConsumer();
+ consumer.processMsg(msg);
+ }
+
+ @Test
+ public void testProcessMsgInvalidPartition() throws Exception {
+ String msg = "{\r\n" +
+ " \"version\": \"ranSlice-dmaap.version\",\r\n" +
+ " \"cambria.partition\": \"BAD\",\r\n" +
+ " \"correlation-id\": \"ranSlice-dmaap.correlation-id\",\r\n" +
+ " \"rpc-name\": \"upgrade-software\",\r\n" +
+ " \"type\": \"ranSlice-dmaap.type\",\r\n" +
+ " \"body\": {\r\n" +
+ " \"input\": {\r\n" +
+ " \"common-header\": {\r\n" +
+ " \"api-ver\": \"ranSlice-dmaap.api-ver\",\r\n" +
+ " \"flags\": {\r\n" +
+ " \"ttl\": \"ranSlice-dmaap.flags.mode\",\r\n" +
+ " \"force\": \"ranSlice-dmaap.flags.force\",\r\n" +
+ " \"mode\": \"ranSlice-dmaap.flags.mode\"\r\n" +
+ " },\r\n" +
+ " \"originator-id\": \"ranSlice-dmaap.originator-id\",\r\n" +
+ " \"request-id\": \"ranSlice-dmaap.request-id\",\r\n" +
+ " \"sub-request-id\": \"ranSlice-dmaap.sub-request-id\",\r\n" +
+ " \"timestamp\": \"ranSlice-dmaap.timestamp\"\r\n" +
+ " },\r\n" +
+ " \"payload\": \"ranSlice-dmaap.payload\"\r\n" +
+ " }\r\n" +
+ " }\r\n" +
+ "}";
+
+
+ SdncRANSliceDmaapConsumer consumer = new SdncRANSliceDmaapConsumer();
+ consumer.processMsg(msg);
+ }
+}