Proposal to remove OSGi dependencies from the CCSDK project

Dependencies on the OSGi frameworks and libraries are removed
by integrating the CCSDK project with the lighty.io.
It's a toolkit that allows to use ODL services (in this case
core services and the Restconf) without the dependency
on the Karaf framework and the Blueprint DI.

In this change are created the lighty.io modules which
initialize and expose same services as the Blueprint DI in
the blueprint.xml files.

More info about the lighty.io - https://lighty.io

Change-Id: I38171e83b018a18bfd8eaec95d4dc2fa2e3f5b36
Signed-off-by: Matej Perina <matej.perina@pantheon.tech>
Signed-off-by: Samuel Kontris <samuel.kontris@pantheon.tech>

4 files changed, 719 insertions, 0 deletions

diff --git a/sliapi/lighty/pom.xml b/sliapi/lighty/pom.xml
new file mode 100755
index 00000000..2812d6ba
--- /dev/null
+++ b/sliapi/lighty/pom.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>binding-parent</artifactId>
+		<version>1.4.0-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
+
+	<groupId>org.onap.ccsdk.sli.core</groupId>
+	<artifactId>sliapi-lighty</artifactId>
+	<version>0.6.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+
+	<name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
+	<url>http://maven.apache.org</url>
+
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.onap.ccsdk.sli.core</groupId>
+				<artifactId>ccsdk-lighty-dependency-versions</artifactId>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
+	<dependencies>
+		<dependency>
+			<groupId>io.lighty.core</groupId>
+			<artifactId>lighty-controller</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.ccsdk.sli.core</groupId>
+			<artifactId>sliapi-provider</artifactId>
+			<version>${project.version}</version>
+			<scope>compile</scope>
+		</dependency>
+	</dependencies>
+</project>
diff --git a/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/lighty/SliApiModule.java b/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/lighty/SliApiModule.java
new file mode 100644
index 00000000..24d8958e
--- /dev/null
+++ b/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/lighty/SliApiModule.java
@@ -0,0 +1,64 @@
+/*
+ * ============LICENSE_START==========================================
+ * Copyright (c) 2019 PANTHEON.tech s.r.o.
+ * ===================================================================
+ * 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.core.sliapi.lighty;
+
+import io.lighty.core.controller.api.AbstractLightyModule;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
+import org.onap.ccsdk.sli.core.sliapi.sliapiProviderLighty;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * The implementation of the {@link io.lighty.core.controller.api.LightyModule} that manages and provides services from
+ * the sliapi-provider artifact.
+ */
+public class SliApiModule extends AbstractLightyModule {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SliApiModule.class);
+
+    private final DataBroker dataBroker;
+    private final NotificationPublishService notificationPublishService;
+    private final RpcProviderRegistry rpcRegistry;
+    private final SvcLogicService svcLogic;
+
+    private sliapiProviderLighty sliapiProvider;
+
+    public SliApiModule (DataBroker dataBroker, NotificationPublishService notificationPublishService,
+            RpcProviderRegistry rpcRegistry, SvcLogicService svcLogic) {
+        this.dataBroker = dataBroker;
+        this.notificationPublishService = notificationPublishService;
+        this.rpcRegistry = rpcRegistry;
+        this.svcLogic = svcLogic;
+    }
+
+    @Override
+    protected boolean initProcedure() {
+        LOG.debug("Initializing Lighty module {}...", this.getClass());
+        this.sliapiProvider = new sliapiProviderLighty(dataBroker, notificationPublishService, rpcRegistry, svcLogic);
+        LOG.debug("Lighty module {} initialized", this.getClass());
+        return true;
+    }
+
+    @Override
+    protected boolean stopProcedure() {
+        return true;
+    }
+
+}
diff --git a/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProviderLighty.java b/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProviderLighty.java
new file mode 100644
index 00000000..94698412
--- /dev/null
+++ b/sliapi/lighty/src/main/java/org/onap/ccsdk/sli/core/sliapi/sliapiProviderLighty.java
@@ -0,0 +1,606 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : CCSDK
+ * ================================================================================
+ * Copyright (C) 2017 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.ccsdk.sli.core.sliapi;
+
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.io.BufferedReader;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Enumeration;
+import java.util.LinkedList;
+import java.util.Properties;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.binding.impl.AbstractForwardedDataBroker;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataBroker;
+import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.HealthcheckOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.SLIAPIService;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResults;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.VlbcheckInput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.VlbcheckOutput;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.VlbcheckOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult;
+import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.QName;
+import org.opendaylight.yangtools.yang.common.RpcError.ErrorType;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeWithValue;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetEntryNode;
+import org.opendaylight.yangtools.yang.data.api.schema.LeafSetNode;
+import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
+import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetEntryNodeBuilder;
+import org.opendaylight.yangtools.yang.data.impl.schema.builder.impl.ImmutableLeafSetNodeBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * THIS CLASS IS A COPY OF {@link sliapiProvider} WITH REMOVED OSGi DEPENDENCIES
+ */
+public class sliapiProviderLighty implements AutoCloseable, SLIAPIService {
+
+	private static final Logger LOG = LoggerFactory.getLogger(sliapiProviderLighty.class);
+	private static final String appName = "slitester";
+
+	protected DataBroker dataBroker;
+	protected DOMDataBroker domDataBroker;
+	protected NotificationPublishService notificationService;
+	protected RpcProviderRegistry rpcRegistry;
+
+	private SvcLogicService svcLogic;
+
+	protected BindingAwareBroker.RpcRegistration<SLIAPIService> rpcRegistration;
+
+	private static String SLIAPI_NAMESPACE = "org:onap:ccsdk:sli:core:sliapi";
+	private static String SLIAPI_REVISION = "2016-11-10";
+	private static String SDNC_STATUS_FILE = "SDNC_STATUS_FILE";
+	private static String sdncStatusFile = null;
+
+	private static QName TEST_RESULTS_QNAME = null;
+	private static QName TEST_RESULT_QNAME = null;
+	private static QName TEST_ID_QNAME = null;
+	private static QName RESULTS_QNAME = null;
+	private static final String NON_NULL = "non-null";
+
+	static {
+
+		TEST_RESULTS_QNAME = QName.create(SLIAPI_NAMESPACE, SLIAPI_REVISION, "test-results");
+		TEST_RESULT_QNAME = QName.create(TEST_RESULTS_QNAME, "test-result");
+		TEST_ID_QNAME = QName.create(TEST_RESULT_QNAME, "test-identifier");
+		RESULTS_QNAME = QName.create(TEST_RESULT_QNAME, "results");
+	}
+
+	public sliapiProviderLighty(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+			RpcProviderRegistry rpcProviderRegistry, SvcLogicService svcLogic) {
+		this.LOG.info("Creating provider for " + appName);
+		this.dataBroker = dataBroker;
+		this.notificationService = notificationPublishService;
+		this.rpcRegistry = rpcProviderRegistry;
+		this.svcLogic = svcLogic;
+		initialize();
+	}
+
+	public void initialize() {
+		LOG.info("Initializing provider for " + appName);
+		// initialization code goes here.
+		rpcRegistration = rpcRegistry.addRpcImplementation(SLIAPIService.class, this);
+
+		sdncStatusFile = System.getenv(SDNC_STATUS_FILE);
+		LOG.info("SDNC STATUS FILE = " + sdncStatusFile);
+		LOG.info("Initialization complete for " + appName);
+	}
+
+	protected void initializeChild() {
+		// Override if you have custom initialization intelligence
+	}
+
+	@Override
+	public void close() throws Exception {
+		LOG.info("Closing provider for " + appName);
+		// closing code goes here
+
+		rpcRegistration.close();
+		LOG.info("Successfully closed provider for " + appName);
+	}
+
+	public void setDataBroker(DataBroker dataBroker) {
+		this.dataBroker = dataBroker;
+		if (dataBroker instanceof AbstractForwardedDataBroker) {
+			domDataBroker = ((AbstractForwardedDataBroker) dataBroker).getDelegate();
+		}
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("DataBroker set to " + (dataBroker == null ? "null" : NON_NULL) + ".");
+		}
+	}
+
+	public void setNotificationService(NotificationPublishService notificationService) {
+		this.notificationService = notificationService;
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("Notification Service set to " + (notificationService == null ? "null" : NON_NULL) + ".");
+		}
+	}
+
+	public void setRpcRegistry(RpcProviderRegistry rpcRegistry) {
+		this.rpcRegistry = rpcRegistry;
+		if (LOG.isDebugEnabled()) {
+			LOG.debug("RpcRegistry set to " + (rpcRegistry == null ? "null" : NON_NULL) + ".");
+		}
+	}
+
+	@Override
+	public ListenableFuture<RpcResult<ExecuteGraphOutput>> executeGraph(ExecuteGraphInput input) {
+		RpcResult<ExecuteGraphOutput> rpcResult = null;
+
+		ExecuteGraphOutputBuilder respBuilder = new ExecuteGraphOutputBuilder();
+
+		String calledModule = input.getModuleName();
+		String calledRpc = input.getRpcName();
+		Mode calledMode = input.getMode();
+		String modeStr = "sync";
+
+		if (calledMode == Mode.Async) {
+			modeStr = "async";
+		}
+
+		if (svcLogic == null) {
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Could not locate OSGi SvcLogicService service");
+			respBuilder.setAckFinalIndicator("Y");
+
+			rpcResult = RpcResultBuilder.<ExecuteGraphOutput>status(true).withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		}
+
+		try {
+			if (!svcLogic.hasGraph(calledModule, calledRpc, null, modeStr)) {
+				respBuilder.setResponseCode("404");
+				respBuilder.setResponseMessage(
+						"Directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr + " not found");
+				respBuilder.setAckFinalIndicator("Y");
+
+				rpcResult = RpcResultBuilder.<ExecuteGraphOutput>status(true).withResult(respBuilder.build()).build();
+				return (Futures.immediateFuture(rpcResult));
+			}
+		} catch (Exception e) {
+			LOG.error(
+					"Caught exception looking for directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr,
+					e);
+
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Internal error : could not determine if target graph exists");
+			respBuilder.setAckFinalIndicator("Y");
+
+			rpcResult = RpcResultBuilder.<ExecuteGraphOutput>status(true).withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		}
+
+		// Load properties
+		Properties parms = new Properties();
+
+		// Pass properties using names from sli-parameters
+		for (SliParameter sliParm : input.getSliParameter()) {
+
+			String propValue = "";
+
+			Boolean boolval = sliParm.isBooleanValue();
+
+			if (boolval != null) {
+				propValue = boolval.toString();
+			} else {
+				Integer intval = sliParm.getIntValue();
+				if (intval != null) {
+					propValue = intval.toString();
+				} else {
+					propValue = sliParm.getStringValue();
+					if (propValue == null) {
+						propValue = "";
+					}
+				}
+			}
+			parms.setProperty(sliParm.getParameterName(), propValue);
+		}
+
+		// Also, pass "meta" properties (i.e. pass SliParameter objects themselves)
+		ExecuteGraphInputBuilder inputBuilder = new ExecuteGraphInputBuilder(input);
+
+		SliapiHelper.toProperties(parms, "input", inputBuilder);
+
+		try {
+			LOG.info("Calling directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr);
+
+			if (LOG.isTraceEnabled()) {
+				StringBuffer argList = new StringBuffer();
+				argList.append("Parameters : {");
+				Enumeration e = parms.propertyNames();
+				while (e.hasMoreElements()) {
+					String propName = (String) e.nextElement();
+					argList.append(" (" + propName + "," + parms.getProperty(propName) + ") ");
+				}
+				argList.append("}");
+				LOG.trace(argList.toString());
+				argList = null;
+			}
+
+			Properties respProps = svcLogic.execute(calledModule, calledRpc, null, modeStr, parms, domDataBroker);
+
+			StringBuilder sb = new StringBuilder("{");
+
+			for (Object key : respProps.keySet()) {
+				String keyValue = (String) key;
+				if (keyValue != null && !"".equals(keyValue) && !keyValue.contains("input.sli-parameter")) {
+					sb.append("\"").append(keyValue).append("\": \"").append(respProps.getProperty(keyValue))
+							.append("\",");
+				}
+			}
+
+			sb.setLength(sb.length() - 1);
+			sb.append("}");
+
+			respBuilder.setResponseCode(respProps.getProperty("error-code", "0"));
+			respBuilder.setResponseMessage(respProps.getProperty("error-message", ""));// TODO change response-text to
+																						// response-message to match
+																						// other BVC APIs
+			respBuilder.setAckFinalIndicator(respProps.getProperty("ack-final", "Y"));
+			respBuilder.setContextMemoryJson(sb.toString());
+
+			TestResultBuilder testResultBuilder = new TestResultBuilder();
+
+			SliapiHelper.toBuilder(respProps, testResultBuilder);
+
+			String testIdentifier = testResultBuilder.getTestIdentifier();
+
+			if ((testIdentifier != null) && (testIdentifier.length() > 0)) {
+
+				// Add test results to config tree
+				LOG.debug("Saving test results for test id " + testIdentifier);
+
+				DomSaveTestResult(testResultBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+
+			}
+
+		} catch (Exception e) {
+			LOG.error("Caught exception executing directed graph for" + calledModule + ":" + calledRpc + "," + modeStr
+					+ ">", e);
+
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Internal error : caught exception executing directed graph " + calledModule
+					+ "/" + calledRpc + "/" + modeStr);
+			respBuilder.setAckFinalIndicator("Y");
+
+		}
+
+		rpcResult = RpcResultBuilder.<ExecuteGraphOutput>status(true).withResult(respBuilder.build()).build();
+		return (Futures.immediateFuture(rpcResult));
+	}
+
+	@Override
+	public ListenableFuture<RpcResult<HealthcheckOutput>> healthcheck(HealthcheckInput healthcheckInput) {
+
+		RpcResult<HealthcheckOutput> rpcResult = null;
+
+		HealthcheckOutputBuilder respBuilder = new HealthcheckOutputBuilder();
+
+		String calledModule = "sli";
+		String calledRpc = "healthcheck";
+		String modeStr = "sync";
+
+		if (svcLogic == null) {
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Could not locate OSGi SvcLogicService service");
+			respBuilder.setAckFinalIndicator("Y");
+
+			rpcResult = RpcResultBuilder.<HealthcheckOutput>failed().withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		}
+
+		try {
+			if (!svcLogic.hasGraph(calledModule, calledRpc, null, modeStr)) {
+				respBuilder.setResponseCode("404");
+				respBuilder.setResponseMessage(
+						"Directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr + " not found");
+
+				respBuilder.setAckFinalIndicator("Y");
+
+				rpcResult = RpcResultBuilder.<HealthcheckOutput>status(true).withResult(respBuilder.build()).build();
+				return (Futures.immediateFuture(rpcResult));
+			}
+		} catch (Exception e) {
+			LOG.error(
+					"Caught exception looking for directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr,
+					e);
+
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Internal error : could not determine if target graph exists");
+			respBuilder.setAckFinalIndicator("Y");
+
+			rpcResult = RpcResultBuilder.<HealthcheckOutput>failed().withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		}
+
+		try {
+			LOG.info("Calling directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr);
+
+			Properties parms = new Properties();
+
+			Properties respProps = svcLogic.execute(calledModule, calledRpc, null, modeStr, parms);
+
+			respBuilder.setResponseCode(respProps.getProperty("error-code", "0"));
+			respBuilder.setResponseMessage(respProps.getProperty("error-message", ""));
+			respBuilder.setAckFinalIndicator(respProps.getProperty("ack-final", "Y"));
+
+		} catch (Exception e) {
+			LOG.error("Caught exception executing directed graph for" + calledModule + ":" + calledRpc + "," + modeStr
+					+ ">", e);
+
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Internal error : caught exception executing directed graph " + calledModule
+					+ "/" + calledRpc + "/" + modeStr);
+			respBuilder.setAckFinalIndicator("Y");
+
+		}
+
+		rpcResult = RpcResultBuilder.<HealthcheckOutput>status(true).withResult(respBuilder.build()).build();
+		return (Futures.immediateFuture(rpcResult));
+	}
+
+	public ListenableFuture<RpcResult<VlbcheckOutput>> vlbcheck(VlbcheckInput vlbInput) {
+
+		RpcResult<VlbcheckOutput> rpcResult = null;
+
+		VlbcheckOutputBuilder respBuilder = new VlbcheckOutputBuilder();
+
+		String calledModule = "sli";
+		String calledRpc = "vlbcheck";
+		String modeStr = "sync";
+
+		if (svcLogic == null) {
+			respBuilder.setResponseCode("500");
+			respBuilder.setResponseMessage("Could not locate OSGi SvcLogicService service");
+			respBuilder.setAckFinalIndicator("Y");
+
+			rpcResult = RpcResultBuilder.<VlbcheckOutput>failed().withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		}
+
+		boolean dgExists = true;
+		try {
+			if (!svcLogic.hasGraph(calledModule, calledRpc, null, modeStr)) {
+				dgExists = false;
+			}
+		} catch (Exception e) {
+			LOG.warn(
+					"Caught exception looking for directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr,
+					e);
+
+			dgExists = false;
+		}
+
+		if (dgExists) {
+			try {
+				LOG.info("Calling directed graph for " + calledModule + "/" + calledRpc + "/" + modeStr);
+
+				Properties parms = new Properties();
+
+				Properties respProps = svcLogic.execute(calledModule, calledRpc, null, modeStr, parms);
+
+				respBuilder.setResponseCode(respProps.getProperty("error-code", "0"));
+				respBuilder.setResponseMessage(respProps.getProperty("error-message", ""));
+				respBuilder.setAckFinalIndicator(respProps.getProperty("ack-final", "Y"));
+
+			} catch (Exception e) {
+				LOG.error("Caught exception executing directed graph for" + calledModule + ":" + calledRpc + ","
+						+ modeStr + ">", e);
+
+				respBuilder.setResponseCode("500");
+				respBuilder.setResponseMessage("Internal error : caught exception executing directed graph "
+						+ calledModule + "/" + calledRpc + "/" + modeStr);
+				respBuilder.setAckFinalIndicator("Y");
+
+			}
+
+			rpcResult = RpcResultBuilder.<VlbcheckOutput>status(true).withResult(respBuilder.build()).build();
+			return (Futures.immediateFuture(rpcResult));
+		} else {
+			// check the state based on the config file
+
+			boolean suspended = false;
+			BufferedReader br = null;
+			String line = "";
+
+			if (sdncStatusFile != null) {
+				try {
+					br = new BufferedReader(new FileReader(sdncStatusFile));
+					while ((line = br.readLine()) != null) {
+						if ("ODL_STATE=SUSPENDED".equals(line)) {
+							suspended = true;
+							LOG.debug("vlbcheck: server is suspended");
+						}
+					}
+					br.close();
+				} catch (FileNotFoundException e) {
+					LOG.trace("Caught File not found exception " + sdncStatusFile + "\n", e);
+				} catch (Exception e) {
+					LOG.trace("Failed to read status file " + sdncStatusFile + "\n", e);
+				} finally {
+					if (br != null) {
+						try {
+							br.close();
+						} catch (IOException e) {
+							LOG.warn("Failed to close status file " + sdncStatusFile + "\n", e);
+						}
+					}
+				}
+			}
+
+			if (suspended) {
+				rpcResult = RpcResultBuilder.<VlbcheckOutput>failed()
+						.withError(ErrorType.APPLICATION, "resource-denied", "Server Suspended").build();
+			} else {
+				respBuilder.setResponseMessage("server is normal");
+				rpcResult = RpcResultBuilder.<VlbcheckOutput>status(true).withResult(respBuilder.build()).build();
+			}
+			return (Futures.immediateFuture(rpcResult));
+		}
+	}
+
+	private void DomSaveTestResult(final TestResult entry, boolean merge, LogicalDatastoreType storeType) {
+
+		if (domDataBroker == null) {
+			LOG.error("domDataBroker unset - cannot save test result using DOMDataBroker");
+			return;
+		}
+
+		MapEntryNode resultNode = null;
+
+		try {
+			resultNode = toMapEntryNode(entry);
+		} catch (Exception e) {
+			LOG.error("Caught exception trying to create map entry node", e);
+		}
+
+		if (resultNode == null) {
+			LOG.error("Could not convert entry to MapEntryNode");
+			return;
+		}
+
+		YangInstanceIdentifier testResultsPid = YangInstanceIdentifier.builder().node(TEST_RESULTS_QNAME)
+				.node(QName.create(TEST_RESULTS_QNAME, "test-result")).build();
+		YangInstanceIdentifier testResultPid = testResultsPid
+				.node(new NodeIdentifierWithPredicates(TEST_RESULT_QNAME, resultNode.getIdentifier().getKeyValues()));
+
+		int tries = 2;
+		while (true) {
+			try {
+				DOMDataWriteTransaction wtx = domDataBroker.newWriteOnlyTransaction();
+				if (merge) {
+					LOG.info("Merging test identifier " + entry.getTestIdentifier());
+					wtx.merge(storeType, testResultPid, resultNode);
+				} else {
+					LOG.info("Putting test identifier " + entry.getTestIdentifier());
+					wtx.put(storeType, testResultPid, resultNode);
+				}
+				wtx.submit().checkedGet();
+				LOG.trace("Update DataStore succeeded");
+				break;
+			} catch (final TransactionCommitFailedException e) {
+				if (e instanceof OptimisticLockFailedException) {
+					if (--tries <= 0) {
+						LOG.trace("Got OptimisticLockFailedException on last try - failing ");
+						throw new IllegalStateException(e);
+					}
+					LOG.trace("Got OptimisticLockFailedException - trying again ");
+				} else {
+					LOG.trace("Update DataStore failed");
+					throw new IllegalStateException(e);
+				}
+			}
+		}
+
+	}
+
+	private void SaveTestResult(final TestResult entry, boolean merge, LogicalDatastoreType storeType)
+			throws IllegalStateException {
+		// Each entry will be identifiable by a unique key, we have to create that
+		// identifier
+
+		InstanceIdentifier.InstanceIdentifierBuilder<TestResult> testResultIdBuilder = InstanceIdentifier
+				.<TestResults>builder(TestResults.class).child(TestResult.class, entry.key());
+		InstanceIdentifier<TestResult> path = testResultIdBuilder.build();
+		int tries = 2;
+		while (true) {
+			try {
+				WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+				if (merge) {
+					tx.merge(storeType, path, entry);
+				} else {
+					tx.put(storeType, path, entry);
+				}
+				tx.submit().checkedGet();
+				LOG.trace("Update DataStore succeeded");
+				break;
+			} catch (final TransactionCommitFailedException e) {
+				if (e instanceof OptimisticLockFailedException) {
+					if (--tries <= 0) {
+						LOG.trace("Got OptimisticLockFailedException on last try - failing ");
+						throw new IllegalStateException(e);
+					}
+					LOG.trace("Got OptimisticLockFailedException - trying again ");
+				} else {
+					LOG.trace("Update DataStore failed");
+					throw new IllegalStateException(e);
+				}
+			}
+		}
+	}
+
+	private MapEntryNode toMapEntryNode(TestResult testResult) {
+
+		YangInstanceIdentifier testResultId = YangInstanceIdentifier.builder().node(TEST_RESULTS_QNAME)
+				.node(TEST_RESULT_QNAME).build();
+
+		// Construct results list
+		LinkedList<LeafSetEntryNode<Object>> entryList = new LinkedList<>();
+		for (String result : testResult.getResults()) {
+			LeafSetEntryNode<Object> leafSetEntryNode = ImmutableLeafSetEntryNodeBuilder.create()
+					.withNodeIdentifier(new NodeWithValue(RESULTS_QNAME, result)).withValue(result).build();
+			entryList.add(leafSetEntryNode);
+		}
+		// Construct results LeafSetNode
+		LeafSetNode<?> resultsNode = ImmutableLeafSetNodeBuilder.create()
+				.withNodeIdentifier(new NodeIdentifier(RESULTS_QNAME)).withValue(entryList).build();
+
+		// Construct test result ContainerNode with 2 children - test-identifier leaf
+		// and results leaf-set
+		MapEntryNode testResultNode = ImmutableNodes.mapEntryBuilder()
+				.withNodeIdentifier(new NodeIdentifierWithPredicates(TEST_RESULT_QNAME, TEST_ID_QNAME,
+						testResult.getTestIdentifier()))
+				.withChild(ImmutableNodes.leafNode(TEST_ID_QNAME, testResult.getTestIdentifier()))
+				.withChild(resultsNode).build();
+
+		return (testResultNode);
+
+	}
+
+}
diff --git a/sliapi/pom.xml b/sliapi/pom.xml
index c9541ac2..62651d06 100755
--- a/sliapi/pom.xml
+++ b/sliapi/pom.xml
@@ -21,6 +21,7 @@
 		<module>features</module>
 		<module>provider</module>
 		<module>installer</module>
+		<module>lighty</module>
 	</modules>
 
 	<properties>