summaryrefslogtreecommitdiffstats
path: root/packages/policy-api-tarball
diff options
context:
space:
mode:
authorChenfei Gao <cgao@research.att.com>2019-04-10 16:54:47 -0400
committerChenfei Gao <cgao@research.att.com>2019-04-10 21:11:48 -0400
commita229e2bccfdcf40c56c4d87d9e3cc5cd9dabb2a8 (patch)
treeb082f9f4f8f0ebb5aed960bb3491893b5e35a75a /packages/policy-api-tarball
parentf3dfe9dc5029c7f2628d9bd2810b61543902d70c (diff)
Modify delete safety net and DB lab setup
Includes: a) Close db connection using try-with-resource b) Modify delete safety net for policy, policy type and legacy policies c) Modify db persistence d) Modify db setup in bootstrap config e) Add unit tests for providers and endpoints Issue-ID: POLICY-1441 Change-Id: Id89bc361c73380df61df35f01f296e47e936e9cf Signed-off-by: Chenfei Gao <cgao@research.att.com>
Diffstat (limited to 'packages/policy-api-tarball')
-rw-r--r--packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json8
-rw-r--r--packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json8
2 files changed, 8 insertions, 8 deletions
diff --git a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json
index 260fac52..f85013db 100644
--- a/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json
+++ b/packages/policy-api-tarball/src/main/resources/etc/defaultConfig.json
@@ -11,9 +11,9 @@
"databaseProviderParameters": {
"name": "PolicyProviderParameterGroup",
"implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
- "databaseUrl": "jdbc:mariadb://localhost:3306/policy",
- "databaseUser": "policy",
- "databasePassword": "UDAxaWNZ",
- "persistenceUnit": "ToscaConceptMariaDBTest"
+ "databaseUrl": "jdbc:mariadb://policydb:3306/policy",
+ "databaseUser": "policy_user",
+ "databasePassword": "cG9saWN5X3VzZXI=",
+ "persistenceUnit": "PolicyMariaDb"
}
}
diff --git a/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json
index e0ed3fb9..ab36813a 100644
--- a/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json
+++ b/packages/policy-api-tarball/src/main/resources/etc/s3pConfig.json
@@ -11,9 +11,9 @@
"databaseProviderParameters": {
"name": "PolicyProviderParameterGroup",
"implementation": "org.onap.policy.models.provider.impl.DatabasePolicyModelsProviderImpl",
- "databaseUrl": "jdbc:mariadb://localhost:3306/policy",
- "databaseUser": "policy",
- "databasePassword": "UDAxaWNZ",
- "persistenceUnit": "ToscaConceptMariaDBTest"
+ "databaseUrl": "jdbc:mariadb://policydb:3306/policy",
+ "databaseUser": "policy_user",
+ "databasePassword": "cG9saWN5X3VzZXI=",
+ "persistenceUnit": "PolicyMariaDb"
}
} \ No newline at end of file