Refactor sliapi springboot

Moved sli-api springboot microservice from ccsdk/sli/core to ccsdk/apps

Change-Id: Ibecae568cf90b71575403052111e7be9ff543376
Issue-ID: CCSDK-2096
Signed-off-by: Dan Timoney <dtimoney@att.com>

9 files changed, 885 insertions, 0 deletions

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/App.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/App.java
new file mode 100644
index 00000000..d2ef5e77
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/App.java
@@ -0,0 +1,79 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP - CCSDK

+ * ================================================================================

+ * Copyright (C) 2020 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.apps.ms.sliboot;

+

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+import org.springframework.boot.SpringApplication;

+import org.springframework.boot.autoconfigure.SpringBootApplication;

+import org.springframework.context.annotation.ComponentScan;

+import springfox.documentation.swagger2.annotations.EnableSwagger2;

+import org.apache.shiro.realm.Realm;

+import org.apache.shiro.realm.text.PropertiesRealm;

+import org.apache.shiro.spring.web.config.DefaultShiroFilterChainDefinition;

+import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition;

+import org.springframework.context.annotation.Bean;

+import org.onap.aaf.cadi.shiro.AAFRealm;

+

+@SpringBootApplication

+@EnableSwagger2

+@ComponentScan(basePackages = { "org.onap.ccsdk.apps.ms.sliboot.*" })

+

+public class App {

+

+  private static final Logger log = LoggerFactory.getLogger(App.class);

+

+  public static void main(String[] args) throws Exception {

+    SpringApplication.run(App.class, args);

+  }

+

+  @Bean

+  public Realm realm() {

+

+    // If cadi prop files is not defined use local properties realm

+    // src/main/resources/shiro-users.properties

+    if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {

+      log.info("cadi_prop_files undefined, AAF Realm will not be set");

+      PropertiesRealm realm = new PropertiesRealm();

+      return realm;

+    } else {

+      AAFRealm realm = new AAFRealm();

+      return realm;

+    }

+

+  }

+

+  @Bean

+  public ShiroFilterChainDefinition shiroFilterChainDefinition() {

+    DefaultShiroFilterChainDefinition chainDefinition = new DefaultShiroFilterChainDefinition();

+

+    // if cadi prop files is not set disable authentication

+    if ("none".equals(System.getProperty("cadi_prop_files", "none"))) {

+      chainDefinition.addPathDefinition("/**", "anon");

+    } else {

+      log.info("Loaded property cadi_prop_files, AAF REALM set");

+      chainDefinition.addPathDefinition("/**", "authcBasic, rest[org.onap.sdnc.odl:odl-api]");

+    }

+

+    return chainDefinition;

+  }

+

+}

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java
new file mode 100644
index 00000000..3b0b2a20
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/WebConfig.java
@@ -0,0 +1,39 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP - CCSDK

+ * ================================================================================

+ * Copyright (C) 2020 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.apps.ms.sliboot;

+

+import org.springframework.boot.autoconfigure.domain.EntityScan;

+import org.springframework.context.annotation.ComponentScan;

+import org.springframework.context.annotation.Configuration;

+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;

+import org.springframework.transaction.annotation.EnableTransactionManagement;

+import org.springframework.web.servlet.config.annotation.EnableWebMvc;

+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

+

+@EnableWebMvc

+@Configuration

+@EnableJpaRepositories("org.onap.ccsdk.apps.ms.sliboot.*")

+@ComponentScan(basePackages = {"org.onap.ccsdk.apps.ms.sliboot.*"})

+@EntityScan("org.onap.ccsdk.apps.ms.sliboot.*")

+@EnableTransactionManagement

+public class WebConfig implements WebMvcConfigurer {

+

+}
\ No newline at end of file
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/ExecuteGraphController.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/ExecuteGraphController.java
new file mode 100644
index 00000000..07191446
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/ExecuteGraphController.java
@@ -0,0 +1,112 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - CCSDK
+ * ================================================================================
+ * Copyright (C) 2020 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.apps.ms.sliboot.controllers;
+
+import java.util.HashMap;
+import java.util.Map.Entry;
+import java.util.Properties;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+
+@Controller
+@EnableAutoConfiguration
+public class ExecuteGraphController {
+  @Autowired
+  protected SvcLogicServiceBase svc;
+
+	@RequestMapping(value = "/executeGraph", method = RequestMethod.POST)
+	@ResponseBody
+	public HashMap<String, String> executeGraph(@RequestBody String input) {
+		HashMap<String, String> hash = new HashMap<String, String>();
+		Properties parms = new Properties();
+
+		hash.put("status", "success");
+		JsonObject jsonInput = new Gson().fromJson(input, JsonObject.class);
+		JsonObject passthroughObj = jsonInput.get("input").getAsJsonObject();
+
+		writeResponseToCtx(passthroughObj.toString(), parms, "input");
+
+		JsonObject inputObject = jsonInput.get("graphDetails").getAsJsonObject();
+		try {
+			// Any of these can throw a nullpointer exception
+			String calledModule = inputObject.get("module").getAsString();
+			String calledRpc = inputObject.get("rpc").getAsString();
+			String modeStr = inputObject.get("mode").getAsString();
+			// execute should only throw a SvcLogicException
+			Properties respProps = svc.execute(calledModule, calledRpc, null, modeStr, parms);
+			for (Entry<Object, Object> prop : respProps.entrySet()) {
+				hash.put((String) prop.getKey(), (String) prop.getValue());
+			}
+		} catch (NullPointerException npe) {
+			HashMap<String, String> errorHash = new HashMap<String, String>();
+			errorHash.put("error-message", "check that you populated module, rpc and or mode correctly.");
+			return errorHash;
+		} catch (SvcLogicException e) {
+			HashMap<String, String> errorHash = new HashMap<String, String>();
+			errorHash.put("status", "failure");
+			errorHash.put("message", e.getMessage());
+			return errorHash;
+		}
+		return hash;
+	}
+
+	public static void writeResponseToCtx(String resp, Properties ctx, String prefix) {
+		JsonParser jp = new JsonParser();
+		JsonElement element = jp.parse(resp);
+		writeJsonObject(element.getAsJsonObject(), ctx, prefix + ".");
+	}
+
+	public static void writeJsonObject(JsonObject obj, Properties ctx, String root) {
+		for (Entry<String, JsonElement> entry : obj.entrySet()) {
+			if (entry.getValue().isJsonObject()) {
+				writeJsonObject(entry.getValue().getAsJsonObject(), ctx, root + entry.getKey() + ".");
+			} else if (entry.getValue().isJsonArray()) {
+				JsonArray array = entry.getValue().getAsJsonArray();
+				ctx.put(root + entry.getKey() + "_length", String.valueOf(array.size()));
+				Integer arrayIdx = 0;
+				for (JsonElement element : array) {
+					if (element.isJsonObject()) {
+						writeJsonObject(element.getAsJsonObject(), ctx, root + entry.getKey() + "[" + arrayIdx + "].");
+					}
+					arrayIdx++;
+				}
+			} else {
+				ctx.put(root + entry.getKey(), entry.getValue().getAsString());
+			}
+		}
+	}
+
+
+}
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java
new file mode 100644
index 00000000..11d713ad
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/controllers/RestconfApiController.java
@@ -0,0 +1,391 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - CCSDK
+ * ================================================================================
+ * Copyright (C) 2020 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.apps.ms.sliboot.controllers;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import org.onap.ccsdk.apps.ms.sliboot.swagger.ConfigApi;
+import org.onap.ccsdk.apps.ms.sliboot.swagger.OperationalApi;
+import org.onap.ccsdk.apps.ms.sliboot.swagger.OperationsApi;
+import org.onap.ccsdk.apps.ms.sliboot.data.TestResultsOperationalRepository;
+import org.onap.ccsdk.apps.ms.sliboot.swagger.model.*;
+import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase;
+import org.onap.ccsdk.apps.ms.sliboot.data.TestResultConfig;
+import org.onap.ccsdk.apps.ms.sliboot.data.TestResultsConfigRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.util.*;
+
+@javax.annotation.Generated(value = "io.swagger.codegen.languages.SpringCodegen", date = "2020-02-20T12:50:11.207-05:00")
+
+@Controller
+@ComponentScan(basePackages = {"org.onap.ccsdk.apps.ms.sliboot.*"})
+@EntityScan("org.onap.ccsdk.apps.ms.sliboot.*")
+public class RestconfApiController implements ConfigApi, OperationalApi, OperationsApi {
+
+	private final ObjectMapper objectMapper;
+	private final HttpServletRequest request;
+
+    @Autowired
+    protected SvcLogicServiceBase svc;
+
+    @Autowired
+	private TestResultsConfigRepository testResultsConfigRepository;
+
+    @Autowired
+	private TestResultsOperationalRepository testResultsOperationalRepository;
+
+	private static final Logger log = LoggerFactory.getLogger(RestconfApiController.class);
+
+	@org.springframework.beans.factory.annotation.Autowired
+	public RestconfApiController(ObjectMapper objectMapper, HttpServletRequest request) {
+		this.objectMapper = objectMapper;
+		this.request = request;
+	}
+
+
+	@Override
+	public Optional<ObjectMapper> getObjectMapper() {
+		return Optional.ofNullable(objectMapper);
+	}
+
+	@Override
+	public Optional<HttpServletRequest> getRequest() {
+		return Optional.ofNullable(request);
+	}
+	@Override
+	public Optional<String> getAcceptHeader() {
+		return ConfigApi.super.getAcceptHeader();
+	}
+
+	@Override
+	public ResponseEntity<SliApiHealthcheck> operationsSLIAPIhealthcheckPost() {
+
+		SliApiResponseFields respFields = new SliApiResponseFields();
+		HttpStatus httpStatus = HttpStatus.OK;
+
+		try {
+			log.info("Calling SLI-API:healthcheck DG");
+			SvcLogicContext ctxIn = new SvcLogicContext();
+			SvcLogicContext ctxOut = svc.execute("sli", "healthcheck", null, "sync", ctxIn);
+			Properties respProps = ctxOut.toProperties();
+
+			respFields.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
+			respFields.setResponseCode(respProps.getProperty("error-code", "200"));
+			respFields.setResponseMessage(respProps.getProperty("error-message", "Success"));
+			respFields.setContextMemoryJson(propsToJson(respProps, "context-memory"));
+
+		} catch (Exception e) {
+			respFields.setAckFinalIndicator("true");
+			respFields.setResponseCode("500");
+			respFields.setResponseMessage(e.getMessage());
+			httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
+			log.error("Error calling healthcheck directed graph", e);
+
+		}
+
+		SliApiHealthcheck resp = new SliApiHealthcheck();
+		resp.setOutput(respFields);
+		return (new ResponseEntity<>(resp, httpStatus));
+	}
+
+	@Override
+	public ResponseEntity<SliApiVlbcheck> operationsSLIAPIvlbcheckPost() {
+
+		SliApiResponseFields respFields = new SliApiResponseFields();
+		HttpStatus httpStatus = HttpStatus.OK;
+
+		try {
+			log.info("Calling SLI-API:vlbcheck DG");
+			SvcLogicContext ctxIn = new SvcLogicContext();
+			SvcLogicContext ctxOut = svc.execute("sli", "vlbcheck", null, "sync", ctxIn);
+			Properties respProps = ctxOut.toProperties();
+			respFields.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
+			respFields.setResponseCode(respProps.getProperty("error-code", "200"));
+			respFields.setResponseMessage(respProps.getProperty("error-message", "Success"));
+			respFields.setContextMemoryJson(propsToJson(respProps, "context-memory"));
+
+		} catch (Exception e) {
+			respFields.setAckFinalIndicator("true");
+			respFields.setResponseCode("500");
+			respFields.setResponseMessage(e.getMessage());
+			httpStatus = HttpStatus.INTERNAL_SERVER_ERROR;
+			log.error("Error calling vlbcheck directed graph", e);
+
+		}
+
+		SliApiVlbcheck resp = new SliApiVlbcheck();
+		resp.setOutput(respFields);
+		return (new ResponseEntity<>(resp, httpStatus));
+	}
+
+	@Override
+	public ResponseEntity<SliApiExecuteGraph> operationsSLIAPIexecuteGraphPost(@Valid SliApiExecutegraphInputBodyparam executeGraphInput) {
+
+		SvcLogicContext ctxIn = new SvcLogicContext();
+		SliApiExecuteGraph resp = new SliApiExecuteGraph();
+		SliApiResponseFields respFields = new SliApiResponseFields();
+		String executeGraphInputJson = null;
+
+		try {
+			 executeGraphInputJson = objectMapper.writeValueAsString(executeGraphInput);
+			 log.info("Input as JSON is "+executeGraphInputJson);
+		} catch (JsonProcessingException e) {
+
+			respFields.setAckFinalIndicator("true");
+			respFields.setResponseCode("500");
+			respFields.setResponseMessage(e.getMessage());
+			log.error("Cannot create JSON from input object", e);
+			resp.setOutput(respFields);
+			return (new ResponseEntity<>(resp, HttpStatus.INTERNAL_SERVER_ERROR));
+
+		}
+		JsonObject jsonInput = new Gson().fromJson(executeGraphInputJson, JsonObject.class);
+		JsonObject passthroughObj = jsonInput.get("input").getAsJsonObject();
+
+		ctxIn.mergeJson("input", passthroughObj.toString());
+
+		try {
+			// Any of these can throw a nullpointer exception
+			String calledModule = executeGraphInput.getInput().getModuleName();
+			String calledRpc = executeGraphInput.getInput().getRpcName();
+			String modeStr = executeGraphInput.getInput().getMode().toString();
+			// execute should only throw a SvcLogicException
+			SvcLogicContext ctxOut = svc.execute(calledModule, calledRpc, null, modeStr, ctxIn);
+			Properties respProps = ctxOut.toProperties();
+
+			respFields.setAckFinalIndicator(respProps.getProperty("ack-final-indicator", "Y"));
+			respFields.setResponseCode(respProps.getProperty("error-code", "200"));
+			respFields.setResponseMessage(respProps.getProperty("error-message", "SUCCESS"));
+			respFields.setContextMemoryJson(propsToJson(respProps, "context-memory"));
+			resp.setOutput(respFields);
+			return (new ResponseEntity<>(resp, HttpStatus.valueOf(Integer.parseInt(respFields.getResponseCode()))));
+
+		} catch (NullPointerException npe) {
+			respFields.setAckFinalIndicator("true");
+			respFields.setResponseCode("500");
+			respFields.setResponseMessage("Check that you populated module, rpc and or mode correctly.");
+
+			resp.setOutput(respFields);
+			return (new ResponseEntity<>(resp, HttpStatus.INTERNAL_SERVER_ERROR));
+		} catch (SvcLogicException e) {
+			respFields.setAckFinalIndicator("true");
+			respFields.setResponseCode("500");
+			respFields.setResponseMessage(e.getMessage());
+			resp.setOutput(respFields);
+			return (new ResponseEntity<>(resp, HttpStatus.INTERNAL_SERVER_ERROR));
+		}
+	}
+
+	@Override
+	public ResponseEntity<Void> configSLIAPItestResultsSLIAPItestResultTestIdentifierDelete(String testIdentifier) {
+
+		List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+
+		if (testResultConfigs != null) {
+			Iterator<TestResultConfig> testResultConfigIterator = testResultConfigs.iterator();
+			while (testResultConfigIterator.hasNext()) {
+				testResultsConfigRepository.delete(testResultConfigIterator.next());
+			}
+		}
+
+		return (new ResponseEntity<>(HttpStatus.OK));
+	}
+
+	@Override
+	public ResponseEntity<Void> configSLIAPItestResultsDelete() {
+
+		testResultsConfigRepository.deleteAll();
+
+		return (new ResponseEntity<>(HttpStatus.OK));
+	}
+
+	@Override
+	public ResponseEntity<SliApiTestResults> operationalSLIAPItestResultsGet() {
+
+		SliApiTestResults results = new SliApiTestResults();
+
+		testResultsOperationalRepository.findAll().forEach(testResult -> {
+			SliApiTestresultsTestResult item = null;
+			try {
+				item = objectMapper.readValue(testResult.getResults(), SliApiTestresultsTestResult.class);
+				results.addTestResultItem(item);
+			} catch (JsonProcessingException e) {
+				log.error("Could not convert testResult", e);
+			}
+		});
+
+
+		return new ResponseEntity<>(results, HttpStatus.OK);
+	}
+
+	@Override
+	public ResponseEntity<SliApiTestresultsTestResult> configSLIAPItestResultsSLIAPItestResultTestIdentifierGet(String testIdentifier) {
+
+		List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+
+		if ((testResultConfigs == null) || (testResultConfigs.size() == 0)) {
+			return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+		} else {
+			TestResultConfig testResultConfig = testResultConfigs.get(0);
+			SliApiTestresultsTestResult testResult = null;
+			try {
+				testResult = objectMapper.readValue(testResultConfig.getResults(), SliApiTestresultsTestResult.class);
+			} catch (JsonProcessingException e) {
+				log.error("Cannot convert test result", e);
+				return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+
+
+			return new ResponseEntity<>(testResult, HttpStatus.OK);
+		}
+	}
+
+	@Override
+	public ResponseEntity<SliApiTestResults> configSLIAPItestResultsGet() {
+
+		if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
+		} else {
+			log.warn("ObjectMapper or HttpServletRequest not configured in default RestconfApi interface so no example is generated");
+		}
+
+		SliApiTestResults results = new SliApiTestResults();
+
+		testResultsConfigRepository.findAll().forEach(testResult -> {
+			SliApiTestresultsTestResult item = null;
+			try {
+				item = objectMapper.readValue(testResult.getResults(), SliApiTestresultsTestResult.class);
+				results.addTestResultItem(item);
+			} catch (JsonProcessingException e) {
+				log.error("Could not convert testResult", e);
+			}
+		});
+
+
+		return new ResponseEntity<>(results, HttpStatus.OK);
+	}
+
+	@Override
+	public ResponseEntity<Void> configSLIAPItestResultsSLIAPItestResultTestIdentifierPut(String testIdentifier, @Valid SliApiTestresultsTestResult testResult) {
+
+		if(getObjectMapper().isPresent() && getAcceptHeader().isPresent()) {
+		} else {
+			log.warn("ObjectMapper or HttpServletRequest not configured in default RestconfApi interface so no example is generated");
+		}
+
+		List<TestResultConfig> testResultConfigs = testResultsConfigRepository.findByTestIdentifier(testIdentifier);
+		Iterator<TestResultConfig> testResultIter = testResultConfigs.iterator();
+		while (testResultIter.hasNext()) {
+			testResultsConfigRepository.delete(testResultIter.next());
+		}
+
+		TestResultConfig testResultConfig = null;
+		try {
+			testResultConfig = new TestResultConfig(testResult.getTestIdentifier(), objectMapper.writeValueAsString(testResult));
+			testResultsConfigRepository.save(testResultConfig);
+		} catch (JsonProcessingException e) {
+			log.error("Could not save test result", e);
+			return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+		}
+
+		return new ResponseEntity<>(HttpStatus.OK);
+	}
+
+	@Override
+	public ResponseEntity<Void> configSLIAPItestResultsPost(@Valid SliApiTestResults testResults) {
+
+		List<SliApiTestresultsTestResult> resultList = testResults.getTestResult();
+
+		if (resultList == null) {
+			log.error("Invalid input - no test results list");
+			return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
+		}
+		Iterator<SliApiTestresultsTestResult> resultIterator = resultList.iterator();
+
+		while (resultIterator.hasNext()) {
+			SliApiTestresultsTestResult curResult = resultIterator.next();
+			try {
+				testResultsConfigRepository.save(new TestResultConfig(curResult.getTestIdentifier(), objectMapper.writeValueAsString(curResult)));
+			} catch (JsonProcessingException e) {
+				log.error("Could not save test result", e);
+				return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		}
+
+		return new ResponseEntity<>(HttpStatus.OK);
+	}
+
+	@Override
+	public ResponseEntity<Void> configSLIAPItestResultsPut(@Valid SliApiTestResults testResults) {
+
+		testResultsConfigRepository.deleteAll();
+
+		List<SliApiTestresultsTestResult> resultList = testResults.getTestResult();
+
+		Iterator<SliApiTestresultsTestResult> resultIterator = resultList.iterator();
+
+
+		while (resultIterator.hasNext()) {
+			SliApiTestresultsTestResult curResult = resultIterator.next();
+			try {
+				testResultsConfigRepository.save(new TestResultConfig(curResult.getTestIdentifier(), objectMapper.writeValueAsString(curResult)));
+			} catch (JsonProcessingException e) {
+				log.error("Could not save test result", e);
+				return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
+			}
+		}
+
+		return new ResponseEntity<>(HttpStatus.OK);
+	}
+
+	public static String propsToJson(Properties props, String root)
+	{
+		StringBuffer sbuff = new StringBuffer();
+
+		sbuff.append("{ \""+root+"\" : { ");
+		boolean needComma = false;
+		for (Map.Entry<Object, Object> prop : props.entrySet()) {
+			sbuff.append("\""+(String) prop.getKey()+"\" : \""+(String)prop.getValue()+"\"");
+			if (needComma) {
+				sbuff.append(" , ");
+			} else {
+				needComma = true;
+			}
+		}
+		sbuff.append(" } }");
+
+		return(sbuff.toString());
+	}
+
+}
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/core/SvcLogicFactory.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/core/SvcLogicFactory.java
new file mode 100644
index 00000000..e264baa9
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/core/SvcLogicFactory.java
@@ -0,0 +1,149 @@
+/*-

+ * ============LICENSE_START=======================================================

+ * ONAP - CCSDK

+ * ================================================================================

+ * Copyright (C) 2020 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.apps.ms.sliboot.core;

+

+import java.io.FileInputStream;

+import java.io.IOException;

+import java.util.List;

+import java.util.Properties;

+import org.onap.ccsdk.sli.core.sli.ConfigurationException;

+import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;

+import org.onap.ccsdk.sli.core.sli.SvcLogicLoader;

+import org.onap.ccsdk.sli.core.sli.SvcLogicRecorder;

+import org.onap.ccsdk.sli.core.sli.SvcLogicStore;

+import org.onap.ccsdk.sli.core.sli.SvcLogicStoreFactory;

+import org.onap.ccsdk.sli.core.sli.provider.base.HashMapResolver;

+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicPropertiesProvider;

+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceBase;

+import org.onap.ccsdk.sli.core.sli.provider.base.SvcLogicServiceImplBase;

+import org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder;

+import org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils;

+import org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils;

+import org.onap.ccsdk.sli.plugins.prop.PropertiesNode;

+import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode;

+import org.slf4j.Logger;

+import org.slf4j.LoggerFactory;

+import org.springframework.beans.factory.annotation.Autowired;

+import org.springframework.context.annotation.Bean;

+import org.springframework.context.annotation.Configuration;

+

+@Configuration

+public class SvcLogicFactory {

+  private static final Logger log = LoggerFactory.getLogger(SvcLogicFactory.class);

+

+  @Autowired

+  List<SvcLogicRecorder> recorders;

+

+  @Autowired

+  List<SvcLogicJavaPlugin> plugins;

+

+  @Bean

+  public SvcLogicStore getStore() throws Exception {

+    SvcLogicPropertiesProvider propProvider = new SvcLogicPropertiesProvider() {

+

+      @Override

+      public Properties getProperties() {

+        Properties props = new Properties();

+

+

+        String propPath = System.getProperty("serviceLogicProperties", "");

+

+        if ("".equals(propPath)) {

+          propPath = System.getenv("SVCLOGIC_PROPERTIES");

+        }

+

+

+        if ((propPath == null) || propPath.length() == 0) {

+          propPath = "src/main/resources/svclogic.properties";

+        }

+        System.out.println(propPath);

+        try (FileInputStream fileInputStream = new FileInputStream(propPath)) {

+          props = new Properties();

+          props.load(fileInputStream);

+        } catch (final IOException e) {

+          log.error("Failed to load properties for file: {}", propPath,

+              new ConfigurationException("Failed to load properties for file: " + propPath, e));

+        }

+        return props;

+      }

+    };

+    SvcLogicStore store = SvcLogicStoreFactory.getSvcLogicStore(propProvider.getProperties());

+    return store;

+  }

+

+  @Bean

+  public SvcLogicLoader createLoader() throws Exception {

+    String serviceLogicDirectory = System.getProperty("serviceLogicDirectory");

+    if (serviceLogicDirectory == null) {

+      serviceLogicDirectory = "src/main/resources";

+    }

+

+    System.out.println("serviceLogicDirectory is " + serviceLogicDirectory);

+    SvcLogicLoader loader = new SvcLogicLoader(serviceLogicDirectory, getStore());

+

+    try {

+      loader.loadAndActivate();

+    } catch (IOException e) {

+      log.error("Cannot load directed graphs", e);

+    }

+    return loader;

+  }

+

+  @Bean

+  public SvcLogicServiceBase createService() throws Exception {

+    HashMapResolver resolver = new HashMapResolver();

+    for (SvcLogicRecorder recorder : recorders) {

+      resolver.addSvcLogicRecorder(recorder.getClass().getName(), recorder);

+

+    }

+    for (SvcLogicJavaPlugin plugin : plugins) {

+      resolver.addSvcLogicSvcLogicJavaPlugin(plugin.getClass().getName(), plugin);

+

+    }

+    return new SvcLogicServiceImplBase(getStore(), resolver);

+  }

+

+  @Bean

+  public Slf4jRecorder slf4jRecorderNode() {

+    return new Slf4jRecorder();

+  }

+

+  @Bean

+  public SliPluginUtils sliPluginUtil() {

+    return new SliPluginUtils();

+  }

+

+  @Bean

+  public SliStringUtils sliStringUtils() {

+    return new SliStringUtils();

+  }

+  

+  @Bean

+  public RestapiCallNode restapiCallNode() {

+      return new RestapiCallNode();

+  }

+  

+  @Bean

+  public PropertiesNode propertiesNode() {

+      return new PropertiesNode();

+  }

+

+}

diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java
new file mode 100644
index 00000000..1ca4fe1f
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultConfig.java
@@ -0,0 +1,45 @@
+package org.onap.ccsdk.apps.ms.sliboot.data;
+
+import javax.persistence.*;
+
+@Entity(name = "TEST_RESULT_CONFIG")
+@Table(name = "TEST_RESULT_CONFIG")
+public class TestResultConfig {
+
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.AUTO)
+    private Long id;
+
+    private String testIdentifier;
+    private String results;
+
+    public TestResultConfig()
+    {
+
+    }
+    public TestResultConfig(String testIdentifier, String results) {
+        this.testIdentifier = testIdentifier;
+        this.results = results;
+    }
+
+    public String getTestIdentifier() {
+        return testIdentifier;
+    }
+
+    public void setTestIdentifier(String testIdentifier) {
+        this.testIdentifier = testIdentifier;
+    }
+
+    public String getResults() {
+        return results;
+    }
+
+    public void setResults(String results) {
+        this.results = results;
+    }
+
+
+
+
+}
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java
new file mode 100644
index 00000000..b9d09934
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultOperational.java
@@ -0,0 +1,46 @@
+package org.onap.ccsdk.apps.ms.sliboot.data;
+
+import javax.persistence.*;
+
+@Entity(name="TEST_RESULT_OPERATIONAL")
+@Table(name="TEST_RESULT_OPERATIONAL")
+public class TestResultOperational {
+
+
+    @Id
+    @GeneratedValue(strategy= GenerationType.AUTO)
+    private Long id;
+
+    private String testIdentifier;
+    private String results;
+
+    public TestResultOperational()
+    {
+
+    }
+
+    public TestResultOperational(String testIdentifier, String results) {
+        this.testIdentifier = testIdentifier;
+        this.results = results;
+    }
+
+    public String getTestIdentifier() {
+        return testIdentifier;
+    }
+
+    public void setTestIdentifier(String testIdentifier) {
+        this.testIdentifier = testIdentifier;
+    }
+
+    public String getResults() {
+        return results;
+    }
+
+    public void setResults(String results) {
+        this.results = results;
+    }
+
+
+
+
+}
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsConfigRepository.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsConfigRepository.java
new file mode 100644
index 00000000..9ef115d6
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsConfigRepository.java
@@ -0,0 +1,12 @@
+package org.onap.ccsdk.apps.ms.sliboot.data;
+
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+public interface TestResultsConfigRepository extends CrudRepository<TestResultConfig, Long> {
+
+    List<TestResultConfig> findByTestIdentifier(String testIdentifier);
+
+
+}
diff --git a/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsOperationalRepository.java b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsOperationalRepository.java
new file mode 100644
index 00000000..1198dd0b
--- /dev/null
+++ b/ms/sliboot/src/main/java/org/onap/ccsdk/apps/ms/sliboot/data/TestResultsOperationalRepository.java
@@ -0,0 +1,12 @@
+package org.onap.ccsdk.apps.ms.sliboot.data;
+
+import org.springframework.data.repository.CrudRepository;
+
+import java.util.List;
+
+public interface TestResultsOperationalRepository extends CrudRepository<TestResultOperational, Long> {
+
+    List<TestResultOperational> findByTestIdentifier(String testIdentifier);
+
+
+}