Merge "Support for test of PMS persistency"

diff --combined test/common/mr_api_functions.sh
index 45d0931,25b5172..3569f6c
mode 100755,100644..100755
--- 1/test/common/mr_api_functions.sh
--- 2/test/common/mr_api_functions.sh
+++ b/test/common/mr_api_functions.sh
@@@ -44,7 -44,7 +44,7 @@@ __DMAAPMR_imagesetup() 
  # <pull-policy-original> Shall be used for images that does not allow overriding
  # Both var may contain: 'remote', 'remote-remove' or 'local'
  __MR_imagepull() {
-       echo -e $RED"Image for app CR shall never be pulled from remove repo"$ERED
+       echo -e $RED"Image for app MR shall never be pulled from remote repo"$ERED
  }
  
  # Pull image from remote repo or use locally built image
@@@ -580,9 -580,9 +580,9 @@@ start_mr() 
  
                        __create_topic $MR_WRITE_TOPIC "Topic for writing policy messages"
  
 -                      __dmaap_pipeclean $MR_READ_TOPIC "/events/A1-POLICY-AGENT-READ" "/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=1000&limit=100"
 +                      __dmaap_pipeclean $MR_READ_TOPIC "/events/$MR_READ_TOPIC" "/events/$MR_READ_TOPIC/users/policy-agent?timeout=1000&limit=100"
  
 -                      __dmaap_pipeclean $MR_WRITE_TOPIC "/events/A1-POLICY-AGENT-WRITE" "/events/A1-POLICY-AGENT-WRITE/users/mr-stub?timeout=1000&limit=100"
 +                      __dmaap_pipeclean $MR_WRITE_TOPIC "/events/$MR_WRITE_TOPIC" "/events/$MR_WRITE_TOPIC/users/mr-stub?timeout=1000&limit=100"
  
                        echo " Current topics:"
                        curlString="$MR_DMAAP_PATH/topics"

diff --combined test/common/test_env-oran-dawn.sh
index e9b82f6,7ecd434..9dedf75
--- 1/test/common/test_env-oran-dawn.sh
--- 2/test/common/test_env-oran-dawn.sh
+++ b/test/common/test_env-oran-dawn.sh
@@@ -226,6 -226,7 +226,7 @@@ POLICY_AGENT_CONFIG_MOUNT_PATH="/opt/ap
  POLICY_AGENT_DATA_MOUNT_PATH="/opt/app/policy-agent/data" # Path in container for data file
  POLICY_AGENT_CONFIG_FILE="application.yaml"              # Container config file name
  POLICY_AGENT_DATA_FILE="application_configuration.json"  # Container data file name
+ POLICY_AGENT_CONTAINER_MNT_DIR="/var/policy-management-service" # Mounted dir in the container
  
  ECS_APP_NAME="enrichmentservice"                         # Name for ECS container
  ECS_DISPLAY_NAME="Enrichment Coordinator Service"        # Display name for ECS container
@@@ -259,10 -260,10 +260,10 @@@ MR_DMAAP_LOCALHOST_PORT=390
  MR_STUB_LOCALHOST_PORT=3908                              # MR stub container external port (host -> container)
  MR_DMAAP_LOCALHOST_SECURE_PORT=3905                      # MR stub container internal port (container -> container)
  MR_STUB_LOCALHOST_SECURE_PORT=3909                       # MR stub container external secure port (host -> container)
 -MR_READ_URL="/events/A1-POLICY-AGENT-READ/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR
 -MR_WRITE_URL="/events/A1-POLICY-AGENT-WRITE"             # Path write messages to MR
  MR_READ_TOPIC="A1-POLICY-AGENT-READ"                     # Read topic
  MR_WRITE_TOPIC="A1-POLICY-AGENT-WRITE"                   # Write topic
 +MR_READ_URL="/events/$MR_READ_TOPIC/users/policy-agent?timeout=15000&limit=100" # Path to read messages from MR
 +MR_WRITE_URL="/events/$MR_WRITE_TOPIC"                   # Path to write messages to MR
  MR_STUB_ALIVE_URL="/"                                    # Base path for mr stub alive check
  MR_DMAAP_ALIVE_URL="/topics"                             # Base path for dmaap-mr alive check
  MR_DMAAP_COMPOSE_DIR="dmaapmr"                           # Dir in simulator_group for dmaap mr for - docker-compose