sp3 tests update on setup

- versions of images updated
- fix run_tests with extra slash
- add call to metrics on stability and performance tests

Issue-ID: POLICY-4006
Change-Id: Idad63e9d256e149b224796c486f7322ecbc6ff61
Signed-off-by: adheli.tavares <adheli.tavares@est.tech>

1 files changed, 116 insertions, 111 deletions

diff --git a/testsuites/stability/src/main/resources/setup/docker-compose.yml b/testsuites/stability/src/main/resources/setup/docker-compose.yml
index fac04fa2..48d1851e 100644
--- a/testsuites/stability/src/main/resources/setup/docker-compose.yml
+++ b/testsuites/stability/src/main/resources/setup/docker-compose.yml
@@ -1,5 +1,6 @@
-# Copyright (C) 2021 Nordix Foundation.
-#
+# ============LICENSE_START=======================================================
+# Copyright (C) 2021-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.
 # You may obtain a copy of the License at
@@ -11,115 +12,119 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+#
+# SPDX-License-Identifier: Apache-2.0
+# ============LICENSE_END=========================================================
 
 version: '3'
 services:
-   mariadb:
-      image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
-      container_name: mariadb
-      hostname: mariadb
-      command: [ '--lower-case-table-names=1', '--wait_timeout=28800' ]
-      env_file: config/db/db.conf
-      volumes:
-         - ./config/db:/docker-entrypoint-initdb.d:ro
-      expose:
-         - 3306
-   policy-db-migrator:
-      image: nexus3.onap.org:10001/onap/policy-db-migrator:${POLICY_DB_MIGRATOR}
-      container_name: policy-db-migrator
-      hostname: policy-db-migrator
-      depends_on:
-         - mariadb
-      expose:
-         - 6824
-      env_file: config/db/db.conf
-      environment:
-         SQL_DB: policyadmin
-         SQL_HOST: mariadb
-      volumes:
-         - ./config/db-migrator/db_migrator_policy_init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
-         - ./config/wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-            '-c',
-            '/opt/app/policy/bin/db_migrator_policy_init.sh',
-            'mariadb', '3306'
-      ]
-   simulator:
-      image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_SIMULATOR}
-      container_name: simulator
-      hostname: simulator
-      networks:
-         default:
-            aliases:
-               - message-router
-      expose:
-         - 3904
-      volumes:
-         - ./config/jsonConfigs/dmaapSimConfig.json:/opt/app/policy/simulators/etc/mounted/simParameters.json:ro
-   pdp:
-      image: pdp/simulator
-      container_name: pdp-simulator
-      depends_on:
-         - simulator
-      hostname: pdp-simulator
-      volumes:
-         - ./config/wait_for_port.sh:/opt/app/policy/pdp-sim/bin/wait_for_port.sh:ro
-         - ./config/jsonConfigs/pdpSimConfig.json:/opt/app/policy/pdp-sim/etc/config/OnapPfConfig.json:ro
-   policy-api:
-      image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
-      container_name: policy-api
-      hostname: policy-api
-      expose:
-         - 6969
-      depends_on:
-         - policy-db-migrator
-      volumes:
-         - ./config/jsonConfigs/apiConfigFile.json:/opt/app/policy/api/etc/defaultConfig.json:ro
-         - ./config/wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
-      entrypoint: /opt/app/policy/api/bin/wait_for_port.sh
-      command: [
-            '-c', './policy-api.sh',
-            'mariadb', '3306',
-            'policy-db-migrator', '6824'
-      ]
-   policy-pap:
-      image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
-      container_name: policy-pap
-      hostname: policy-pap
-      expose:
-         - 6969
-      depends_on:
-         - policy-db-migrator
-         - simulator
-         - policy-api
-      volumes:
-         - ./config/wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
-         - ./config/jsonConfigs/papConfigFile.json:/opt/app/policy/pap/etc/defaultConfig.json:ro
-      entrypoint: /opt/app/policy/pap/bin/wait_for_port.sh
-      command: [
-            '-c', './policy-pap.sh',
-            'mariadb', '3306',
-            'message-router', '3904',
-            'policy-api', '6969'
-      ]
-   policy-dist:
-      image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DIST_VERSION}
-      volumes:
-         - /tmp/policydistribution/distributionmount:/home/policydistribution
-         - ./distribution/bin/policy-dist.sh:/opt/app/policy/distribution/bin/policy-dist.sh
-         - ./distribution/etc/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json
-         - ./distribution/etc/logback.xml:/opt/app/policy/distribution/etc/logback.xml
-         - ./config/wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
-      expose:
-         - 6969
-         - 9090
-      container_name: policy-distribution
-      entrypoint: /opt/app/policy/bin/wait_for_port.sh
-      command: [
-            '-c', './policy-dist.sh',
-            'mariadb', '3306',
-            'message-router', '3904',
-            'policy-api', '6969',
-            'policy-pap', '6969'
-      ]
+  mariadb:
+    image: nexus3.onap.org:10001/mariadb:${POLICY_MARIADB_VER}
+    container_name: mariadb
+    hostname: mariadb
+    command: [ '--lower-case-table-names=1', '--wait_timeout=28800' ]
+    env_file: config/db/db.conf
+    volumes:
+      - ./config/db:/docker-entrypoint-initdb.d:ro
+    expose:
+      - 3306
+  policy-db-migrator:
+    image: nexus3.onap.org:10001/onap/policy-db-migrator:${POLICY_DB_MIGRATOR}
+    container_name: policy-db-migrator
+    hostname: policy-db-migrator
+    depends_on:
+      - mariadb
+    expose:
+      - 6824
+    env_file: config/db/db.conf
+    environment:
+      SQL_DB: policyadmin
+      SQL_HOST: mariadb
+    volumes:
+      - ./config/db-migrator/db_migrator_policy_init.sh:/opt/app/policy/bin/db_migrator_policy_init.sh:ro
+      - ./config/wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+        '-c',
+        '/opt/app/policy/bin/db_migrator_policy_init.sh',
+        'mariadb', '3306'
+    ]
+  simulator:
+    image: nexus3.onap.org:10001/onap/policy-models-simulator:${POLICY_MODELS_SIMULATOR}
+    container_name: simulator
+    hostname: simulator
+    networks:
+      default:
+        aliases:
+          - message-router
+    expose:
+      - 3904
+    volumes:
+      - ./config/jsonConfigs/dmaapSimConfig.json:/opt/app/policy/simulators/etc/mounted/simParameters.json:ro
+  pdp:
+    image: pdp/simulator
+    container_name: pdp-simulator
+    depends_on:
+      - simulator
+    hostname: pdp-simulator
+    volumes:
+      - ./config/wait_for_port.sh:/opt/app/policy/pdp-sim/bin/wait_for_port.sh:ro
+      - ./config/jsonConfigs/pdpSimConfig.json:/opt/app/policy/pdp-sim/etc/config/OnapPfConfig.json:ro
+  policy-api:
+    image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION}
+    container_name: policy-api
+    hostname: policy-api
+    expose:
+      - 6969
+    depends_on:
+      - policy-db-migrator
+    volumes:
+      - ./config/apiParameters.yaml:/opt/app/policy/api/etc/apiParameters.yaml:ro
+      - ./config/wait_for_port.sh:/opt/app/policy/api/bin/wait_for_port.sh:ro
+    entrypoint: /opt/app/policy/api/bin/wait_for_port.sh
+    command: [
+        '-c', './policy-api.sh',
+        'mariadb', '3306',
+        'policy-db-migrator', '6824'
+    ]
+  policy-pap:
+    image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION}
+    container_name: policy-pap
+    hostname: policy-pap
+    expose:
+      - 6969
+    depends_on:
+      - policy-db-migrator
+      - simulator
+      - policy-api
+    volumes:
+      - ./config/wait_for_port.sh:/opt/app/policy/pap/bin/wait_for_port.sh:ro
+      - ./config/papParameters.yaml:/opt/app/policy/pap/etc/papParameters.yaml:ro
+      - ./config/jsonConfigs/papGroups.json:/opt/app/policy/pap/etc/mounted/groups.json:ro
+    entrypoint: /opt/app/policy/pap/bin/wait_for_port.sh
+    command: [
+        '-c', './policy-pap.sh',
+        'mariadb', '3306',
+        'message-router', '3904',
+        'policy-api', '6969'
+    ]
+  policy-dist:
+    image: nexus3.onap.org:10001/onap/policy-distribution:${POLICY_DIST_VERSION}
+    volumes:
+      - /tmp/policydistribution/distributionmount:/home/policydistribution
+      - ./distribution/bin/policy-dist.sh:/opt/app/policy/distribution/bin/policy-dist.sh
+      - ./distribution/etc/defaultConfig.json:/opt/app/policy/distribution/etc/defaultConfig.json
+      - ./distribution/etc/logback.xml:/opt/app/policy/distribution/etc/logback.xml
+      - ./config/wait_for_port.sh:/opt/app/policy/bin/wait_for_port.sh:ro
+    expose:
+      - 6969
+      - 9090
+    container_name: policy-distribution
+    entrypoint: /opt/app/policy/bin/wait_for_port.sh
+    command: [
+        '-c', './policy-dist.sh',
+        'mariadb', '3306',
+        'message-router', '3904',
+        'policy-api', '6969',
+        'policy-pap', '6969'
+    ]