summaryrefslogtreecommitdiffstats
path: root/adapters/mso-requests-db-adapter/src
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-09-13 19:37:57 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-13 19:37:57 +0000
commit58a00a16d7df65f83f2a90893a8af9b717950d11 (patch)
tree2da71ccf977e9108ef026a28b2c91ffd1103af91 /adapters/mso-requests-db-adapter/src
parent3e5b564f4c1e1f731f2e2502bbc2ce868f7cedec (diff)
parente36dcc866563aefaca7edff0f894860f3f27a31b (diff)
Merge "Fix threading problems in requestdbclient"
Diffstat (limited to 'adapters/mso-requests-db-adapter/src')
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml11
-rw-r--r--adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java5
-rw-r--r--adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java2
-rw-r--r--adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml6
4 files changed, 11 insertions, 13 deletions
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
index 414c552619..41b72ba08f 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application-local.yaml
@@ -12,10 +12,9 @@ mso:
endpoint: http://localhost:8081
logPath: logs
site-name: localSite
- adapters:
- requestDb:
- auth: Basic YnBlbDptc28tZGItMTUwNyE=
- endpoint: http://localhost:8081
+ infra-requests:
+ archived:
+ period: 180
spring:
datasource:
url: jdbc:mariadb://localhost:3306/requestdb
@@ -50,6 +49,6 @@ management:
flyway:
baseline-on-migrate: false
url: jdbc:mariadb://localhost:3306/requestdb
- user: mso
- password: mso123
+ user: catalog
+ password: catalog123
\ No newline at end of file
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
index 54debac36f..f05a301caa 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/ArchiveInfraRequestsSchedulerTest.java
@@ -28,6 +28,7 @@ import java.util.Calendar;
import java.util.Date;
import java.util.List;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.onap.so.adapters.requestsdb.application.MSORequestDBApplication;
@@ -61,6 +62,7 @@ public class ArchiveInfraRequestsSchedulerTest {
private int archivedPeriod;
@Test
+ @Transactional
public void testArchiveInfraRequests() {
String requestId1 = "requestId1";
String requestId2 = "requestId2";
@@ -85,7 +87,8 @@ public class ArchiveInfraRequestsSchedulerTest {
assertEquals(requestId2, archivedRepo.findOne(requestId2).getRequestId());
}
- @Test
+ @Test
+ @Ignore
public void testInfraRequestsScheduledTask() {
Date currentDate= new Date();
Calendar calendar = Calendar.getInstance();
diff --git a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
index 03fd0622fa..571a2c053f 100644
--- a/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
+++ b/adapters/mso-requests-db-adapter/src/test/java/org/onap/so/adapters/requestsdb/adapters/MSORequestDBImplTest.java
@@ -87,7 +87,7 @@ public class MSORequestDBImplTest {
jaxWsProxyFactory.setServiceClass(MsoRequestsDbAdapter.class);
jaxWsProxyFactory.setAddress("http://localhost:" + port + "/services/RequestsDbAdapter");
jaxWsProxyFactory.setUsername("bpel");
- jaxWsProxyFactory.setPassword("password1$");
+ jaxWsProxyFactory.setPassword("mso-db-1507!");
dbAdapter = (MsoRequestsDbAdapter) jaxWsProxyFactory.create();
}
diff --git a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
index 812fd232b4..35b3ec9360 100644
--- a/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
+++ b/adapters/mso-requests-db-adapter/src/test/resources/application-test.yaml
@@ -10,7 +10,7 @@ ssl-enable: false
mso:
adapters:
requestDb:
- auth: Basic YnBlbDpwYXNzd29yZDEk
+ auth: Basic YnBlbDptc28tZGItMTUwNyE=
endpoint: http://localhost:8081
logPath: logs
site-name: localSite
@@ -35,10 +35,6 @@ spring:
database-platform: org.hibernate.dialect.MySQL5InnoDBDialect
security:
usercredentials:
- -
- username: bpel
- password: '$2a$10$Fh9ffgPw2vnmsghsRD3ZauBL1aKXebigbq3BB1RPWtE62UDILsjke'
- role: BPEL-Client
-
username: bpel
password: '$2a$12$1xyutEZNfjGewIZRfKaE8eZE99f5sYFUmmM80BobI65KNjmcK0JuO'