Merge "Support for MariaDB"

2 files changed, 19 insertions, 15 deletions

diff --git a/sdnr/wt/data-provider/provider/src/main/resources/about/README.json b/sdnr/wt/data-provider/provider/src/main/resources/about/README.json
new file mode 100644
index 000000000..f39a4c233
--- /dev/null
+++ b/sdnr/wt/data-provider/provider/src/main/resources/about/README.json
@@ -0,0 +1,16 @@
+{
+    "version-info":{
+        "ONAP-release":"{release-name}",
+        "ONAP-release-version":"{release-version}",
+        "Opendaylight-release":"{odl-version}",
+        "ONAP-CCSDK-version":"{ccsdk-version}",
+        "Build-timestamp":"{build-time}",
+        "Yangtools-version":"{yangtools-version}",
+        "MD-SAL-version":"{mdsal-version}",
+        "SDN-R packages version":"{package-version} ({package-githash})",
+        "Cluster size":"{cluster-size}"
+    },
+    "device-managers":{devicemanagers},
+    "system-info":{}
+
+}
\ No newline at end of file
diff --git a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index 686af61d6..d5f8a991a 100644
--- a/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/sdnr/wt/data-provider/provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -28,23 +28,10 @@
 
     <reference id="rpcProviderService"
                interface="org.opendaylight.mdsal.binding.api.RpcProviderService"/>
-    <reference id="bundleService"
-                interface="org.apache.karaf.bundle.core.BundleService" />
-
-    <bean id="readyServlet"
-          class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.ReadyHttpServlet">
-          <property name="bundleService" ref="bundleService"/>
-    </bean>
-    <service interface="javax.servlet.http.HttpServlet"
-             ref="readyServlet">
-        <service-properties>
-            <entry key="alias" value="/ready"/>
-        </service-properties>
-    </service>
-
+    <reference id="dataBroker" interface="org.opendaylight.mdsal.binding.api.DataBroker"/>
+ 
     <bean id="aboutServlet"
           class="org.onap.ccsdk.features.sdnr.wt.dataprovider.http.about.AboutHttpServlet">
-<!--           <property name="bundleService" ref="bundleService"/> -->
     </bean>
     <service interface="javax.servlet.http.HttpServlet"
              ref="aboutServlet">
@@ -87,6 +74,7 @@
         <property name="treeServlet" ref="treeServlet"/>
         <property name="mediatorServerServlet" ref="msServlet"/>
         <property name="userdataServlet" ref="userdataServlet"/>
+        <property name="dataBroker" ref="dataBroker" />
     </bean>
 
     <bean id="yangServlet"