From 484f1b32f1ef9cfcf74189b701ebb9078ddb0ab8 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Tue, 5 Feb 2019 11:17:44 -0500 Subject: Add dummy input Fluorine version of restconf does not handle RPCs with no input correctly. So, need to work around that by defining dummy input for SLI-API vlbcheck and healthcheck APIs Change-Id: I6a78a899937e1bb9bd7674530166a493875ca3bf Issue-ID: CCSDK-1035 Signed-off-by: Timoney, Dan (dt5972) --- .../org/onap/ccsdk/sli/core/dblib/DBResourceManager.java | 1 + sliapi/model/src/main/yang/sliapi.yang | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java index 0b8c565f..236bce6e 100755 --- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java +++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java @@ -97,6 +97,7 @@ public class DBResourceManager implements DataSource, DataAccessor, DBResourceOb // TODO : hack to force classloader to cache mariadb driver. This shouldnt be necessary, // but for some reason it is (without this, dblib throws ClassNotFound on mariadb driver // and fails to load). + LOGGER.info("Creating dummy instance of org.mariadb.jdbc.Driver"); Driver dvr = new org.mariadb.jdbc.Driver(); dvr = null; diff --git a/sliapi/model/src/main/yang/sliapi.yang b/sliapi/model/src/main/yang/sliapi.yang index 98cbb2aa..b3272be8 100755 --- a/sliapi/model/src/main/yang/sliapi.yang +++ b/sliapi/model/src/main/yang/sliapi.yang @@ -103,12 +103,25 @@ module SLI-API { } rpc healthcheck { + // OpenDaylight Fluorine version of restconf cannot handle RPCs with no input + input { + leaf dummy { + type string; + } + } output { uses response-fields; } } rpc vlbcheck { + // OpenDaylight Fluorine version of restconf cannot handle RPCs with no input + input { + leaf dummy + { + type string; + } + } output { uses response-fields; } -- cgit 1.2.3-korg