summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2022-11-30 19:58:54 +0000
committerGerrit Code Review <gerrit@onap.org>2022-11-30 19:58:54 +0000
commit201eb4494467c84ce5ae3f446b95add838a1928b (patch)
treeed236c25d4c8ab704158ba19fed4fbd2f220c8ae
parentbf67bc5ff50876f240b835c16c1a8c719841df1b (diff)
parent21e27049544ddf0a30a839c968e21b6f877b729c (diff)
Merge "Support for using Amazon S3 - Cloud Object Storage"
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java2
-rw-r--r--a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java4
-rw-r--r--docs/guide/developer-guide.rst2
3 files changed, 4 insertions, 4 deletions
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
index d808b57d..09f59ca4 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/repository/Policies.java
@@ -101,7 +101,7 @@ public class Policies {
policiesRic.put(policy.getRic().id(), policy.getId(), policy);
policiesService.put(policy.getOwnerServiceId(), policy.getId(), policy);
policiesType.put(policy.getType().getId(), policy.getId(), policy);
- if (this.appConfig.getVardataDirectory() != null && !policy.isTransient()) {
+ if (!policy.isTransient()) {
store(policy);
}
}
diff --git a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
index 567bb8d2..408a0d5f 100644
--- a/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
+++ b/a1-policy-management/src/main/java/org/onap/ccsdk/oran/a1policymanagementservice/tasks/RefreshConfigTask.java
@@ -200,9 +200,7 @@ public class RefreshConfigTask {
void addRic(Ric ric) {
this.rics.put(ric);
- if (this.appConfig.getVardataDirectory() != null) {
- this.policies.restoreFromDatabase(ric, this.policyTypes).subscribe();
- }
+ this.policies.restoreFromDatabase(ric, this.policyTypes).subscribe();
logger.debug("Added RIC: {}", ric.id());
}
diff --git a/docs/guide/developer-guide.rst b/docs/guide/developer-guide.rst
index 5159b6c9..c26bf481 100644
--- a/docs/guide/developer-guide.rst
+++ b/docs/guide/developer-guide.rst
@@ -48,6 +48,7 @@ dependency management tool (see *pom.xml* file at root level) :
- `Springfox <https://github.com/springfox/springfox>`_ Automated JSON API documentation for APIs built with Spring
- `Lombok <https://github.com/rzwitserloot/lombok>`_ to generate code, such as getters and setters
- `Awaitility <https://github.com/awaitility/awaitility>`_ to test asynchronous functionality
+- `S3 <https://mvnrepository.com/artifact/software.amazon.awssdk/s3>`_ Access of Amazon S3 - Cloud Object Storage
To get a complete list of all dependencies, use command "mvn dependency:tree".
@@ -77,6 +78,7 @@ The file *./config/application.yaml* is read by the application at startup. It p
* logging; setting for which information is logged.
* auth-token; optional authorization token to use for REST call.
* filepath; the local path to a file used for dynamic configuration (if used). See next chapter.
+ * persistent storage of runtime information. Configuration of A1 policyinstances is stored persistently. The media for this can be either filesystem (a persistent volume) or Amazon S3 - Cloud Object Storage.
For details about the parameters in this file, see documentation in the file.