summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xcps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java3
-rw-r--r--docker-compose/docker-compose.yml2
-rw-r--r--docs/modeling.rst24
3 files changed, 27 insertions, 2 deletions
diff --git a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
index 10f8de422d..2d2df2e629 100755
--- a/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
+++ b/cps-ri/src/test/java/org/onap/cps/DatabaseTestContainer.java
@@ -1,6 +1,7 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2020 Pantheon.tech
+ * Modifications Copyright (C) 2022 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,7 +30,7 @@ import org.testcontainers.containers.PostgreSQLContainer;
* psql -d test -U test
*/
public class DatabaseTestContainer extends PostgreSQLContainer<DatabaseTestContainer> {
- private static final String IMAGE_VERSION = "postgres:13.2";
+ private static final String IMAGE_VERSION = "postgres:14.1";
private static DatabaseTestContainer databaseTestContainer;
private DatabaseTestContainer() {
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index b7d641c74b..4c99192690 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -23,7 +23,7 @@ services:
dbpostgresql:
container_name: dbpostgresql
- image: postgres:13.2-alpine
+ image: postgres:14.1-alpine
ports:
- ${DB_PORT:-5432}:5432
environment:
diff --git a/docs/modeling.rst b/docs/modeling.rst
index acc430aa1b..7cc2c4ce6a 100644
--- a/docs/modeling.rst
+++ b/docs/modeling.rst
@@ -83,6 +83,30 @@ Basic Concepts
These are stored as Anchors within CPS-Core.
+ - **CM-Handle States** are used to represent the potential states in which a CM-Handle can transition between.
+
+ The 5 possible CM-Handle states are: ADVISED, READY, LOCKED, DELETING, DELETED
+
+ **ADVISED** indicates that a CM-Handle has been registered successfully, and is waiting for the module synchronization process to sync the CM-Handle.
+
+ **READY** indicates that the CM-Handle has been synced successfully.
+
+ **LOCKED** indicates that the CM-Handle has not synced successfully. A retry mechanism within CPS will set the state back to ADVISED after a set time.
+
+ **DELETING** indicates that the CM-Handle is currently being deleted.
+
+ **DELETED** indicates that the CM-Handle has been deleted successfully.
+
+ - **Data-sync state** is the state of the data synchronization process of the CM-Handle
+
+ There are 3 possibles states: NONE_REQUESTED, UNSYNCHRONIZED, SYNCHRONIZED
+
+ **NONE_REQUESTED** indicates that the data sync is not requested by the user
+
+ **UNSYNCHRONIZED** indicates the cm-handle is waiting for the data sync watchdog operation to carry out the sync process
+
+ **SYNCHRONIZED** indicates the watchdog process has finished the data synchronization successfully
+
- **Datastores** represent different views of the cm data.
Datastores are defined for NCMP to access the CPS running or operational datastores. Currently supported datastores are: