summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-05 11:17:44 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-02-05 11:17:44 -0500
commit484f1b32f1ef9cfcf74189b701ebb9078ddb0ab8 (patch)
tree64cedb05c5754e4330b928d308d68765c364a037
parent66879d0c4c73b9cd371cdffec3a56f25c340a100 (diff)
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) <dtimoney@att.com>
-rwxr-xr-xdblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/DBResourceManager.java1
-rwxr-xr-xsliapi/model/src/main/yang/sliapi.yang13
2 files changed, 14 insertions, 0 deletions
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 0b8c565f1..236bce6e3 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 98cbb2aa7..b3272be80 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;
}