From 370f5fe6f8c90bb35a9529f19d862e63a2cf8b9d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 27 Oct 2020 16:47:24 -0400 Subject: Import SLI-API controller Import sliboot controller to implement SLI-API interface. Change-Id: Iea85a9cb128366fa0f580852d9f2fa71405a4bad Issue-ID: SDNC-1400 Signed-off-by: Dan Timoney --- .../apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java | 2 +- .../apps/ms/gra/controllers/ConfigApiServicesControllerTest.java | 2 +- .../sdnc/apps/ms/gra/controllers/GenericResourceMsAppTest.java | 2 +- .../sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java | 4 ++-- ms/generic-resource-api/src/test/resources/application.properties | 5 +++-- ms/generic-resource-api/src/test/resources/dblib.properties | 8 ++++---- ms/generic-resource-api/src/test/resources/svclogic.properties | 6 +++--- 7 files changed, 15 insertions(+), 14 deletions(-) (limited to 'ms/generic-resource-api/src/test') diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java index 49f3ae7..5b0a8e6 100644 --- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java +++ b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiPreloadControllerTest.java @@ -3,7 +3,7 @@ package org.onap.sdnc.apps.ms.gra.controllers; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.sdnc.apps.ms.gra.core.GenericResourceMsApp; +import org.onap.sdnc.apps.ms.gra.GenericResourceMsApp; import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadData; import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadDataRepository; import org.onap.sdnc.apps.ms.gra.data.ConfigServicesRepository; diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java index 6329500..e9a5c8b 100644 --- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java +++ b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/ConfigApiServicesControllerTest.java @@ -4,7 +4,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.sdnc.apps.ms.gra.core.GenericResourceMsApp; +import org.onap.sdnc.apps.ms.gra.GenericResourceMsApp; import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadData; import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadDataRepository; import org.onap.sdnc.apps.ms.gra.data.ConfigServices; diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/GenericResourceMsAppTest.java b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/GenericResourceMsAppTest.java index 260d66b..166278a 100644 --- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/GenericResourceMsAppTest.java +++ b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/GenericResourceMsAppTest.java @@ -6,7 +6,7 @@ import org.apache.shiro.spring.web.config.ShiroFilterChainDefinition; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.sdnc.apps.ms.gra.core.GenericResourceMsApp; +import org.onap.sdnc.apps.ms.gra.GenericResourceMsApp; import java.util.Map; diff --git a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java index f0f29d3..b285d9e 100644 --- a/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java +++ b/ms/generic-resource-api/src/test/java/org/onap/sdnc/apps/ms/gra/controllers/OperationsApiControllerTest.java @@ -3,7 +3,7 @@ package org.onap.sdnc.apps.ms.gra.controllers; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.onap.sdnc.apps.ms.gra.core.GenericResourceMsApp; +import org.onap.sdnc.apps.ms.gra.GenericResourceMsApp; import org.onap.sdnc.apps.ms.gra.data.ConfigPreloadDataRepository; import org.onap.sdnc.apps.ms.gra.data.ConfigServices; import org.onap.sdnc.apps.ms.gra.data.ConfigServicesRepository; @@ -126,7 +126,7 @@ public class OperationsApiControllerTest { .andReturn(); assertEquals(200, mvcResult.getResponse().getStatus()); assertEquals(1, configServicesRepository.count()); - assertEquals(1, operationalServicesRepository.count()); + assertEquals(0, operationalServicesRepository.count()); } diff --git a/ms/generic-resource-api/src/test/resources/application.properties b/ms/generic-resource-api/src/test/resources/application.properties index 807719e..a3a99b8 100644 --- a/ms/generic-resource-api/src/test/resources/application.properties +++ b/ms/generic-resource-api/src/test/resources/application.properties @@ -5,13 +5,14 @@ spring.jackson.date-format=org.onap.sdnc.apps.ms.gra.swagger.RFC3339DateFormat spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false logging.level.com.att=TRACE logging.level.org.onap=TRACE -spring.datasource.url=jdbc:derby:memory:sdnctl;create=true +spring.datasource.url=jdbc:derby:memory:gra;create=true spring.datasource.platform=derby -spring.datasource.username=sdnctl +spring.datasource.username=sdnc spring.datasource.password=abc123 spring.datasource.driver-class-name=org.apache.derby.jdbc.EmbeddedDriver spring.datasource.testWhileIdle=true spring.datasource.validationQuery=SELECT 1 +spring.datasource.continue-on-error=true spring.jpa.show-sql=true spring.jpa.hibernate.ddl-auto=update spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyLegacyHbmImpl diff --git a/ms/generic-resource-api/src/test/resources/dblib.properties b/ms/generic-resource-api/src/test/resources/dblib.properties index 198a00c..27923aa 100644 --- a/ms/generic-resource-api/src/test/resources/dblib.properties +++ b/ms/generic-resource-api/src/test/resources/dblib.properties @@ -23,12 +23,12 @@ org.onap.ccsdk.sli.dbtype=jdbc org.onap.ccsdk.sli.jdbc.hosts=localhost -org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:sdnctl;create=true +org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:gra;create=true org.onap.ccsdk.sli.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver -org.onap.ccsdk.sli.jdbc.database = sdnctl -org.onap.ccsdk.sli.jdbc.user = sdnctl +org.onap.ccsdk.sli.jdbc.database = gra +org.onap.ccsdk.sli.jdbc.user = sdnc org.onap.ccsdk.sli.jdbc.password = abc123 -org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.jdbc.connection.name=gradb01 org.onap.ccsdk.sli.jdbc.connection.timeout=50 org.onap.ccsdk.sli.jdbc.request.timeout=100 org.onap.ccsdk.sli.jdbc.limit.init=10 diff --git a/ms/generic-resource-api/src/test/resources/svclogic.properties b/ms/generic-resource-api/src/test/resources/svclogic.properties index 8f5243e..acbf8d0 100644 --- a/ms/generic-resource-api/src/test/resources/svclogic.properties +++ b/ms/generic-resource-api/src/test/resources/svclogic.properties @@ -20,10 +20,10 @@ ### org.onap.ccsdk.sli.dbtype = jdbc -org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:sdnctl;create=true +org.onap.ccsdk.sli.jdbc.url=jdbc:derby:memory:gra;create=true org.onap.ccsdk.sli.jdbc.driver=org.apache.derby.jdbc.EmbeddedDriver -org.onap.ccsdk.sli.jdbc.database = sdnctl -org.onap.ccsdk.sli.jdbc.user = sdnctl +org.onap.ccsdk.sli.jdbc.database = gra +org.onap.ccsdk.sli.jdbc.user = sdnc org.onap.ccsdk.sli.jdbc.password = abc123 serviceLogicDirectory=target/docker-stage/opt/onap/sdnc/svclogic/graphs/generic-resource-api -- cgit 1.2.3-korg