Updating FTC 2001, 10, 1 series tests to support a1pms V3 image

Issue-ID: NONRTRIC-1014
Change-Id: Icd7ef01e9806e3495b02ea5760bb94c6d88fee0d
Signed-off-by: Raviteja Karumuri <raviteja.karumuri@est.tech>

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/controllers/ConsumerController.java b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/controllers/ConsumerController.java
index 63cc215..30225c7 100644 (file)
--- a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/controllers/ConsumerController.java
+++ b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/controllers/ConsumerController.java
@@ -32,8 +32,9 @@ import org.springframework.web.bind.annotation.RestController;
 import com.demo.consumer.repository.InfoType;
 import com.demo.consumer.repository.InfoTypes;
 import com.demo.consumer.repository.Job.Parameters;
 import com.demo.consumer.repository.InfoType;
 import com.demo.consumer.repository.InfoTypes;
 import com.demo.consumer.repository.Job.Parameters;

+import com.demo.consumer.repository.Job.Parameters.KafkaDeliveryInfo;

 import com.demo.consumer.dme.ConsumerJobInfo;
 import com.demo.consumer.dme.ConsumerJobInfo;

-import com.demo.consumer.dme.ConsumerStatusInfo;
+import com.demo.consumer.dme.JobDataSchema;

 import com.demo.consumer.repository.Jobs;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.demo.consumer.repository.Jobs;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;


@@ -68,14 +69,22 @@ public class ConsumerController {
             this.jobs.addJob(request.infoTypeId, types.getType(request.infoTypeId), request.owner,
                     toJobParameters(request.jobDefinition));
         } catch (Exception e) {
             this.jobs.addJob(request.infoTypeId, types.getType(request.infoTypeId), request.owner,
                     toJobParameters(request.jobDefinition));
         } catch (Exception e) {

-            log.error("Error adding the job" + infoJobId, e.getMessage());
+            log.error("Error adding the job " + infoJobId + "{}", e.getMessage());

         }
     }
 
     @PostMapping("/info-type-status")
     public void statusChange(@RequestBody String requestBody) {
         }
     }
 
     @PostMapping("/info-type-status")
     public void statusChange(@RequestBody String requestBody) {

-        ConsumerStatusInfo request = gson.fromJson(requestBody, ConsumerStatusInfo.class);
-        log.info("Add Status Job Info", request);
+        JobDataSchema request = gson.fromJson(requestBody, JobDataSchema.class);
+        log.debug("Body Received: {}" , requestBody);
+        try {
+            this.jobs.addJob(request.getInfo_type_id(), types.getType(request.getInfo_type_id()), "",
+                new Parameters(new KafkaDeliveryInfo(
+                        request.getJob_data_schema().getTopic(),
+                        request.getJob_data_schema().getBootStrapServers(), 0)));
+        } catch (Exception e) {
+            log.error("Error adding the info type " + request.getInfo_type_id() + "{}", e.getMessage());
+        }

     }
 
     private Parameters toJobParameters(Object jobData) {
     }
 
     private Parameters toJobParameters(Object jobData) {

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/dme/JobDataSchema.java b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/dme/JobDataSchema.java
new file mode 100644 (file)
index 0000000..678f536
--- /dev/null
+++ b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/dme/JobDataSchema.java
@@ -0,0 +1,59 @@
+/*-
+ * ========================LICENSE_START=================================
+ * O-RAN-SC
+ *
+ * Copyright (C) 2024: OpenInfra Foundation Europe
+ *
+ * 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
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * 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.
+ * ========================LICENSE_END===================================
+ */
+
+package com.demo.consumer.dme;
+
+import com.google.gson.annotations.SerializedName;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import com.demo.consumer.repository.Job.Parameters.KafkaDeliveryInfo;
+import com.google.gson.Gson;
+
+@Data
+public class JobDataSchema {
+
+    public enum InfoJobStatusValues {
+        REGISTERED, UNREGISTERED
+    }
+    @SerializedName("info_type_id")
+    private String info_type_id;
+    @SerializedName("job_data_schema")
+    private DataSchema job_data_schema;
+    @SerializedName("status")
+    private InfoJobStatusValues status;
+
+    @Override
+    public String toString() {
+        return new Gson().toJson(this);
+    }
+
+    @Getter
+    @Setter
+    public class DataSchema {
+        private String title;
+        private String description;
+        @SerializedName("topic")
+        private String topic;
+        @SerializedName("bootStrapServers")
+        private String bootStrapServers;
+    }
+}

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/messages/PropertiesHelper.java b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/messages/PropertiesHelper.java
index 18be2f8..c4bd436 100644 (file)
--- a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/messages/PropertiesHelper.java
+++ b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/messages/PropertiesHelper.java
@@ -33,26 +33,41 @@ import com.demo.consumer.consumer.SimpleConsumer;
 @Component
 public class PropertiesHelper {
     private static final Logger log = LoggerFactory.getLogger(PropertiesHelper.class);
 @Component
 public class PropertiesHelper {
     private static final Logger log = LoggerFactory.getLogger(PropertiesHelper.class);

+    private static String kafkaServers = null;

 
     public static Properties getProperties() throws Exception {
 
     public static Properties getProperties() throws Exception {

-        Properties props = null;
+        Properties props = new Properties();

         try (InputStream input = SimpleConsumer.class.getClassLoader().getResourceAsStream("config.properties")) {
         try (InputStream input = SimpleConsumer.class.getClassLoader().getResourceAsStream("config.properties")) {

-            props = new Properties();

             if (input == null) {
             if (input == null) {

-                log.error("Found no configuration file in resources");
-                throw new Exception("Sorry, unable to find config.properties");
+                log.error("Failed to load configuration file 'config.properties'");
+                throw new IOException("Configuration file 'config.properties' not found");

             }
             props.load(input);
             }
             props.load(input);

-            String kafkaServers = System.getenv("KAFKA_SERVERS");
-            if (kafkaServers != null) {
+            setBootstrapServers(props);
+        } catch (IOException e) {
+            log.error("Error reading configuration file: ", e);
+            throw e;
+        }
+        return props;
+    }
+
+    private static void setBootstrapServers(Properties props) {
+        if (kafkaServers != null && !kafkaServers.isEmpty()) {
+            props.setProperty("bootstrap.servers", kafkaServers);
+            log.info("Using actively bootstrap servers: {}", kafkaServers);
+        } else {
+            String kafkaServersEnv = System.getenv("KAFKA_SERVERS");
+            if (kafkaServersEnv != null && !kafkaServersEnv.isEmpty()) {
+                kafkaServers = kafkaServersEnv;

                 props.setProperty("bootstrap.servers", kafkaServers);
                 props.setProperty("bootstrap.servers", kafkaServers);

-                log.info("Env variable KAFKA_SERVERS found, adding: " + kafkaServers);
+                log.info("Using environment variable KAFKA_SERVERS: {}", kafkaServers);

             } else {
             } else {

-                log.info("Env variable KAFKA_SERVERS not found, defaulting to config file");
+                log.info("Environment variable KAFKA_SERVERS not found, defaulting to config file");

             }
             }

-        } catch (IOException e) {
-            log.error("Error reading configuration file: ", e.getMessage());

         }
         }

-        return props;
+    }
+
+    public static void setKafkaServers(String servers) {
+        kafkaServers = servers;

     }
 }
     }
 }

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Job.java b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Job.java
index ba12345..e681714 100644 (file)
--- a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Job.java
+++ b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Job.java
@@ -22,6 +22,7 @@ package com.demo.consumer.repository;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 

+import lombok.AllArgsConstructor;

 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;


@@ -29,9 +30,11 @@ import lombok.ToString;
 
 @ToString
 public class Job {
 
 @ToString
 public class Job {

+    @AllArgsConstructor

     @Builder
     public static class Parameters {
 
     @Builder
     public static class Parameters {
 

+        @AllArgsConstructor

         @Builder
         @EqualsAndHashCode
         public static class KafkaDeliveryInfo {
         @Builder
         @EqualsAndHashCode
         public static class KafkaDeliveryInfo {

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Jobs.java b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Jobs.java
index 13f3180..eab8035 100644 (file)
--- a/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Jobs.java
+++ b/sample-services/ics-producer-consumer/consumer/src/main/java/com/demo/consumer/repository/Jobs.java
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 

+import com.demo.consumer.messages.PropertiesHelper;

 import com.demo.consumer.repository.Job.Parameters;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.demo.consumer.repository.Job.Parameters;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;


@@ -55,9 +56,20 @@ public class Jobs {
 
     public void addJob(String id, InfoType type, String owner, Parameters parameters) {
         Job job = new Job(id, type, owner, parameters);
 
     public void addJob(String id, InfoType type, String owner, Parameters parameters) {
         Job job = new Job(id, type, owner, parameters);

+        setKafkaServersEnvironment(job);

         this.put(job);
     }
 
         this.put(job);
     }
 

+    private void setKafkaServersEnvironment(Job job) {
+        String kafkaServers = job.getParameters().getDeliveryInfo().getBootStrapServers();
+        if (kafkaServers != null && !kafkaServers.isEmpty()) {
+            PropertiesHelper.setKafkaServers(kafkaServers);
+            logger.info("Setting variable bootStrapServers: {}", kafkaServers);
+        } else {
+            logger.warn("bootStrapServers is not set for job: {}", job.getId());
+        }
+    }
+

     private synchronized void put(Job job) {
         logger.debug("Put job: {}", job.getId());
         allJobs.put(job.getId(), job);
     private synchronized void put(Job job) {
         logger.debug("Put job: {}", job.getId());
         allJobs.put(job.getId(), job);

diff --git a/sample-services/ics-producer-consumer/consumer/src/main/resources/application.yaml b/sample-services/ics-producer-consumer/consumer/src/main/resources/application.yaml
index eed8326..1925f5c 100644 (file)
--- a/sample-services/ics-producer-consumer/consumer/src/main/resources/application.yaml
+++ b/sample-services/ics-producer-consumer/consumer/src/main/resources/application.yaml
@@ -19,7 +19,7 @@ server:
 
 vars:
   time: 1000
 
 vars:
   time: 1000

-  autostart: true
+  autostart: false

   topic: mytopic #This topic is used only in autostart
 
 spring:
   topic: mytopic #This topic is used only in autostart
 
 spring:

diff --git a/sample-services/ics-producer-consumer/start.sh b/sample-services/ics-producer-consumer/start.sh
index e05883e..7ddc908 100755 (executable)
--- a/sample-services/ics-producer-consumer/start.sh
+++ b/sample-services/ics-producer-consumer/start.sh
@@ -82,8 +82,7 @@ curl -X 'PUT' \
     "title":"STD_Type1_1.0.0",
     "description":"Type 1",
     "topic": "mytopic",
     "title":"STD_Type1_1.0.0",
     "description":"Type 1",
     "topic": "mytopic",

-    "bootStrapServers": "http://kafka-zkless:9092",
-    "numberOfMessages": 0
+    "bootStrapServers": "kafka-zkless:9092"

     }
 }'
 
     }
 }'
 


@@ -119,8 +118,8 @@ curl -X 'PUT' \
   "job_definition": {
     "deliveryInfo": {
       "topic": "mytopic",
   "job_definition": {
     "deliveryInfo": {
       "topic": "mytopic",

-      "bootStrapServers": "http://kafka-zkless:9092",
-      "numberOfMessages": 0
+      "bootStrapServers": "kafka-zkless:9092",
+      "numberOfMessages": 100

     }
   },
   "job_result_uri": "http://kafka-producer:8080/producer/job",
     }
   },
   "job_result_uri": "http://kafka-producer:8080/producer/job",


@@ -144,23 +143,20 @@ echo "Getting Consumer Subscription Job infos from ICS"
 curl -X 'GET' 'http://localhost:8083/data-consumer/v1/info-type-subscription/1' -H 'accept: application/json'
 space
 
 curl -X 'GET' 'http://localhost:8083/data-consumer/v1/info-type-subscription/1' -H 'accept: application/json'
 space
 

-#TEST To set kafka broker in the consumer
-curl -X 'POST' \
-  'http://localhost:8081/consumer/job/1' \
+#To Set Kafka Broker in Consumer
+echo "Sending type1 to ICS to use the callback"
+curl -X 'PUT' \
+  'http://localhost:8083/data-producer/v1/info-types/type1' \

   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{
   -H 'accept: application/json' \
   -H 'Content-Type: application/json' \
   -d '{

-  "info_type_id": "type1",
-  "job_owner": "demo",
-  "job_definition": {
-    "deliveryInfo": {
-      "topic": "mytopic",
-      "bootStrapServers": "http://kafka-zkless:9092",
-      "numberOfMessages": 0
+  "info_job_data_schema": {
+    "$schema":"http://json-schema.org/draft-07/schema#",
+    "title":"STD_Type1_1.0.0",
+    "description":"Type 1",
+    "topic": "mytopic",
+    "bootStrapServers": "kafka-zkless:9092"

     }
     }

-  },
-  "job_result_uri": "http://kafka-producer:8080/producer/job",
-  "status_notification_uri": "http://kafka-producer:8080/producer/supervision"

 }'
 
 #Using the autostart flag in the application.yaml
 }'
 
 #Using the autostart flag in the application.yaml


@@ -169,7 +165,7 @@ curl -X GET http://localhost:8080/startProducer/mytopic
 space
 
 echo "Start 1 Consumer on mytopic"
 space
 
 echo "Start 1 Consumer on mytopic"

-#curl -X GET http://localhost:8081/startConsumer/mytopic
+curl -X GET http://localhost:8081/startConsumer/mytopic

 space
 
 sleep 10
 space
 
 sleep 10

diff --git a/test/auto-test/FTC1.sh b/test/auto-test/FTC1.sh
index dbdde6a..8401bfd 100755 (executable)
--- a/test/auto-test/FTC1.sh
+++ b/test/auto-test/FTC1.sh
@@ -46,246 +46,278 @@ setup_testenvironment
 #### TEST BEGIN ####
 
 sim_generate_policy_uuid
 #### TEST BEGIN ####
 
 sim_generate_policy_uuid

+VERSIONS_TO_RUN=2

 
 

-# Tested variants of REST/DMAAP/SDNC config
-TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
-
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    TESTED_VARIANTS="REST   REST+SDNC"
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3

 fi
 
 fi
 

-#Test a1pms and simulator protocol versions (others are http only)
-TESTED_PROTOCOLS="HTTP HTTPS"
-for __httpx in $TESTED_PROTOCOLS ; do
-    for interface in $TESTED_VARIANTS ; do
-
-        echo "#####################################################################"
-        echo "#####################################################################"
-        echo "### Testing a1pms: $interface using $__httpx"
-        echo "#####################################################################"
-        echo "#####################################################################"
-
-        clean_environment
-
-        start_kube_proxy
-
-        if [ $__httpx == "HTTPS" ]; then
-            use_a1pms_rest_https
-        else
-            use_a1pms_rest_http
-        fi
-
-        start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-
-        set_a1pms_trace
-
-        # Create service to be able to receive events when rics becomes available
-        # Must use rest towards the a1pms since dmaap is not configured yet
-        a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
-
-        if [ $__httpx == "HTTPS" ]; then
-            use_cr_https
-            use_simulator_https
-            if [[ $interface = *"SDNC"* ]]; then
-                if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
-                    deviation "SDNC does not support NB https"
-                    use_sdnc_http
-                else
-                    use_sdnc_https
-                fi
-            fi
-            if [[ $interface = *"DMAAP"* ]]; then
-                use_a1pms_dmaap_https
-            else
-                use_a1pms_rest_https
-            fi
-        else
-            use_cr_http
-            use_simulator_http
-            if [[ $interface = *"SDNC"* ]]; then
-                use_sdnc_http
-            fi
-            if [[ $interface = *"DMAAP"* ]]; then
-                use_a1pms_dmaap_http
-            else
-                use_a1pms_rest_http
-            fi
-        fi
-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            if [ $__httpx == "HTTPS" ]; then
-                use_mr_https
-            else
-                use_mr_http
-            fi
-        fi
-
-        start_ric_simulators ricsim_g1 1  OSC_2.1.0
-        start_ric_simulators ricsim_g2 1  STD_1.1.3
-        start_ric_simulators ricsim_g3 1  STD_2.0.0
-
-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            start_mr    "$MR_READ_TOPIC"  "/events" "users/policy-agent" \
-                        "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
-        fi
-
-        start_cr 1
-
-        start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
-
-        if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-            start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-        fi
-
-
-        if [[ $interface = *"SDNC"* ]]; then
-            start_sdnc
-            controller_api_wait_for_status_ok 200 ricsim_g1_1
-            prepare_a1pms_config      SDNC    ".a1pms_config.json"
-        else
-            prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
-        fi
-
-        if [ $RUNMODE == "KUBE" ]; then
-            a1pms_load_config                       ".a1pms_config.json"
-        else
-            #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
-            if [ $__httpx == "HTTPS" ]; then
-                use_a1pms_rest_https
-            else
-                use_a1pms_rest_http
-            fi
-            a1pms_api_put_configuration 200 ".a1pms_config.json"
-            if [ $__httpx == "HTTPS" ]; then
-                if [[ $interface = *"DMAAP"* ]]; then
-                    use_a1pms_dmaap_https
-                else
-                    use_a1pms_rest_https
-                fi
-            else
-                if [[ $interface = *"DMAAP"* ]]; then
-                    use_a1pms_dmaap_http
-                else
-                    use_a1pms_rest_http
-                fi
-            fi
-        fi
-
-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            mr_equal requests_submitted 0
-        fi
-
-        sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
-
-        sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
-
-        a1pms_equal json:rics 3 300
-
-        a1pms_equal json:policy-types 3 120
-
-        a1pms_equal json:policies 0
-
-        a1pms_equal json:policy-instances 0
-
-        cr_equal 0 received_callbacks 3 120
-
-        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
-
-        echo "############################################"
-        echo "############## Health check ################"
-        echo "############################################"
-
-        sleep_wait 120 "Let A1PMS configuration take effect"
-
-        a1pms_api_get_status 200
-
-        echo "############################################"
-        echo "##### Service registry and supervision #####"
-        echo "############################################"
-
-        a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1"
-
-        a1pms_api_get_service_ids 200 "serv1" "ric-registration"
+for version in $(seq 2 $VERSIONS_TO_RUN); do
+
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  # Tested variants of REST/DMAAP/SDNC config
+  TESTED_VARIANTS="REST   DMAAP   REST+SDNC   DMAAP+SDNC"
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      TESTED_VARIANTS="REST   REST+SDNC"
+  fi
+
+  #Test a1pms and simulator protocol versions (others are http only)
+  TESTED_PROTOCOLS="HTTP HTTPS"
+  for __httpx in $TESTED_PROTOCOLS ; do
+      for interface in $TESTED_VARIANTS ; do
+
+          echo "#####################################################################"
+          echo "#####################################################################"
+          echo "### Testing a1pms: $interface using $__httpx with a1pms V${version}"
+          echo "#####################################################################"
+          echo "#####################################################################"
+
+          clean_environment
+
+          start_kube_proxy
+
+          if [ $__httpx == "HTTPS" ]; then
+              use_a1pms_rest_https
+          else
+              use_a1pms_rest_http
+          fi
+
+          start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+          set_a1pms_trace
+
+          # Create service to be able to receive events when rics becomes available
+          # Must use rest towards the a1pms since dmaap is not configured yet
+          a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+
+          if [ $__httpx == "HTTPS" ]; then
+              use_cr_https
+              use_simulator_https
+              if [[ $interface = *"SDNC"* ]]; then
+                  if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+                      deviation "SDNC does not support NB https"
+                      use_sdnc_http
+                  else
+                      use_sdnc_https
+                  fi
+              fi
+              if [[ $interface = *"DMAAP"* ]]; then
+                  use_a1pms_dmaap_https
+              else
+                  use_a1pms_rest_https
+              fi
+          else
+              use_cr_http
+              use_simulator_http
+              if [[ $interface = *"SDNC"* ]]; then
+                  use_sdnc_http
+              fi
+              if [[ $interface = *"DMAAP"* ]]; then
+                  use_a1pms_dmaap_http
+              else
+                  use_a1pms_rest_http
+              fi
+          fi
+          if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+              :
+          else
+              if [ $__httpx == "HTTPS" ]; then
+                  use_mr_https
+              else
+                  use_mr_http
+              fi
+          fi
+
+          start_ric_simulators ricsim_g1 1  OSC_2.1.0
+          start_ric_simulators ricsim_g2 1  STD_1.1.3
+          start_ric_simulators ricsim_g3 1  STD_2.0.0
+
+          if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+              :
+          else
+              start_mr    "$MR_READ_TOPIC"  "/events" "users/policy-agent" \
+                          "$MR_WRITE_TOPIC" "/events" "users/mr-stub"
+          fi
+
+          start_cr 1
+
+          start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+
+          if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+              start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+          fi
+
+
+          if [[ $interface = *"SDNC"* ]]; then
+              start_sdnc
+              controller_api_wait_for_status_ok 200 ricsim_g1_1
+              prepare_a1pms_config      SDNC    ".a1pms_config.json"
+          else
+              prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+          fi
+
+          if [ $RUNMODE == "KUBE" ]; then
+              a1pms_load_config                       ".a1pms_config.json"
+          else
+              #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
+              if [ $__httpx == "HTTPS" ]; then
+                  use_a1pms_rest_https
+              else
+                  use_a1pms_rest_http
+              fi
+              a1pms_api_put_configuration 200 ".a1pms_config.json"
+              if [ $__httpx == "HTTPS" ]; then
+                  if [[ $interface = *"DMAAP"* ]]; then
+                      use_a1pms_dmaap_https
+                  else
+                      use_a1pms_rest_https
+                  fi
+              else
+                  if [[ $interface = *"DMAAP"* ]]; then
+                      use_a1pms_dmaap_http
+                  else
+                      use_a1pms_rest_http
+                  fi
+              fi
+          fi
+
+          if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+              :
+          else
+              mr_equal requests_submitted 0
+          fi
+
+          sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+
+          sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+
+          a1pms_equal json:rics 3 300
+
+          if [ "$A1PMS_VERSION" == "V3" ]; then
+            a1pms_equal json:policytypes 3 120
+          else
+            a1pms_equal json:policy-types 3 120
+            a1pms_equal json:policy-instances 0
+          fi
+
+          a1pms_equal json:policies 0
+
+          cr_equal 0 received_callbacks 3 120
+
+          cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+
+          echo "############################################"
+          echo "############## Health check ################"
+          echo "############################################"
+
+          sleep_wait 120 "Let A1PMS configuration take effect"
+
+          a1pms_api_get_status 200
+
+          echo "############################################"
+          echo "##### Service registry and supervision #####"
+          echo "############################################"
+
+          a1pms_api_put_service 201 "serv1" 1000 "$CR_SERVICE_APP_PATH_0/1"
+
+          a1pms_api_get_service_ids 200 "serv1" "ric-registration"
+
+          a1pms_api_put_services_keepalive 200 "serv1"
+
+          echo "############################################"
+          echo "############## RIC Repository ##############"
+          echo "############################################"

 
 

-        a1pms_api_put_services_keepalive 200 "serv1"
+          a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0:AVAILABLE"

 
 

-        echo "############################################"
-        echo "############## RIC Repository ##############"
-        echo "############################################"
+          echo "############################################"
+          echo "########### A1 Policy Management ###########"
+          echo "############################################"

 
 

-        a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0:AVAILABLE"
+          notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+          if [ "$A1PMS_VERSION" == "V3" ]; then
+            a1pms_api_post_policy_v3 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy_v3 200 5000 testdata/OSC/pi1_template.json
+            a1pms_api_post_policy_v3 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+            a1pms_api_put_policy_v3 200 5200 testdata/STD2/pi_qos_template.json
+            a1pms_api_post_policy_v3 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy_v3 200 5100 testdata/STD/pi1_template.json
+          else
+            a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+            a1pms_api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+
+            a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+          fi
+
+          a1pms_equal json:policies 3

 
 

-        echo "############################################"
-        echo "########### A1 Policy Management ###########"
-        echo "############################################"
+          a1pms_api_delete_policy 204 5000

 
 

-        notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-        a1pms_api_put_policy 201 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-        a1pms_api_put_policy 200 "serv1" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-        a1pms_api_put_policy 201 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
-        a1pms_api_put_policy 200 "serv1" ricsim_g3_1 STD_QOS_0_2_0 5200 true $notificationurl testdata/STD2/pi_qos_template.json
+          a1pms_api_delete_policy 204 5100

 
 

-        a1pms_api_put_policy 201 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
-        a1pms_api_put_policy 200 "serv1" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+          a1pms_api_delete_policy 204 5200

 
 

-        a1pms_equal json:policies 3
+          a1pms_equal json:policies 0

 
 

-        a1pms_api_delete_policy 204 5000
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_equal json:policy-instances 0
+          fi

 
 

-        a1pms_api_delete_policy 204 5100
+          cr_equal 0 received_callbacks 3

 
 

-        a1pms_api_delete_policy 204 5200
+          if [[ $interface = *"DMAAP"* ]]; then

 
 

-        a1pms_equal json:policies 0
+              VAL=14 # Number of a1pms API calls over DMAAP
+              mr_equal requests_fetched $VAL
+              mr_equal responses_submitted $VAL
+              mr_equal responses_fetched $VAL
+              mr_equal current_requests 0
+              mr_equal current_responses 0
+          else
+              if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                  :
+              else
+                  mr_equal requests_submitted 0
+              fi
+          fi

 
 

-        a1pms_equal json:policy-instances 0
+          if [[ $interface = *"SDNC"* ]]; then
+              sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
+              sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
+              sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
+          else
+              sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+              sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+              sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
+          fi

 
 

-        cr_equal 0 received_callbacks 3
+          check_a1pms_logs

 
 

-        if [[ $interface = *"DMAAP"* ]]; then

 
 

-            VAL=14 # Number of a1pms API calls over DMAAP
-            mr_equal requests_fetched $VAL
-            mr_equal responses_submitted $VAL
-            mr_equal responses_fetched $VAL
-            mr_equal current_requests 0
-            mr_equal current_responses 0
-        else
-            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-                :
-            else
-                mr_equal requests_submitted 0
-            fi
-        fi
+          if [[ $interface = *"SDNC"* ]]; then
+              check_sdnc_logs
+          fi

 
 

-        if [[ $interface = *"SDNC"* ]]; then
-            sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
-            sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
-            sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
-        else
-            sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
-            sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
-            sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
-        fi
+          store_logs          "${__httpx}__${interface}"

 
 

-        check_a1pms_logs
+      done

 
 

-
-        if [[ $interface = *"SDNC"* ]]; then
-            check_sdnc_logs
-        fi
-
-        store_logs          "${__httpx}__${interface}"
-
-    done
+  done

 
 done
 
 done

-

 #### TEST COMPLETE ####
 
 
 #### TEST COMPLETE ####
 
 

diff --git a/test/auto-test/FTC10.sh b/test/auto-test/FTC10.sh
index bc391d6..a302cc3 100755 (executable)
--- a/test/auto-test/FTC10.sh
+++ b/test/auto-test/FTC10.sh
@@ -43,258 +43,344 @@ SUPPORTED_RUNMODES="DOCKER KUBE"
 setup_testenvironment
 
 #### TEST BEGIN ####
 setup_testenvironment
 
 #### TEST BEGIN ####

+VERSIONS_TO_RUN=2

 
 

-sim_generate_policy_uuid
-
-use_simulator_http
-use_mr_http
-use_a1pms_rest_http
-
-
-clean_environment
-
-start_kube_proxy
-
-start_ric_simulators  ricsim_g1 3 OSC_2.1.0
-
-start_ric_simulators  ricsim_g2 5 STD_1.1.3
-
-start_ric_simulators ricsim_g3 1  STD_2.0.0
-
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    start_mr
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3

 fi
 
 fi
 

-start_cr 1
+for version in $(seq 2 $VERSIONS_TO_RUN); do

 
 

+  echo "#####################################################################"
+  echo "#####################################################################"
+  echo "### Testing a1pms: V${version}"
+  echo "#####################################################################"
+  echo "#####################################################################"

 
 

-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  sim_generate_policy_uuid

 
 

-if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-    start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-fi
+  use_simulator_http
+  use_mr_http
+  use_a1pms_rest_http

 
 

-start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE

 
 

-set_a1pms_debug
+  clean_environment

 
 

-use_a1pms_rest_http
+  start_kube_proxy

 
 

+  start_ric_simulators  ricsim_g1 3 OSC_2.1.0

 
 

-prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+  start_ric_simulators  ricsim_g2 5 STD_1.1.3

 
 

-if [ $RUNMODE == "KUBE" ]; then
-    a1pms_load_config                       ".a1pms_config.json"
-else
-    a1pms_api_put_configuration 200 ".a1pms_config.json"
-fi
+  start_ric_simulators ricsim_g3 1  STD_2.0.0

 
 

-sleep_wait 120 "Let A1PMS configuration take effect"
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      start_mr
+  fi

 
 

-a1pms_api_get_status 200
+  start_cr 1

 
 

-sim_print ricsim_g1_1 interface

 
 

-sim_print ricsim_g2_1 interface
+  start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE

 
 

-sim_print ricsim_g3_1 interface
+  if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+      start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+  fi

 
 

-sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+  start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE

 
 

-sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
-a1pms_equal json:policy-types 3 300
+  set_a1pms_debug

 
 

-# Create policies
+  use_a1pms_rest_http

 
 

-notificationurl=$CR_SERVICE_APP_PATH_0"/test"

 
 

-use_a1pms_rest_http
+  prepare_a1pms_config      NOSDNC  ".a1pms_config.json"

 
 

-a1pms_api_put_service 201 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"
+  if [ $RUNMODE == "KUBE" ]; then
+      a1pms_load_config                       ".a1pms_config.json"
+  else
+      a1pms_api_put_configuration 200 ".a1pms_config.json"
+  fi

 
 

-a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  sleep_wait 120 "Let A1PMS configuration take effect"

 
 

-sim_equal ricsim_g1_1 num_instances 1
+  a1pms_api_get_status 200

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
+  sim_print ricsim_g1_1 interface

 
 

-a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  sim_print ricsim_g2_1 interface

 
 

-sim_equal ricsim_g1_1 num_instances 2
+  sim_print ricsim_g3_1 interface

 
 

+  sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json

 
 

-use_a1pms_rest_http
+  sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_equal json:policytypes 7 300
+  else
+    a1pms_equal json:policy-types 3 300
+  fi

 
 

-a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  # Create policies

 
 

-sim_equal ricsim_g2_1 num_instances 1
+  notificationurl=$CR_SERVICE_APP_PATH_0"/test"

 
 

+  use_a1pms_rest_http

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-
-a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
-
-sim_equal ricsim_g2_1 num_instances 2
-
-use_a1pms_rest_http
-
-a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  a1pms_api_put_service 201 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"

 
 

-sim_equal ricsim_g3_1 num_instances 1
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  fi

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-
-a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1
+  sim_equal ricsim_g1_1 num_instances 1

 
 

-sim_equal ricsim_g3_1 num_instances 2
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi

 
 

-#Update policies
-use_a1pms_rest_http
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  fi

 
 

-a1pms_api_put_service 200 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"
+  sim_equal ricsim_g1_1 num_instances 2

 
 

-a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1

 
 

-sim_equal ricsim_g1_1 num_instances 2
+  use_a1pms_rest_http

 
 

+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  fi

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
+  sim_equal ricsim_g2_1 num_instances 1

 
 

-a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1

 
 

-sim_equal ricsim_g1_1 num_instances 2
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi

 
 

+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  fi

 
 

-use_a1pms_rest_http
+  sim_equal ricsim_g2_1 num_instances 2

 
 

+  use_a1pms_rest_http

 
 

-a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  fi

 
 

-sim_equal ricsim_g2_1 num_instances 2
+  sim_equal ricsim_g3_1 num_instances 1

 
 

+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-
-a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1
+  else
+    a1pms_api_put_policy 201 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos_template.json 1
+  fi

 
 

-sim_equal ricsim_g2_1 num_instances 2
+  sim_equal ricsim_g3_1 num_instances 2

 
 

-use_a1pms_rest_http
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    # Check policies
+    a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+    a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+    a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+    a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+    a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+    a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+  fi

 
 

-a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  #Update policies
+  use_a1pms_rest_http

 
 

-sim_equal ricsim_g3_1 num_instances 2
+  a1pms_api_put_service 200 "service1" 3600 "$CR_SERVICE_APP_PATH_0/1"

 
 

+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 2000 testdata/OSC/pi1_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  fi

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-
-a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1
-
-sim_equal ricsim_g3_1 num_instances 2
-
-# Check policies
-a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
-a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
-a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
-a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
-a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
-a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
-
-sim_equal ricsim_g1_1 num_instances 2
-sim_equal ricsim_g2_1 num_instances 2
-
-sim_equal ricsim_g3_1 num_instances 2
-
-# Remove policies
-
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-a1pms_api_delete_policy 204 2000
-use_a1pms_rest_http
-a1pms_api_delete_policy 204 3000
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-a1pms_api_delete_policy 204 2100
-use_a1pms_rest_http
-a1pms_api_delete_policy 204 3100
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-a1pms_api_delete_policy 204 2200
-use_a1pms_rest_http
-a1pms_api_delete_policy 204 3200
-
-sim_equal ricsim_g1_1 num_instances 0
-sim_equal ricsim_g2_1 num_instances 0
-
-sim_equal ricsim_g3_1 num_instances 0
-
-# Check remote host access to simulator
-
-sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
-sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
-sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
-
-# Check policy removal
-use_a1pms_rest_http
-a1pms_api_get_policy 404 2000
-a1pms_api_get_policy 404 3000
-a1pms_api_get_policy 404 2100
-a1pms_api_get_policy 404 3100
-
-a1pms_api_get_policy 404 2200
-a1pms_api_get_policy 404 3200
-
-# Remove the service
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    use_a1pms_rest_http
-else
-    use_a1pms_dmaap_http
-fi
-a1pms_api_delete_services 204 "service1"
-
-a1pms_api_get_services 404 "service1"
+  sim_equal ricsim_g1_1 num_instances 2

 
 

-check_a1pms_logs

 
 

-#### TEST COMPLETE ####
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 3000 testdata/OSC/pi1_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g1_1 1 3000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json 1
+  fi
+
+  sim_equal ricsim_g1_1 num_instances 2
+
+
+  use_a1pms_rest_http
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 2100 testdata/STD/pi1_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 2100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  fi
+
+  sim_equal ricsim_g2_1 num_instances 2
+
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 3100 testdata/STD/pi1_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g2_1 NOTYPE 3100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json 1
+  fi
+
+  sim_equal ricsim_g2_1 num_instances 2
+
+  use_a1pms_rest_http
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 2200 testdata/STD2/pi_qos_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 2200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  fi
+
+  sim_equal ricsim_g3_1 num_instances 2
+
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_put_policy_v3 200 3200 testdata/STD2/pi_qos_template.json 1
+  else
+    a1pms_api_put_policy 200 "service1" ricsim_g3_1 STD_QOS_0_2_0 3200 true $notificationurl testdata/STD2/pi_qos_template.json 1
+  fi
+
+  sim_equal ricsim_g3_1 num_instances 2
+
+  if [ "$A1PMS_VERSION" != "V3" ]; then
+    # Check policies
+    a1pms_api_get_policy 200 2000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+    a1pms_api_get_policy 200 3000 testdata/OSC/pi1_template.json "service1" ricsim_g1_1 1 false $notificationurl
+    a1pms_api_get_policy 200 2100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+    a1pms_api_get_policy 200 3100 testdata/STD/pi1_template.json "service1" ricsim_g2_1 NOTYPE false $notificationurl
+    a1pms_api_get_policy 200 2200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+    a1pms_api_get_policy 200 3200 testdata/STD2/pi_qos_template.json "service1" ricsim_g3_1 STD_QOS_0_2_0 true $notificationurl
+  fi
+
+  sim_equal ricsim_g1_1 num_instances 2
+  sim_equal ricsim_g2_1 num_instances 2
+
+  sim_equal ricsim_g3_1 num_instances 2
+
+  # Remove policies
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+  a1pms_api_delete_policy 204 2000
+  use_a1pms_rest_http
+  a1pms_api_delete_policy 204 3000
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+  a1pms_api_delete_policy 204 2100
+  use_a1pms_rest_http
+  a1pms_api_delete_policy 204 3100
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+  a1pms_api_delete_policy 204 2200
+  use_a1pms_rest_http
+  a1pms_api_delete_policy 204 3200
+
+  sim_equal ricsim_g1_1 num_instances 0
+  sim_equal ricsim_g2_1 num_instances 0
+
+  sim_equal ricsim_g3_1 num_instances 0
+
+  # Check remote host access to simulator
+
+  sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+  sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+  sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
+
+  # Check policy removal
+  use_a1pms_rest_http
+  a1pms_api_get_policy 404 2000
+  a1pms_api_get_policy 404 3000
+  a1pms_api_get_policy 404 2100
+  a1pms_api_get_policy 404 3100
+
+  a1pms_api_get_policy 404 2200
+  a1pms_api_get_policy 404 3200
+
+  # Remove the service
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      use_a1pms_rest_http
+  else
+      use_a1pms_dmaap_http
+  fi
+  a1pms_api_delete_services 204 "service1"
+
+  a1pms_api_get_services 404 "service1"
+
+  check_a1pms_logs
+done
+  #### TEST COMPLETE ####

 
 store_logs          END
 
 print_result
 
 
 store_logs          END
 
 print_result
 

-auto_clean_environment
\ No newline at end of file
+auto_clean_environment

diff --git a/test/auto-test/FTC100.sh b/test/auto-test/FTC100.sh
index a473338..c034e71 100755 (executable)
--- a/test/auto-test/FTC100.sh
+++ b/test/auto-test/FTC100.sh
@@ -81,538 +81,636 @@ else
     TESTED_PROTOCOLS="HTTP"
 fi
 
     TESTED_PROTOCOLS="HTTP"
 fi
 

-for __httpx in $TESTED_PROTOCOLS ; do
-    for interface in $TESTED_VARIANTS ; do
+VERSIONS_TO_RUN=2

 
 

-        echo "#####################################################################"
-        echo "#####################################################################"
-        echo "### Testing a1pms: $interface using $__httpx"
-        echo "#####################################################################"
-        echo "#####################################################################"
-
-        # Clean container and start all needed containers #
-        clean_environment
-
-        if [ $RUNMODE != "KUBE" ]; then
-            USE_ISTIO=0
-            echo "ISTIO not supported by docker - setting USE-ISTIO=0"
-        fi
-
-        if [ $USE_ISTIO -eq 1 ]; then
-            echo -e $RED"#########################################"$ERED
-            echo -e $RED"# Work around istio jwks cache"$ERED
-            echo -e $RED"# Cycle istiod down and up to clear cache"$ERED
-            echo ""
-            __kube_scale deployment istiod istio-system 0
-            __kube_scale deployment istiod istio-system 1
-            echo -e $RED"# Cycle istiod done"
-            echo -e $RED"#########################################"$ERED
-
-            istio_enable_istio_namespace $KUBE_SIM_NAMESPACE
-            istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE
-            istio_enable_istio_namespace $KUBE_A1SIM_NAMESPACE
-        fi
-
-
-        start_kube_proxy
-
-        if [ $USE_ISTIO -eq 1 ]; then
-            start_keycloak
-
-            keycloak_api_obtain_admin_token
-
-            keycloak_api_create_realm                   nrtrealm   true   60
-            keycloak_api_create_confidential_client     nrtrealm   a1pmsc
-            keycloak_api_generate_client_secret         nrtrealm   a1pmsc
-            keycloak_api_get_client_secret              nrtrealm   a1pmsc
-            keycloak_api_create_client_roles            nrtrealm   a1pmsc nrtrole
-            keycloak_api_map_client_roles               nrtrealm   a1pmsc nrtrole
-
-            keycloak_api_get_client_token               nrtrealm   a1pmsc
-
-            CLIENT_TOKEN=$(keycloak_api_read_client_token nrtrealm   a1pmsc)
-            echo "CLIENT_TOKEN: "$CLIENT_TOKEN
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3
+fi

 
 

-            A1PMS_SEC=$(keycloak_api_read_client_secret nrtrealm   a1pmsc)
-            echo "A1PMS_SEC: "$A1PMS_SEC
+for version in $(seq 2 $VERSIONS_TO_RUN); do
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  for __httpx in $TESTED_PROTOCOLS ; do
+      for interface in $TESTED_VARIANTS ; do

 
 

-            # Protect ricsim-g3
-            istio_req_auth_by_jwks              ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
-            istio_auth_policy_by_issuer         ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+          echo "#####################################################################"
+          echo "#####################################################################"
+          echo "### Testing a1pms: ${interface} and ${__httpx} with a1pms V${version} "
+          echo "#####################################################################"
+          echo "#####################################################################"

 
 

-            istio_req_auth_by_jwksuri           ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm
-            istio_auth_policy_by_realm          ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+          # Clean container and start all needed containers #
+          clean_environment

 
 

-            # Protect ricsim-g2
-            istio_req_auth_by_jwks              ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
-            istio_auth_policy_by_issuer         ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+          if [ $RUNMODE != "KUBE" ]; then
+              USE_ISTIO=0
+              echo "ISTIO not supported by docker - setting USE-ISTIO=0"
+          fi
+
+          if [ $USE_ISTIO -eq 1 ]; then
+              echo -e $RED"#########################################"$ERED
+              echo -e $RED"# Work around istio jwks cache"$ERED
+              echo -e $RED"# Cycle istiod down and up to clear cache"$ERED
+              echo ""
+              __kube_scale deployment istiod istio-system 0
+              __kube_scale deployment istiod istio-system 1
+              echo -e $RED"# Cycle istiod done"
+              echo -e $RED"#########################################"$ERED
+
+              istio_enable_istio_namespace $KUBE_SIM_NAMESPACE
+              istio_enable_istio_namespace $KUBE_NONRTRIC_NAMESPACE
+              istio_enable_istio_namespace $KUBE_A1SIM_NAMESPACE
+          fi
+
+
+          start_kube_proxy
+
+          if [ $USE_ISTIO -eq 1 ]; then
+              start_keycloak
+
+              keycloak_api_obtain_admin_token
+
+              keycloak_api_create_realm                   nrtrealm   true   60
+              keycloak_api_create_confidential_client     nrtrealm   a1pmsc
+              keycloak_api_generate_client_secret         nrtrealm   a1pmsc
+              keycloak_api_get_client_secret              nrtrealm   a1pmsc
+              keycloak_api_create_client_roles            nrtrealm   a1pmsc nrtrole
+              keycloak_api_map_client_roles               nrtrealm   a1pmsc nrtrole
+
+              keycloak_api_get_client_token               nrtrealm   a1pmsc
+
+              CLIENT_TOKEN=$(keycloak_api_read_client_token nrtrealm   a1pmsc)
+              echo "CLIENT_TOKEN: "$CLIENT_TOKEN
+
+              A1PMS_SEC=$(keycloak_api_read_client_secret nrtrealm   a1pmsc)
+              echo "A1PMS_SEC: "$A1PMS_SEC
+
+              # Protect ricsim-g3
+              istio_req_auth_by_jwks              ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+              istio_auth_policy_by_issuer         ricsim-g1 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+              istio_req_auth_by_jwksuri           ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm
+              istio_auth_policy_by_realm          ricsim-g1 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+              # Protect ricsim-g2
+              istio_req_auth_by_jwks              ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+              istio_auth_policy_by_issuer         ricsim-g2 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+              istio_req_auth_by_jwksuri           ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm
+              istio_auth_policy_by_realm          ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+              # Protect ricsim-g3
+              istio_req_auth_by_jwks              ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+              istio_auth_policy_by_issuer         ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY
+
+              istio_req_auth_by_jwksuri           ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm
+              istio_auth_policy_by_realm          ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+              # Protect CR
+              istio_req_auth_by_jwks              $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
+              istio_auth_policy_by_issuer         $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY
+
+              istio_req_auth_by_jwksuri           $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm
+              istio_auth_policy_by_realm          $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+
+              a1pms_configure_sec nrtrealm a1pmsc $A1PMS_SEC
+          fi
+
+          if [ $__httpx == "HTTPS" ]; then
+              use_cr_https
+              use_a1pms_rest_https
+          else
+              use_a1pms_rest_http
+              use_cr_http
+          fi
+
+          start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+          set_a1pms_debug
+
+          # Create service to be able to receive events when rics becomes available
+          # Must use rest towards the a1pms since dmaap is not configured yet
+          a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+
+
+          if [ $__httpx == "HTTPS" ]; then
+              use_simulator_https
+              use_mr_https
+              if [[ $interface = *"SDNC"* ]]; then
+                  if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+                      deviation "SDNC does not support NB https"
+                      use_sdnc_http
+                  else
+                      use_sdnc_https
+                  fi
+              fi
+              if [[ $interface = *"DMAAP"* ]]; then
+                  use_a1pms_dmaap_https
+              else
+                  use_a1pms_rest_https
+              fi
+          else
+              use_simulator_http
+              use_mr_http
+              if [[ $interface = *"SDNC"* ]]; then
+                  use_sdnc_http
+              fi
+              if [[ $interface = *"DMAAP"* ]]; then
+                  use_a1pms_dmaap_http
+              else
+                  use_a1pms_rest_http
+              fi
+          fi
+
+          start_ric_simulators ricsim_g1 1  OSC_2.1.0
+          start_ric_simulators ricsim_g2 1  STD_1.1.3
+
+          sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+          sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json
+
+          start_ric_simulators ricsim_g3 1  STD_2.0.0
+          sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
+          sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
+
+          if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+              :
+          else
+              start_mr
+          fi
+
+          start_cr 1
+
+          start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE

 
 

-            istio_req_auth_by_jwksuri           ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm
-            istio_auth_policy_by_realm          ricsim-g2 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+          if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+              start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+          fi

 
 

-            # Protect ricsim-g3
-            istio_req_auth_by_jwks              ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
-            istio_auth_policy_by_issuer         ricsim-g3 $KUBE_A1SIM_NAMESPACE KUBEPROXY

 
 

-            istio_req_auth_by_jwksuri           ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm
-            istio_auth_policy_by_realm          ricsim-g3 $KUBE_A1SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+          if [[ $interface = *"SDNC"* ]]; then
+              start_sdnc
+              controller_api_wait_for_status_ok 200 ricsim_g1_1
+              prepare_a1pms_config      SDNC    ".a1pms_config.json"
+          else
+              prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+          fi

 
 

-            # Protect CR
-            istio_req_auth_by_jwks              $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY "$KUBE_PROXY_ISTIO_JWKS_KEYS"
-            istio_auth_policy_by_issuer         $CR_APP_NAME $KUBE_SIM_NAMESPACE KUBEPROXY
+          if [ $RUNMODE == "KUBE" ]; then
+              a1pms_load_config                       ".a1pms_config.json"
+          else
+              #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
+              if [ $__httpx == "HTTPS" ]; then
+                  use_a1pms_rest_https
+              else
+                  use_a1pms_rest_http
+              fi

 
 

-            istio_req_auth_by_jwksuri           $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm
-            istio_auth_policy_by_realm          $CR_APP_NAME $KUBE_SIM_NAMESPACE nrtrealm a1pmsc nrtrole
+              if [[ $interface != *"DMAAP"* ]]; then
+                  echo "{}" > ".a1pms_config_incorrect.json"
+                  a1pms_api_put_configuration 400 ".a1pms_config_incorrect.json"
+              fi

 
 

-            a1pms_configure_sec nrtrealm a1pmsc $A1PMS_SEC
-        fi
+              a1pms_api_put_configuration 200 ".a1pms_config.json"
+              a1pms_api_get_configuration 200 ".a1pms_config.json"
+              if [ $__httpx == "HTTPS" ]; then
+                  if [[ $interface = *"DMAAP"* ]]; then
+                      use_a1pms_dmaap_https
+                  else
+                      use_a1pms_rest_https
+                  fi
+              else
+                  if [[ $interface = *"DMAAP"* ]]; then
+                      use_a1pms_dmaap_http
+                  else
+                      use_a1pms_rest_http
+                  fi
+              fi
+          fi

 
 

-        if [ $__httpx == "HTTPS" ]; then
-            use_cr_https
-            use_a1pms_rest_https
-        else
-            use_a1pms_rest_http
-            use_cr_http
-        fi
+          a1pms_equal json:rics 3 300

 
 

-        start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+          if [ "$A1PMS_VERSION" == "V2" ]; then
+            a1pms_equal json:policy-types 5 120  #Wait for the a1pms to refresh types from the simulator
+          elif [ "$A1PMS_VERSION" == "V3" ]; then
+            a1pms_equal json:policytypes 5 120  #Wait for the a1pms to refresh types from the simulator
+          fi

 
 

-        set_a1pms_debug
+          a1pms_equal json:policies 0

 
 

-        # Create service to be able to receive events when rics becomes available
-        # Must use rest towards the a1pms since dmaap is not configured yet
-        a1pms_api_put_service 201 "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+          if [ "$A1PMS_VERSION" == "V2" ]; then
+            a1pms_equal json:policy-instances 0
+          fi

 
 

+          cr_equal 0 received_callbacks 3 120
+          cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1

 
 

-        if [ $__httpx == "HTTPS" ]; then
-            use_simulator_https
-            use_mr_https
-            if [[ $interface = *"SDNC"* ]]; then
-                if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
-                    deviation "SDNC does not support NB https"
-                    use_sdnc_http
-                else
-                    use_sdnc_https
-                fi
-            fi
-            if [[ $interface = *"DMAAP"* ]]; then
-                use_a1pms_dmaap_https
-            else
-                use_a1pms_rest_https
-            fi
-        else
-            use_simulator_http
-            use_mr_http
-            if [[ $interface = *"SDNC"* ]]; then
-                use_sdnc_http
-            fi
-            if [[ $interface = *"DMAAP"* ]]; then
-                use_a1pms_dmaap_http
-            else
-                use_a1pms_rest_http
-            fi
-        fi
+          if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+              :
+          else
+              mr_equal requests_submitted 0
+          fi

 
 

-        start_ric_simulators ricsim_g1 1  OSC_2.1.0
-        start_ric_simulators ricsim_g2 1  STD_1.1.3

 
 

-        sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
-        sim_put_policy_type 201 ricsim_g1_1 2 testdata/OSC/sim_2.json
+          echo "############################################"
+          echo "############## Health check ################"
+          echo "############################################"

 
 

-        start_ric_simulators ricsim_g3 1  STD_2.0.0
-        sim_put_policy_type 201 ricsim_g3_1 STD_QOS_0_2_0 testdata/STD2/sim_qos.json
-        sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
+          sleep_wait 120 "Let A1PMS configuration take effect"

 
 

-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            start_mr
-        fi
+          a1pms_api_get_status 200

 
 

-        start_cr 1
+          a1pms_api_get_status_root 200

 
 

-        start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+          echo "############################################"
+          echo "##### Service registry and supervision #####"
+          echo "############################################"

 
 

-        if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-            start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-        fi
+          a1pms_api_get_services 404 "service1"

 
 

+          a1pms_api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        if [[ $interface = *"SDNC"* ]]; then
-            start_sdnc
-            controller_api_wait_for_status_ok 200 ricsim_g1_1
-            prepare_a1pms_config      SDNC    ".a1pms_config.json"
-        else
-            prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
-        fi
+          a1pms_api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        if [ $RUNMODE == "KUBE" ]; then
-            a1pms_load_config                       ".a1pms_config.json"
-        else
-            #Temporary switch to http/https if dmaap use. Otherwise it is not possible to push config
-            if [ $__httpx == "HTTPS" ]; then
-                use_a1pms_rest_https
-            else
-                use_a1pms_rest_http
-            fi

 
 

-            if [[ $interface != *"DMAAP"* ]]; then
-                echo "{}" > ".a1pms_config_incorrect.json"
-                a1pms_api_put_configuration 400 ".a1pms_config_incorrect.json"
-            fi
+          a1pms_api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2"

 
 

-            a1pms_api_put_configuration 200 ".a1pms_config.json"
-            a1pms_api_get_configuration 200 ".a1pms_config.json"
-            if [ $__httpx == "HTTPS" ]; then
-                if [[ $interface = *"DMAAP"* ]]; then
-                    use_a1pms_dmaap_https
-                else
-                    use_a1pms_rest_https
-                fi
-            else
-                if [[ $interface = *"DMAAP"* ]]; then
-                    use_a1pms_dmaap_http
-                else
-                    use_a1pms_rest_http
-                fi
-            fi
-        fi
+          a1pms_api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2"

 
 

-        a1pms_equal json:rics 3 300
+          a1pms_api_put_service 400 "service2" 100 "/test"

 
 

-        a1pms_equal json:policy-types 5 120
+          a1pms_api_put_service 400 "service2" 100 "test-path"

 
 

-        a1pms_equal json:policies 0
+          a1pms_api_put_service 201 "service2" 300 "ftp://localhost:80/test"

 
 

-        a1pms_equal json:policy-instances 0
+          a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        cr_equal 0 received_callbacks 3 120
-        cr_api_check_all_sync_events 200 0 ric-registration ricsim_g1_1 ricsim_g2_1 ricsim_g3_1
+          a1pms_api_get_service_ids 200 "service1" "service2" "ric-registration"

 
 

-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            mr_equal requests_submitted 0
-        fi
+          a1pms_api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"

 
 
 
 

-        echo "############################################"
-        echo "############## Health check ################"
-        echo "############################################"
+          a1pms_api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"

 
 

-        sleep_wait 120 "Let A1PMS configuration take effect"

 
 

-        a1pms_api_get_status 200
+          a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        a1pms_api_get_status_root 200
+          a1pms_api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"  "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"

 
 

-        echo "############################################"
-        echo "##### Service registry and supervision #####"
-        echo "############################################"
+          a1pms_api_get_services 200

 
 

-        a1pms_api_get_services 404 "service1"
+          if [ "$A1PMS_VERSION" == "V2" ]; then
+            deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
+            #The below should work, kept here until fixed or other decision made
+            #a1pms_api_put_services_keepalive 201 "service1"
+            #Using the below until decision
+            a1pms_api_put_services_keepalive 200 "service1"

 
 

-        a1pms_api_put_service 201 "service1" 1000 "$CR_SERVICE_APP_PATH_0/1"
+            deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
+            #The below should work, keept here until fixed or other decision made
+            #a1pms_api_put_services_keepalive 201 "service3"
+            #Using the below until decision
+            a1pms_api_put_services_keepalive 200 "service3"

 
 

-        a1pms_api_put_service 200 "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
+            a1pms_api_put_services_keepalive 200 "service1"

 
 

+            a1pms_api_put_services_keepalive 200 "service3"

 
 

-        a1pms_api_put_service 400 "service2" -1 "$CR_SERVICE_APP_PATH_0/2"
+            a1pms_api_put_services_keepalive 404 "service5"
+          fi

 
 

-        a1pms_api_put_service 400 "service2" "wrong" "$CR_SERVICE_APP_PATH_0/2"
+          a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"

 
 

-        a1pms_api_put_service 400 "service2" 100 "/test"
+          a1pms_api_delete_services 204 "service1"

 
 

-        a1pms_api_put_service 400 "service2" 100 "test-path"
+          a1pms_api_get_service_ids 200 "service2" "service3" "ric-registration"

 
 

-        a1pms_api_put_service 201 "service2" 300 "ftp://localhost:80/test"

 
 

-        a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
+          a1pms_api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        a1pms_api_get_service_ids 200 "service1" "service2" "ric-registration"
+          a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"

 
 
 
 

-        a1pms_api_put_service 201 "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"
+          a1pms_api_delete_services 204 "service1"
+          a1pms_api_delete_services 204 "service3"

 
 

+          a1pms_equal json:services 2

 
 

-        a1pms_api_get_service_ids 200 "service1" "service2" "service3" "ric-registration"
+          a1pms_api_delete_services 204 "service2"

 
 

+          a1pms_equal json:services 1

 
 

-        a1pms_api_get_services 200 "service1" "service1" 2000 "$CR_SERVICE_APP_PATH_0/1"
+          echo "############################################"
+          echo "############## RIC Repository ##############"
+          echo "############################################"

 
 

-        a1pms_api_get_services 200 NOSERVICE "service1" 2000 "$CR_SERVICE_APP_PATH_0/1" "service2" 300 "ftp://localhost:80/test" "service3" 5000 "$CR_SERVICE_APP_PATH_0/3"  "ric-registration" 0 "$CR_SERVICE_APP_PATH_0/ric-registration"
+          a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"

 
 

-        a1pms_api_get_services 200
+          a1pms_api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"

 
 

-        deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
-        #The below should work, keept here until fixed or other decision made
-        #a1pms_api_put_services_keepalive 201 "service1"
-        #Using the below until decision
-        a1pms_api_put_services_keepalive 200 "service1"
+          a1pms_api_get_rics 404 47

 
 

-        deviation "TR2 - Keep alive shall return 200/201 according to doc, only 200 works - test combo $interface and $__httpx"
-        #The below should work, keept here until fixed or other decision made
-        #a1pms_api_put_services_keepalive 201 "service3"
-        #Using the below until decision
-        a1pms_api_put_services_keepalive 200 "service3"
+          a1pms_api_get_rics 404 "test"

 
 

-        a1pms_api_put_services_keepalive 200 "service1"
+          a1pms_api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"

 
 

-        a1pms_api_put_services_keepalive 200 "service3"
+          a1pms_api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"

 
 

-        a1pms_api_put_services_keepalive 404 "service5"
+          a1pms_api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"

 
 

-        a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
+          a1pms_api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"

 
 

-        a1pms_api_delete_services 204 "service1"
+          a1pms_api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"

 
 

-        a1pms_api_get_service_ids 200 "service2" "service3" "ric-registration"
+          a1pms_api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"

 
 

+          a1pms_api_get_ric 200 NOME      ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"

 
 

-        a1pms_api_put_service 201 "service1" 50 "$CR_SERVICE_APP_PATH_0/1"
+          a1pms_api_get_ric 200 NOME      ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"

 
 

-        a1pms_api_get_service_ids 200 "service1" "service2" "service3"  "ric-registration"
+          a1pms_api_get_ric 200 NOME      ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"

 
 

+          a1pms_api_get_ric 404 NOME test1

 
 

-        a1pms_api_delete_services 204 "service1"
-        a1pms_api_delete_services 204 "service3"
+          a1pms_api_get_ric 404 test NORIC

 
 

-        a1pms_equal json:services 2
+          a1pms_api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1

 
 

-        a1pms_api_delete_services 204 "service2"
+          a1pms_api_get_ric 400 me1_ricsim_g1_1 TESTRIC

 
 

-        a1pms_equal json:services 1
+          a1pms_api_get_ric 400 TESTME ricsim_g1_1

 
 

+          echo "############################################"
+          echo "########### A1 Policy Management ###########"
+          echo "############################################"

 
 

-        echo "############################################"
-        echo "############## RIC Repository ##############"
-        echo "############################################"
+          deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+          #Behaviour accepted for now
+          a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json
+          deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+          #Behaviour accepted for now
+          a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json
+          deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+          #Behaviour accepted for now
+          a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json
+          deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
+          #Behaviour accepted for now
+          a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json

 
 

-        a1pms_api_get_rics 200 NOTYPE "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE  ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+          a1pms_api_get_policy_type 404 3
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_api_get_policy_schemas 404

 
 

-        a1pms_api_get_rics 200 1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+            a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0

 
 

-        a1pms_api_get_rics 404 47
+            a1pms_api_get_policy_types 200 ricsim_g1_1 1 2

 
 

-        a1pms_api_get_rics 404 "test"
+            a1pms_api_get_policy_types 200 ricsim_g2_1 EMPTY

 
 

-        a1pms_api_get_ric 200 me1_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+            a1pms_api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0

 
 

-        a1pms_api_get_ric 200 me2_ricsim_g1_1 NORIC "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+            a1pms_api_get_policy_types 404 dummy-ric
+          fi

 
 

-        a1pms_api_get_ric 200 me1_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+          if [ "$A1PMS_VERSION" == "V3" ]; then

 
 

-        a1pms_api_get_ric 200 me2_ricsim_g2_1 NORIC "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+            a1pms_api_get_policy_types_v3 200 NORIC 1:ricsim_g1_1 2:ricsim_g1_1 EMPTY:ricsim_g2_1 STD_QOS_0_2_0:ricsim_g3_1 STD_QOS2_0.1.0:ricsim_g3_1

 
 

-        a1pms_api_get_ric 200 me1_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+            a1pms_api_get_policy_types_v3 200 ricsim_g1_1 1:ricsim_g1_1 2:ricsim_g1_1

 
 

-        a1pms_api_get_ric 200 me2_ricsim_g3_1 NORIC "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+            a1pms_api_get_policy_types_v3 200 ricsim_g2_1 EMPTY:ricsim_g2_1

 
 

-        a1pms_api_get_ric 200 NOME      ricsim_g1_1 "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2:AVAILABLE"
+            a1pms_api_get_policy_types_v3 200 ricsim_g3_1 STD_QOS_0_2_0:ricsim_g3_1 STD_QOS2_0.1.0:ricsim_g3_1

 
 

-        a1pms_api_get_ric 200 NOME      ricsim_g2_1 "ricsim_g2_1:me1_ricsim_g2_1,me2_ricsim_g2_1:EMPTYTYPE:AVAILABLE"
+            a1pms_api_get_policy_types_v3 404 dummy-ric

 
 

-        a1pms_api_get_ric 200 NOME      ricsim_g3_1 "ricsim_g3_1:me1_ricsim_g3_1,me2_ricsim_g3_1:STD_QOS_0_2_0,STD_QOS2_0.1.0:AVAILABLE"
+            a1pms_api_post_policy_v3 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT NONOTIFYURL testdata/OSC/pi1_template.json

 
 

-        a1pms_api_get_ric 404 NOME test1
+            a1pms_api_post_policy_v3 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT NONOTIFYURL testdata/OSC/pi1_template.json

 
 

-        a1pms_api_get_ric 404 test NORIC
+            a1pms_api_post_policy_v3 201 NOSERVICE ricsim_g2_1 NOTYPE 5100 NOTRANSIENT NONOTIFYURL testdata/STD/pi1_template.json

 
 

-        a1pms_api_get_ric 400 me1_ricsim_g1_1 ricsim_g1_1
+            a1pms_api_post_policy_v3 201 NOSERVICE ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT NONOTIFYURL testdata/STD2/pi_qos2_template.json
+          fi

 
 

-        a1pms_api_get_ric 400 me1_ricsim_g1_1 TESTRIC
+          a1pms_api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        a1pms_api_get_ric 400 TESTME ricsim_g1_1
+          notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+          deviation "TR10 - a1pms allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx"

 
 

-        echo "############################################"
-        echo "########### A1 Policy Management ###########"
-        echo "############################################"
+          if [ "$A1PMS_VERSION" != "V3" ]; then

 
 

-        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
-        #Behaviour accepted for now
-        a1pms_api_get_policy_type 200 1 testdata/OSC/1-a1pms-modified.json
-        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
-        #Behaviour accepted for now
-        a1pms_api_get_policy_type 200 2 testdata/OSC/2-a1pms-modified.json
-        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
-        #Behaviour accepted for now
-        a1pms_api_get_policy_type 200 STD_QOS_0_2_0 testdata/STD2/qos-a1pms-modified.json
-        deviation "TR9 - a1pms modify the type with type id - test combo $interface and $__httpx"
-        #Behaviour accepted for now
-        a1pms_api_get_policy_type 200 STD_QOS2_0.1.0 testdata/STD2/qos2-a1pms-modified.json
-
-        a1pms_api_get_policy_type 404 3
-
-        a1pms_api_get_policy_schemas 404
-
-
-        a1pms_api_get_policy_types 200 NORIC 1 2 EMPTY STD_QOS_0_2_0 STD_QOS2_0.1.0
-
-        a1pms_api_get_policy_types 200 ricsim_g1_1 1 2
-
-        a1pms_api_get_policy_types 200 ricsim_g2_1 EMPTY
-
-        a1pms_api_get_policy_types 200 ricsim_g3_1 STD_QOS_0_2_0 STD_QOS2_0.1.0
-
-        a1pms_api_get_policy_types 404 dummy-ric
-
-
-
-        a1pms_api_put_service 201 "service10" 3600 "$CR_SERVICE_APP_PATH_0/1"
-
-        notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+            if [[ $interface != *"DMAAP"* ]]; then
+                # Badly formatted json is not possible to send via dmaap
+                a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi_bad_template.json
+            fi
+            a1pms_api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json

 
 

-        if [[ $interface != *"DMAAP"* ]]; then
-            # Badly formatted json is not possible to send via dmaap
-            a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi_bad_template.json
-        fi
-        deviation "TR10 - a1pms allows policy creation on unregistered service (orig problem) - test combo $interface and $__httpx"
-        #Kept until decison
-        #a1pms_api_put_policy 400 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT testdata/OSC/pi1_template.json
-        #Allow 201 for now
-        a1pms_api_put_policy 201 "unregistered-service" ricsim_g1_1 1 2000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json

 
 

-        a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 true $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 false $notificationurl testdata/OSC/pi1_template.json

 
 

-        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 true $notificationurl testdata/OSC/pi1_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g1_1 1 5000 false $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json

 
 

-        a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json

 
 

-        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 true $notificationurl testdata/STD/pi1_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g2_1 NOTYPE 5100 false $notificationurl testdata/STD/pi1_template.json
+            a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json

 
 

-        a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json
+            a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json

 
 

-        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 true $notificationurl testdata/STD2/pi_qos2_template.json
-        a1pms_api_put_policy 200 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 false $notificationurl testdata/STD2/pi_qos2_template.json
+            a1pms_api_get_policy_status 404 1
+            a1pms_api_get_policy_status 404 2
+            if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+              VAL='NOT IN EFFECT'
+              VAL2="false"
+              VAL3=EMPTY
+              VAL4=EMPTY
+            else
+              VAL="NOT_ENFORCED"
+              VAL2="OTHER_REASON"
+              VAL3="NOT_ENFORCED"
+              VAL4="OTHER_REASON"
+            fi
+            a1pms_api_get_policy_status 200 5000 OSC "$VAL" "$VAL2"
+            a1pms_api_get_policy_status 200 5100 STD "UNDEFINED"
+            a1pms_api_get_policy_status 200 5200 STD2 $VAL3 $VAL4

 
 

-        a1pms_api_get_policy_status 404 1
-        a1pms_api_get_policy_status 404 2
-        VAL='NOT IN EFFECT'
-        a1pms_api_get_policy_status 200 5000 OSC "$VAL" "false"
-        a1pms_api_get_policy_status 200 5100 STD "UNDEFINED"
-        a1pms_api_get_policy_status 200 5200 STD2 EMPTY EMPTY
+            deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+            #kept until decision
+            #a1pms_equal json:policy_ids 2
+            #Allow 3 for now
+            a1pms_equal json:policy-instances 4
+          fi

 
 

+          deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+          #kept until decision
+          #a1pms_equal json:policies 2
+          #Allow 3 for now
+          a1pms_equal json:policies 4

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_equal json:policies 2
-        #Allow 3 for now
-        a1pms_equal json:policies 4
+          deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+          #kept until decision
+          #a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100
+          #Allow policy create with unregistered service for now

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_equal json:policy_ids 2
-        #Allow 3 for now
-        a1pms_equal json:policy-instances 4
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100
-        #Allow policy create with unregistered service for now
-        a1pms_api_get_policy_ids 200 NORIC NOSERVICE NOTYPE 5000 5100 2000 5200
+            deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+            #kept until decision
+            #a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000
+            #Allow policy create with unregistered service for now
+            a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000
-        #Allow policy create with unregistered service for now
-        a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000 2000
+            a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100

 
 

-        a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE NOTYPE 5100
+            a1pms_api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200

 
 

-        a1pms_api_get_policy_ids 200 ricsim_g3_1 NOSERVICE NOTYPE 5200
+            a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200

 
 

-        a1pms_api_get_policy_ids 200 NORIC "service10" NOTYPE 5000 5100 5200
+            deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+            #kept until decision
+            #a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000
+            #Allow policy create with unregistered service for now

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000
-        #Allow policy create with unregistered service for now
+            a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000 2000

 
 

-        a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000 2000
+            a1pms_api_get_policy_ids 200 NORIC NOSERVICE 2 NOID

 
 

-        a1pms_api_get_policy_ids 200 NORIC NOSERVICE 2 NOID
+            a1pms_api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200

 
 

-        a1pms_api_get_policy_ids 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200
+            a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID
+          fi

 
 

-        a1pms_api_get_policy_ids 200 ricsim_g2_1 NOSERVICE 1 NOID
+          if [ "$A1PMS_VERSION" == "V3" ]; then
+            a1pms_api_get_all_policies_v3 200 NORIC NOSERVICE NOTYPE 5000:ricsim_g1_1 5100:ricsim_g2_1 2000:ricsim_g1_1 5200:ricsim_g3_1

 
 

-        a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl
+            deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+            #kept until decision
+            #a1pms_api_get_policy_ids 200 ricsim_g1_1 NOSERVICE NOTYPE 5000
+            #Allow policy create with unregistered service for now
+            a1pms_api_get_all_policies_v3 200 ricsim_g1_1 NOSERVICE NOTYPE 5000:ricsim_g1_1 2000:ricsim_g1_1

 
 

-        a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl
+            a1pms_api_get_all_policies_v3 200 ricsim_g2_1 NOSERVICE NOTYPE 5100:ricsim_g2_1

 
 

-        a1pms_api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl
+            a1pms_api_get_all_policies_v3 200 ricsim_g3_1 NOSERVICE NOTYPE 5200:ricsim_g3_1

 
 

-        a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json
+            a1pms_api_get_all_policies_v3 200 NORIC "service10" NOTYPE 5000:ricsim_g1_1

 
 

-        deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
-        #kept until decision
-        #a1pms_api_delete_policy 404 2000
-        #Allow policy create with unregistered service for now
-        a1pms_api_delete_policy 204 2000
+            deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+            #kept until decision
+            #a1pms_api_get_policy_ids 200 NORIC NOSERVICE 1 5000
+            #Allow policy create with unregistered service for now

 
 

-        a1pms_api_delete_policy 404 1500
+            a1pms_api_get_all_policies_v3 200 NORIC NOSERVICE 1 5000:ricsim_g1_1 2000:ricsim_g1_1

 
 

-        a1pms_api_delete_policy 204 5000
+            a1pms_api_get_all_policies_v3 200 NORIC NOSERVICE 2 NOID

 
 

-        a1pms_api_delete_policy 204 5200
+            a1pms_api_get_all_policies_v3 200 NORIC NOSERVICE STD_QOS2_0.1.0 5200:ricsim_g3_1

 
 

-        a1pms_equal json:policies 1
+            a1pms_api_get_all_policies_v3 200 ricsim_g2_1 NOSERVICE 1 NOID
+          fi

 
 

+          a1pms_api_get_policy 200 5000 testdata/OSC/pi1_template.json "service10" ricsim_g1_1 1 false $notificationurl

 
 

-        a1pms_equal json:policy-instances 1
+          a1pms_api_get_policy 200 5100 testdata/STD/pi1_template.json "service10" ricsim_g2_1 NOTYPE false $notificationurl

 
 

-        a1pms_api_delete_policy 204 5100
+          a1pms_api_get_policy 200 5200 testdata/STD2/pi_qos2_template.json "service10" ricsim_g3_1 STD_QOS2_0.1.0 false $notificationurl

 
 

-        a1pms_equal json:policies 0
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_api_get_policies 200 ricsim_g1_1 "service10" 1 5000 ricsim_g1_1 "service10" 1 false $notificationurl testdata/OSC/pi1_template.json
+          fi

 
 

-        a1pms_equal json:policy-instances 0
+          if [ "$A1PMS_VERSION" == "V3" ]; then
+            a1pms_api_put_policy_v3 200 5100 testdata/STD/pi1_template.json

 
 

-        cr_equal 0 received_callbacks 3
+            a1pms_api_put_policy_v3 200 5200 testdata/STD2/pi_qos2_template.json

 
 

-        if [[ $interface = *"DMAAP"* ]]; then
-            mr_greater requests_submitted 0
-            VAL=$(mr_read requests_submitted)
-            mr_equal requests_fetched $VAL
-            mr_equal responses_submitted $VAL
-            mr_equal responses_fetched $VAL
-            mr_equal current_requests 0
-            mr_equal current_responses 0
-        else
-            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-                :
-            else
-                mr_equal requests_submitted 0
-            fi
-        fi
-        if [ $USE_ISTIO -eq 0 ]; then
-            if [[ $interface = *"SDNC"* ]]; then
-                sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
-                sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
-                sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
-            else
-                sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
-                sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
-                sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
+            if [[ $interface != *"DMAAP"* ]]; then
+               a1pms_api_put_policy_v3 400 2000 testdata/OSC/pi_bad_template.json

             fi
             fi

-        fi
-
-        check_a1pms_logs
-
-        if [[ $interface = *"SDNC"* ]]; then
-            check_sdnc_logs
-        fi
-
-        store_logs          "${__httpx}__${interface}"
-
-    done
+          fi
+          deviation "TR10 - a1pms allows policy creation on unregistered service (side effect of orig. problem)- test combo $interface and $__httpx"
+          #kept until decision
+          #a1pms_api_delete_policy 404 2000
+          #Allow policy create with unregistered service for now
+          a1pms_api_delete_policy 204 2000
+
+          a1pms_api_delete_policy 404 1500
+
+          a1pms_api_delete_policy 204 5000
+
+          a1pms_api_delete_policy 204 5200
+
+          a1pms_equal json:policies 1
+
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_equal json:policy-instances 1
+          fi
+
+          a1pms_api_delete_policy 204 5100
+
+          a1pms_equal json:policies 0
+
+          if [ "$A1PMS_VERSION" != "V3" ]; then
+            a1pms_equal json:policy-instances 0
+          fi
+
+          cr_equal 0 received_callbacks 3
+
+          if [[ $interface = *"DMAAP"* ]]; then
+              mr_greater requests_submitted 0
+              VAL=$(mr_read requests_submitted)
+              mr_equal requests_fetched $VAL
+              mr_equal responses_submitted $VAL
+              mr_equal responses_fetched $VAL
+              mr_equal current_requests 0
+              mr_equal current_responses 0
+          else
+              if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                  :
+              else
+                  mr_equal requests_submitted 0
+              fi
+          fi
+          if [ $USE_ISTIO -eq 0 ]; then
+              if [[ $interface = *"SDNC"* ]]; then
+                  sim_contains_str ricsim_g1_1 remote_hosts $SDNC_APP_NAME
+                  sim_contains_str ricsim_g2_1 remote_hosts $SDNC_APP_NAME
+                  sim_contains_str ricsim_g3_1 remote_hosts $SDNC_APP_NAME
+              else
+                  sim_contains_str ricsim_g1_1 remote_hosts $A1PMS_APP_NAME
+                  sim_contains_str ricsim_g2_1 remote_hosts $A1PMS_APP_NAME
+                  sim_contains_str ricsim_g3_1 remote_hosts $A1PMS_APP_NAME
+              fi
+          fi
+
+          check_a1pms_logs
+
+          if [[ $interface = *"SDNC"* ]]; then
+              check_sdnc_logs
+          fi
+
+          store_logs          "${__httpx}__${interface}"
+
+      done
+
+  done

 
 done
 
 done

-

 #### TEST COMPLETE ####
 
 
 #### TEST COMPLETE ####
 
 

diff --git a/test/auto-test/FTC110.sh b/test/auto-test/FTC110.sh
index cfc3f6f..985fd46 100755 (executable)
--- a/test/auto-test/FTC110.sh
+++ b/test/auto-test/FTC110.sh
@@ -44,211 +44,252 @@ SUPPORTED_RUNMODES="DOCKER KUBE"
 setup_testenvironment
 
 #### TEST BEGIN ####
 setup_testenvironment
 
 #### TEST BEGIN ####

+VERSIONS_TO_RUN=2

 
 

-sim_generate_policy_uuid
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3
+fi

 
 

-use_cr_http
-use_simulator_http
-use_mr_http
-use_a1pms_rest_http
+for version in $(seq 2 $VERSIONS_TO_RUN); do

 
 

-clean_environment
+  echo "#####################################################################"
+  echo "#####################################################################"
+  echo "### Testing a1pms: V${version}"
+  echo "#####################################################################"
+  echo "#####################################################################"

 
 

-start_kube_proxy
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  sim_generate_policy_uuid

 
 

-start_ric_simulators ricsim_g1 1  OSC_2.1.0
-start_ric_simulators ricsim_g2 1  STD_1.1.3
-start_ric_simulators ricsim_g3 1  STD_2.0.0
+  use_cr_http
+  use_simulator_http
+  use_mr_http
+  use_a1pms_rest_http

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    start_mr
-fi
+  clean_environment

 
 

-start_cr 1
+  start_kube_proxy

 
 

-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+  start_ric_simulators ricsim_g1 1  OSC_2.1.0
+  start_ric_simulators ricsim_g2 1  STD_1.1.3
+  start_ric_simulators ricsim_g3 1  STD_2.0.0

 
 

-if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-    start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-fi
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      start_mr
+  fi

 
 

-start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+  start_cr 1

 
 

+  start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE

 
 

-prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+  if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+      start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+  fi

 
 

-if [ $RUNMODE == "KUBE" ]; then
-    a1pms_load_config                       ".a1pms_config.json"
-else
-    a1pms_api_put_configuration 200 ".a1pms_config.json"
-fi
+  start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE

 
 

-set_a1pms_debug

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    mr_equal requests_submitted 0
-fi
+  prepare_a1pms_config      NOSDNC  ".a1pms_config.json"

 
 

-sleep_wait 120 "Let A1PMS configuration take effect"
+  if [ $RUNMODE == "KUBE" ]; then
+      a1pms_load_config                       ".a1pms_config.json"
+  else
+      a1pms_api_put_configuration 200 ".a1pms_config.json"
+  fi

 
 

-#Check a1pms alive
-a1pms_api_get_status 200
+  set_a1pms_debug

 
 

-#Print simulator interface version
-sim_print ricsim_g1_1 interface
-sim_print ricsim_g2_1 interface
-sim_print ricsim_g3_1 interface
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      mr_equal requests_submitted 0
+  fi

 
 

-a1pms_api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"
+  sleep_wait 120 "Let A1PMS configuration take effect"

 
 

-a1pms_api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"
+  #Check a1pms alive
+  a1pms_api_get_status 200

 
 

-a1pms_api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"
+  #Print simulator interface version
+  sim_print ricsim_g1_1 interface
+  sim_print ricsim_g2_1 interface
+  sim_print ricsim_g3_1 interface

 
 

-a1pms_api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"
+  a1pms_api_put_service 201 "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"

 
 

-a1pms_api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
-a1pms_api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
+  a1pms_api_get_services 200 "service1" "service1" 15 "$CR_SERVICE_APP_PATH_0/service1"

 
 

-a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
-a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
+  a1pms_api_put_service 201 "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-a1pms_api_get_service_ids 200 "service1" "service2"
+  a1pms_api_get_services 200 "service2" "service2" 120 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-sleep_wait 30 "Waiting for keep alive timeout"
+  a1pms_api_put_service 200 "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_put_service 200 "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
-a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
+  a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-sleep_wait 100 "Waiting for keep alive timeout"
+  a1pms_api_get_service_ids 200 "service1" "service2"

 
 

-a1pms_api_get_services 404 "service1"
-a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"
+  sleep_wait 30 "Waiting for keep alive timeout"

 
 

-a1pms_api_delete_services 204 "service2"
+  a1pms_api_get_services 200 "service1" "service1" 50 "$CR_SERVICE_APP_PATH_0/service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-a1pms_api_get_services 404 "service1"
-a1pms_api_get_services 404 "service2"
+  sleep_wait 100 "Waiting for keep alive timeout"

 
 

-a1pms_api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 200 "service2" "service2" 180 "$CR_SERVICE_APP_PATH_0/service2"

 
 

-a1pms_api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
+  a1pms_api_delete_services 204 "service2"

 
 

-sleep_wait 30 "Waiting for keep alive timeout"
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 404 "service2"

 
 

-a1pms_api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"
+  a1pms_api_put_service 201 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"

 
 

-sleep_wait 100 "Waiting for keep alive timeout"
+  a1pms_api_get_services 200 "service3" "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"

 
 

-a1pms_api_get_services 404 "service3"
+  sleep_wait 30 "Waiting for keep alive timeout"

 
 

-a1pms_api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
+  a1pms_api_put_service 200 "service3" 60 "$CR_SERVICE_APP_PATH_0/service3"

 
 

-sleep_wait 60 "Waiting for keep alive timeout"
+  sleep_wait 100 "Waiting for keep alive timeout"

 
 

-a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
+  a1pms_api_get_services 404 "service3"

 
 

-a1pms_api_put_services_keepalive 200 "service4"
+  a1pms_api_put_service 201 "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"

 
 

-sleep_wait 90 "Waiting for keep alive timeout"
+  sleep_wait 60 "Waiting for keep alive timeout"

 
 

-a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"
+  a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"

 
 

-a1pms_api_delete_services 204 "service4"
+  a1pms_api_put_services_keepalive 200 "service4"

 
 

-a1pms_api_get_services 404 "service4"
+  sleep_wait 90 "Waiting for keep alive timeout"

 
 

-a1pms_api_get_services 404 "service1"
-a1pms_api_get_services 404 "service2"
-a1pms_api_get_services 404 "service3"
+  a1pms_api_get_services 200 "service4" "service4" 120 "$CR_SERVICE_APP_PATH_0/service4"

 
 

-a1pms_api_get_service_ids 200
+  a1pms_api_delete_services 204 "service4"

 
 

-a1pms_api_delete_services 404 "service1"
-a1pms_api_delete_services 404 "service2"
-a1pms_api_delete_services 404 "service3"
-a1pms_api_delete_services 404 "service4"
+  a1pms_api_get_services 404 "service4"

 
 

-a1pms_api_put_services_keepalive 404 "service1"
-a1pms_api_put_services_keepalive 404 "service2"
-a1pms_api_put_services_keepalive 404 "service3"
-a1pms_api_put_services_keepalive 404 "service4"
+  a1pms_api_get_services 404 "service1"
+  a1pms_api_get_services 404 "service2"
+  a1pms_api_get_services 404 "service3"

 
 

-# Policy delete after timeout
-a1pms_api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10"
+  a1pms_api_get_service_ids 200

 
 

-sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json
+  a1pms_api_delete_services 404 "service1"
+  a1pms_api_delete_services 404 "service2"
+  a1pms_api_delete_services 404 "service3"
+  a1pms_api_delete_services 404 "service4"

 
 

-sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json
+  a1pms_api_put_services_keepalive 404 "service1"
+  a1pms_api_put_services_keepalive 404 "service2"
+  a1pms_api_put_services_keepalive 404 "service3"
+  a1pms_api_put_services_keepalive 404 "service4"

 
 

-a1pms_equal json:rics 3 300
+  # Policy delete after timeout
+  a1pms_api_put_service 201 "service10" 600 "$CR_SERVICE_APP_PATH_0/service10"

 
 

-#a1pms_equal json:policy_schemas 2 120
+  sim_put_policy_type 201 ricsim_g1_1 1 testdata/OSC/sim_1.json

 
 

-a1pms_equal json:policy-types 3 120
+  sim_put_policy_type 201 ricsim_g3_1 STD_QOS2_0.1.0 testdata/STD2/sim_qos2.json

 
 

-a1pms_equal json:policies 0
+  a1pms_equal json:rics 3 300

 
 

-notificationurl=$CR_SERVICE_APP_PATH_0"/test"
+  #a1pms_equal json:policy_schemas 2 120

 
 

-a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
-a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json
+  a1pms_equal json:policies 0

 
 

-a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json
-a1pms_equal json:policies 3
+  notificationurl=$CR_SERVICE_APP_PATH_0"/test"

 
 

-sim_equal ricsim_g1_1 num_instances 1
-sim_equal ricsim_g2_1 num_instances 1
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_equal json:policytypes 3 120
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json

 
 

-a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
-a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json

 
 

-a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
-a1pms_equal json:policies 6
+  else
+    a1pms_equal json:policy-types 3 120
+    a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5100 NOTRANSIENT $notificationurl testdata/STD/pi1_template.json

 
 

-sim_equal ricsim_g1_1 num_instances 2
-sim_equal ricsim_g2_1 num_instances 2
-sim_equal ricsim_g3_1 num_instances 2
+    a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5200 NOTRANSIENT $notificationurl testdata/STD2/pi_qos2_template.json

 
 

-sim_post_delete_instances 200 ricsim_g1_1
-sim_post_delete_instances 200 ricsim_g2_1
+  fi

 
 

-sim_post_delete_instances 200 ricsim_g3_1
+  a1pms_equal json:policies 3

 
 

-#Wait for recreate of non transient policy
-a1pms_equal json:policies 3 180
+  sim_equal ricsim_g1_1 num_instances 1
+  sim_equal ricsim_g2_1 num_instances 1

 
 

-sim_equal ricsim_g1_1 num_instances 1
-sim_equal ricsim_g2_1 num_instances 1
-sim_equal ricsim_g3_1 num_instances 1
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json

 
 

-a1pms_api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10"
+    a1pms_api_post_policy_v3 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
+  else
+    a1pms_api_put_policy 201 "service10" ricsim_g1_1 1 5001 true $notificationurl testdata/OSC/pi1_template.json
+    a1pms_api_put_policy 201 "service10" ricsim_g2_1 NOTYPE 5101 true $notificationurl testdata/STD/pi1_template.json

 
 

-#Wait for service expiry
-a1pms_equal json:policies 0 120
+    a1pms_api_put_policy 201 "service10" ricsim_g3_1 STD_QOS2_0.1.0 5201 true $notificationurl testdata/STD2/pi_qos2_template.json
+  fi
+  a1pms_equal json:policies 6

 
 

-sim_equal ricsim_g1_1 num_instances 0
-sim_equal ricsim_g2_1 num_instances 0
-sim_equal ricsim_g3_1 num_instances 0
+  sim_equal ricsim_g1_1 num_instances 2
+  sim_equal ricsim_g2_1 num_instances 2
+  sim_equal ricsim_g3_1 num_instances 2

 
 

-a1pms_api_get_service_ids 200
+  sim_post_delete_instances 200 ricsim_g1_1
+  sim_post_delete_instances 200 ricsim_g2_1

 
 

-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    mr_equal requests_submitted 0
-fi
+  sim_post_delete_instances 200 ricsim_g3_1
+
+  #Wait for recreate of non transient policy
+  a1pms_equal json:policies 3 180
+
+  sim_equal ricsim_g1_1 num_instances 1
+  sim_equal ricsim_g2_1 num_instances 1
+  sim_equal ricsim_g3_1 num_instances 1
+
+  a1pms_api_put_service 200 "service10" 10 "$CR_SERVICE_APP_PATH_0/service10"
+
+  #Wait for service expiry
+  a1pms_equal json:policies 0 120
+
+  sim_equal ricsim_g1_1 num_instances 0
+  sim_equal ricsim_g2_1 num_instances 0
+  sim_equal ricsim_g3_1 num_instances 0
+
+  a1pms_api_get_service_ids 200
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      mr_equal requests_submitted 0
+  fi

 
 

-check_a1pms_logs
+  check_a1pms_logs

 
 

-#### TEST COMPLETE ####
+  #### TEST COMPLETE ####

 
 

-store_logs          END
+  store_logs          END

 
 

-print_result
+  print_result

 
 

-auto_clean_environment
\ No newline at end of file
+  auto_clean_environment
+done
\ No newline at end of file

diff --git a/test/auto-test/FTC150.sh b/test/auto-test/FTC150.sh
index 0a53d59..103d74c 100755 (executable)
--- a/test/auto-test/FTC150.sh
+++ b/test/auto-test/FTC150.sh
@@ -128,9 +128,14 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
 
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
 
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000

-
-        VAL='NOT_ENFORCED'
-        controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "OTHER_REASON"
+        if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+          VAL='NOT IN EFFECT'
+          VAL2="false"
+        else
+          VAL='NOT_ENFORCED'
+          VAL2="OTHER_REASON"
+        fi
+        controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "$VAL2"

         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
         RESP=202
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
         RESP=202

diff --git a/test/auto-test/FTC2001.sh b/test/auto-test/FTC2001.sh
index f63e5d1..f39eb02 100755 (executable)
--- a/test/auto-test/FTC2001.sh
+++ b/test/auto-test/FTC2001.sh
@@ -43,205 +43,249 @@ SUPPORTED_RUNMODES="DOCKER KUBE"
 setup_testenvironment
 
 #### TEST BEGIN ####
 setup_testenvironment
 
 #### TEST BEGIN ####

+VERSIONS_TO_RUN=2

 
 

-#Local vars in test script
-##########################
-
-use_cr_https
-use_a1pms_rest_https
-use_simulator_https
-use_ics_rest_https
-use_prod_stub_https
-
-notificationurl=$CR_SERVICE_APP_PATH_0"/test"
-
-clean_environment
-
-start_kube_proxy
-
-STD_NUM_RICS=2
-
-start_http_proxy
-
-start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
-
-if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-    :
-else
-    start_mr #Just to prevent errors in the a1pms log...
-fi
-
-start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
-
-if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-    start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-fi
-
-start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
-
-
-
-prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
-
-if [ $RUNMODE == "KUBE" ]; then
-    a1pms_load_config                       ".a1pms_config.json"
-else
-    a1pms_api_put_configuration 200 ".a1pms_config.json"
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3

 fi
 
 fi
 

-start_cr 1
+for version in $(seq 2 $VERSIONS_TO_RUN); do

 
 

-start_prod_stub
+  echo "#####################################################################"
+  echo "#####################################################################"
+  echo "### Testing a1pms: V${version}"
+  echo "#####################################################################"
+  echo "#####################################################################"

 
 

-start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+  #Local vars in test script
+  ##########################

 
 

-set_a1pms_trace
+  use_cr_https
+  use_a1pms_rest_https
+  use_simulator_https
+  use_ics_rest_https
+  use_prod_stub_https

 
 

-set_ics_debug
+  notificationurl=$CR_SERVICE_APP_PATH_0"/test"

 
 

-sleep_wait 120 "Let A1PMS configuration take effect"
+  clean_environment
+
+  start_kube_proxy
+
+  STD_NUM_RICS=2
+
+  start_http_proxy
+
+  start_ric_simulators $RIC_SIM_PREFIX"_g3" $STD_NUM_RICS STD_2.0.0
+
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+      :
+  else
+      start_mr #Just to prevent errors in the a1pms log...
+  fi
+
+  start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+
+  if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+      start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+  fi
+
+  start_a1pms PROXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+
+
+
+  prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+
+  if [ $RUNMODE == "KUBE" ]; then
+      a1pms_load_config                       ".a1pms_config.json"
+  else
+      a1pms_api_put_configuration 200 ".a1pms_config.json"
+  fi
+
+  start_cr 1
+
+  start_prod_stub
+
+  start_ics PROXY $SIM_GROUP/$ICS_COMPOSE_DIR/$ICS_CONFIG_FILE
+
+  set_a1pms_trace
+
+  set_ics_debug
+
+  sleep_wait 120 "Let A1PMS configuration take effect"
+
+  a1pms_api_get_status 200
+
+  # Print the A1 version for STD 2.X
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_print $RIC_SIM_PREFIX"_g3_"$i interface
+  done
+  total_policy_types=2
+  # Load the policytypes in std
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
+      sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json
+  done
+
+  #Check the number of schemas and the individual schemas in STD
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    total_policy_type_entries=$((STD_NUM_RICS * total_policy_types))
+    a1pms_equal json:policytypes ${total_policy_type_entries} 120
+  else
+    a1pms_equal json:policy-types ${total_policy_types} 120
+  fi

 
 

-a1pms_api_get_status 200
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+    if [ "$A1PMS_VERSION" == "V3" ]; then
+      a1pms_equal json:policytypes?nearRtRicId=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120
+    else
+      a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i ${total_policy_types} 120
+    fi
+  done

 
 

-# Print the A1 version for STD 2.X
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_print $RIC_SIM_PREFIX"_g3_"$i interface
-done
-# Load the policytypes in std
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 demo-testdata/STD2/sim_qos.json
-    sim_put_policy_type 201 $RIC_SIM_PREFIX"_g3_"$i STD_QOS2_0.1.0 demo-testdata/STD2/sim_qos2.json
-done
+  # Check the schemas in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json
+      a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json
+  done

 
 

-#Check the number of schemas and the individual schemas in STD
-a1pms_equal json:policy-types 2 120
+  #Check the number of types
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    total_policy_type_entries=$((STD_NUM_RICS * total_policy_types))
+    a1pms_equal json:policytypes ${total_policy_type_entries} 300
+  else
+    a1pms_equal json:policy-types ${total_policy_types} 300
+  fi

 
 

-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    a1pms_equal json:policy-types?ric_id=$RIC_SIM_PREFIX"_g3_"$i 2 120
-done
+  a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"

 
 

-# Check the schemas in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    a1pms_api_get_policy_type 200 STD_QOS_0_2_0 demo-testdata/STD2/qos-a1pms-modified.json
-    a1pms_api_get_policy_type 200 'STD_QOS2_0.1.0' demo-testdata/STD2/qos2-a1pms-modified.json
-done
-
-#Check the number of types
-a1pms_equal json:policy-types 2 300
-
-a1pms_api_put_service 201 "Emergency-response-app" 0 "$CR_SERVICE_APP_PATH_0/1"
+  # Create policies in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_generate_policy_uuid
+      if [ "$A1PMS_VERSION" == "V3" ]; then
+        a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+        sim_generate_policy_uuid
+        a1pms_api_post_policy_v3 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+      else
+        a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+        sim_generate_policy_uuid
+        a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
+      fi
+  done

 
 

-# Create policies in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_generate_policy_uuid
-    a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i STD_QOS_0_2_0 $((2300+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
-    sim_generate_policy_uuid
-    a1pms_api_put_policy 201 "Emergency-response-app" $RIC_SIM_PREFIX"_g3_"$i 'STD_QOS2_0.1.0' $((2400+$i)) NOTRANSIENT $notificationurl demo-testdata/STD2/pi1_template.json 1
-done

 
 

+  # Check the number of policies in STD
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
+  done
+
+  # Print calling hosts STD 2.X
+  for ((i=1; i<=$STD_NUM_RICS; i++))
+  do
+      sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts
+      sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy
+  done
+
+
+  CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
+  CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
+  RIC_G1_1=$RIC_SIM_PREFIX"_g3_1"
+  RIC_G1_2=$RIC_SIM_PREFIX"_g3_2"
+  if [ $RUNMODE == "KUBE" ]; then
+      RIC_G1_1=$(get_kube_sim_host $RIC_G1_1)
+      RIC_G1_2=$(get_kube_sim_host $RIC_G1_2)
+  fi
+  TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
+  TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
+
+  STATUS1="$CR_SERVICE_APP_PATH_0/job1-status"
+  STATUS2="$CR_SERVICE_APP_PATH_0/job2-status"
+
+  prodstub_arm_producer 200 prod-a
+  prodstub_arm_type 200 prod-a type1
+  prodstub_arm_job_create 200 prod-a job1
+  prodstub_arm_job_create 200 prod-a job2
+
+  ### ics status
+  ics_api_service_status 200
+
+  if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+      #Type registration status callbacks
+      TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1"
+
+      ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1
+
+      ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
+  fi
+
+  ## Setup prod-a
+  ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
+
+  ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
+  ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
+
+  ics_api_edp_get_producer_status 200 prod-a ENABLED
+
+
+  ## Create a job for prod-a
+  ## job1 - prod-a
+  ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
+
+  # Check the job data in the producer
+  prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
+
+  ## Create a second job for prod-a
+  ## job2 - prod-a
+  ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
+
+  # Check the job data in the producer
+  prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
+
+  # Arm producer prod-a for supervision failure
+  prodstub_arm_producer 200 prod-a 400
+
+  # Wait for producer prod-a to go disabled
+  ics_api_edp_get_producer_status 200 prod-a DISABLED 360
+
+  ics_equal json:data-producer/v1/info-producers 0 1000
+
+  if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
+      cr_equal 0 received_callbacks 3 30
+      cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED
+      cr_api_check_all_ics_events 200 0 job1-status DISABLED
+      cr_api_check_all_ics_events 200 0 job2-status DISABLED
+  else
+      cr_equal 0 received_callbacks 2 30
+      cr_api_check_all_ics_events 200 0 job1-status DISABLED
+      cr_api_check_all_ics_events 200 0 job2-status DISABLED
+  fi

 
 

-# Check the number of policies in STD
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_equal $RIC_SIM_PREFIX"_g3_"$i num_instances 2
-done
+  cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME

 
 

-# Print calling hosts STD 2.X
-for ((i=1; i<=$STD_NUM_RICS; i++))
-do
-    sim_print $RIC_SIM_PREFIX"_g3_"$i remote_hosts
-    sim_contains_str $RIC_SIM_PREFIX"_g3_"$i remote_hosts proxy
+  check_a1pms_logs
+  check_ics_logs

 done
 done

-
-
-CB_JOB="$PROD_STUB_SERVICE_PATH$PROD_STUB_JOB_CALLBACK"
-CB_SV="$PROD_STUB_SERVICE_PATH$PROD_STUB_SUPERVISION_CALLBACK"
-RIC_G1_1=$RIC_SIM_PREFIX"_g3_1"
-RIC_G1_2=$RIC_SIM_PREFIX"_g3_2"
-if [ $RUNMODE == "KUBE" ]; then
-    RIC_G1_1=$(get_kube_sim_host $RIC_G1_1)
-    RIC_G1_2=$(get_kube_sim_host $RIC_G1_2)
-fi
-TARGET1="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
-TARGET2="$RIC_SIM_HTTPX://$RIC_G1_1:$RIC_SIM_PORT/datadelivery"
-
-STATUS1="$CR_SERVICE_APP_PATH_0/job1-status"
-STATUS2="$CR_SERVICE_APP_PATH_0/job2-status"
-
-prodstub_arm_producer 200 prod-a
-prodstub_arm_type 200 prod-a type1
-prodstub_arm_job_create 200 prod-a job1
-prodstub_arm_job_create 200 prod-a job2
-
-### ics status
-ics_api_service_status 200
-
-if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
-    #Type registration status callbacks
-    TYPESTATUS1="$CR_SERVICE_APP_PATH_0/type-status1"
-
-    ics_api_idc_put_subscription 201 subscription-id-1 owner1 $TYPESTATUS1
-
-    ics_api_idc_get_subscription_ids 200 owner1 subscription-id-1
-fi
-
-## Setup prod-a
-ics_api_edp_put_type_2 201 type1 testdata/ics/ei-type-1.json
-
-ics_api_edp_put_producer_2 201 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-
-ics_api_edp_get_producer_2 200 prod-a $CB_JOB/prod-a $CB_SV/prod-a type1
-
-ics_api_edp_get_producer_status 200 prod-a ENABLED
-
-
-## Create a job for prod-a
-## job1 - prod-a
-ics_api_a1_put_job 201 job1 type1 $TARGET1 ricsim_g3_1 $STATUS1 testdata/ics/job-template.json
-
-# Check the job data in the producer
-prodstub_check_jobdata_3 200 prod-a job1 type1 $TARGET1 ricsim_g3_1 testdata/ics/job-template.json
-
-## Create a second job for prod-a
-## job2 - prod-a
-ics_api_a1_put_job 201 job2 type1 $TARGET2 ricsim_g3_2 $STATUS2 testdata/ics/job-template.json
-
-# Check the job data in the producer
-prodstub_check_jobdata_3 200 prod-a job2 type1 $TARGET2 ricsim_g3_2 testdata/ics/job-template.json
-
-# Arm producer prod-a for supervision failure
-prodstub_arm_producer 200 prod-a 400
-
-# Wait for producer prod-a to go disabled
-ics_api_edp_get_producer_status 200 prod-a DISABLED 360
-
-ics_equal json:data-producer/v1/info-producers 0 1000
-
-if [[ "$ICS_FEATURE_LEVEL" == *"TYPE-SUBSCRIPTIONS"* ]]; then
-    cr_equal 0 received_callbacks 3 30
-    cr_api_check_all_ics_subscription_events 200 0 type-status1 type1 testdata/ics/ei-type-1.json REGISTERED
-    cr_api_check_all_ics_events 200 0 job1-status DISABLED
-    cr_api_check_all_ics_events 200 0 job2-status DISABLED
-else
-    cr_equal 0 received_callbacks 2 30
-    cr_api_check_all_ics_events 200 0 job1-status DISABLED
-    cr_api_check_all_ics_events 200 0 job2-status DISABLED
-fi
-
-cr_contains_str 0 remote_hosts $HTTP_PROXY_APP_NAME
-
-check_a1pms_logs
-check_ics_logs
-
-#### TEST COMPLETE ####
+  #### TEST COMPLETE ####

 
 store_logs          END
 
 print_result
 
 
 store_logs          END
 
 print_result
 

-auto_clean_environment
\ No newline at end of file
+auto_clean_environment

diff --git a/test/auto-test/FTC2002.sh b/test/auto-test/FTC2002.sh
index 547492c..c8d3f6e 100755 (executable)
--- a/test/auto-test/FTC2002.sh
+++ b/test/auto-test/FTC2002.sh
@@ -143,7 +143,13 @@ for __nb_httpx in $NB_TESTED_PROTOCOLS ; do
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
 
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000
 

-        VAL='NOT IN EFFECT'
+        if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H]$  || $TEST_ENV_PROFILE =~ ^ONAP-[A-L]$ ]]; then
+            VAL='NOT IN EFFECT'
+            VAL2="false"
+        else
+            VAL='NOT_ENFORCED'
+            VAL2="OTHER_REASON"
+        fi

         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 
         controller_api_get_A1_policy_status 200 OSC ricsim_g1_1 1 4000 "$VAL" "false"
         controller_api_get_A1_policy_status 200 STD ricsim_g2_1 5000 "UNDEFINED"
 

diff --git a/test/auto-test/FTC850.sh b/test/auto-test/FTC850.sh
index d228eee..5c1c016 100755 (executable)
--- a/test/auto-test/FTC850.sh
+++ b/test/auto-test/FTC850.sh
@@ -60,171 +60,223 @@ sim_generate_policy_uuid
 
 notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 
 
 notificationurl=$CR_SERVICE_APP_PATH_0"/test"
 

-for __httpx in $TESTED_PROTOCOLS ; do
-    for interface in $TESTED_VARIANTS ; do
-
-        echo "#####################################################################"
-        echo "#####################################################################"
-        echo "### Testing a1pms: "$interface" and "$__httpx
-        echo "#####################################################################"
-        echo "#####################################################################"
-
-        if [ $__httpx == "HTTPS" ]; then
-            use_cr_https
-            use_simulator_https
-            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-                :
-            else
-                use_mr_https
-            fi
-            if [[ $interface = *"SDNC"* ]]; then
-                if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
-                    deviation "SDNC does not support NB https"
-                    use_sdnc_http
+VERSIONS_TO_RUN=2
+
+if [ -n "$A1PMS_V3_FLAG" ] && [ "${A1PMS_V3_FLAG,,}" == "true" ]; then
+  VERSIONS_TO_RUN=3
+fi
+
+for version in $(seq 2 $VERSIONS_TO_RUN); do
+  if [ "$version" == "3" ]; then
+    if [ -n "$A1PMS_V3" ] && [ -n "$A1PMS_API_PREFIX_V3" ] && [ -n "$A1PMS_ALIVE_URL_V3" ]; then
+      export A1PMS_VERSION="$A1PMS_V3"
+      export A1PMS_API_PREFIX="$A1PMS_API_PREFIX_V3"
+      export A1PMS_ALIVE_URL="$A1PMS_API_PREFIX$A1PMS_ALIVE_URL_V3"
+    else
+      echo "One/All parameters not set in env file (<A1PMS_V3>, <A1PMS_API_PREFIX_V3>, <A1PMS_ALIVE_URL_V3>)"
+      break
+    fi
+  fi
+    for __httpx in $TESTED_PROTOCOLS ; do
+        for interface in $TESTED_VARIANTS ; do
+
+            echo "#####################################################################"
+            echo "#####################################################################"
+            echo "### Testing a1pms: "$interface" and "$__httpx" with a1pms V"$version
+            echo "#####################################################################"
+            echo "#####################################################################"
+
+            if [ $__httpx == "HTTPS" ]; then
+                use_cr_https
+                use_simulator_https
+                if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                    :

                 else
                 else

-                    use_sdnc_https
+                    use_mr_https

                 fi
                 fi

-            fi
-            use_a1pms_rest_https
-        else
-            use_cr_http
-            use_simulator_http
-            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-                :
+                if [[ $interface = *"SDNC"* ]]; then
+                    if [[ "$SDNC_FEATURE_LEVEL" == *"NO_NB_HTTPS"* ]]; then
+                        deviation "SDNC does not support NB https"
+                        use_sdnc_http
+                    else
+                        use_sdnc_https
+                    fi
+                fi
+                use_a1pms_rest_https

             else
             else

-                use_mr_http
-            fi
-            if [[ $interface = *"SDNC"* ]]; then
-                use_sdnc_http
+                use_cr_http
+                use_simulator_http
+                if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                    :
+                else
+                    use_mr_http
+                fi
+                if [[ $interface = *"SDNC"* ]]; then
+                    use_sdnc_http
+                fi
+                use_a1pms_rest_http

             fi
             fi

-            use_a1pms_rest_http
-        fi

 
 

-        # Clean container and start all needed containers #
-        clean_environment
+            # Clean container and start all needed containers #
+            clean_environment

 
 

-        start_kube_proxy
+            start_kube_proxy

 
 

-        start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0
+            start_ric_simulators ricsim_g1 $NUM_RICS OSC_2.1.0

 
 

-        start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE
+            start_control_panel $SIM_GROUP/$CONTROL_PANEL_COMPOSE_DIR/$CONTROL_PANEL_CONFIG_FILE

 
 

-        if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
-            start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
-        fi
+            if [ ! -z "$NRT_GATEWAY_APP_NAME" ]; then
+                start_gateway $SIM_GROUP/$NRT_GATEWAY_COMPOSE_DIR/$NRT_GATEWAY_CONFIG_FILE
+            fi

 
 

-        start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE
+            start_a1pms NORPOXY $SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_CONFIG_FILE

 
 

-        set_a1pms_debug
+            set_a1pms_debug

 
 
 
 
 
 

-        if [[ $interface = *"SDNC"* ]]; then
-            start_sdnc
-            controller_api_wait_for_status_ok 200 ricsim_g1_1
-            prepare_a1pms_config      SDNC  ".a1pms_config.json"
-        else
-            prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
-        fi
+            if [[ $interface = *"SDNC"* ]]; then
+                start_sdnc
+                controller_api_wait_for_status_ok 200 ricsim_g1_1
+                prepare_a1pms_config      SDNC  ".a1pms_config.json"
+            else
+                prepare_a1pms_config      NOSDNC  ".a1pms_config.json"
+            fi

 
 

-        if [ $RUNMODE == "KUBE" ]; then
-            a1pms_load_config                       ".a1pms_config.json"
-        else
-            a1pms_api_put_configuration 200 ".a1pms_config.json"
-        fi
+            if [ $RUNMODE == "KUBE" ]; then
+                a1pms_load_config                       ".a1pms_config.json"
+            else
+                a1pms_api_put_configuration 200 ".a1pms_config.json"
+            fi

 
 

-        if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-            :
-        else
-            start_mr #Just to prevent errors in the a1pms log...
-        fi
+            if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+                :
+            else
+                start_mr #Just to prevent errors in the a1pms log...
+            fi

 
 

-        start_cr 1
+            start_cr 1

 
 

-        sleep_wait 120 "Let A1PMS configuration take effect"
+            sleep_wait 120 "Let A1PMS configuration take effect"

 
 

-        a1pms_api_get_status 200
+            a1pms_api_get_status 200

 
 

-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            sim_print ricsim_g1_$i interface
-        done
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                sim_print ricsim_g1_$i interface
+            done

 
 

-        echo "Load policy type in group 1 simulators"
-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
-        done
+            echo "Load policy type in group 1 simulators"
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                sim_put_policy_type 201 ricsim_g1_$i 1 testdata/OSC/sim_1.json
+            done

 
 

-         a1pms_equal json:policy-types 1 300  #Wait for the a1pms to refresh types from the simulator
+            if [ "$A1PMS_VERSION" == "V2" ]; then
+              a1pms_equal json:policy-types 1 300  #Wait for the a1pms to refresh types from the simulator
+            elif [ "$A1PMS_VERSION" == "V3" ]; then
+              a1pms_equal json:policytypes 20 300
+            fi

 
 

-        a1pms_api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0/1"
+            a1pms_api_put_service 201 "serv1" 600 "$CR_SERVICE_APP_PATH_0/1"

 
 

-        echo "Check the number of types in the a1pms for each ric is 1"
-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
-        done
+            echo "Check the number of types in the a1pms for each ric is 1"
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+              if [ "$A1PMS_VERSION" == "V2" ]; then
+                a1pms_equal json:policy-types?ric_id=ricsim_g1_$i 1 120
+              elif [ "$A1PMS_VERSION" == "V3" ]; then
+                a1pms_equal json:policytypes?nearRtRicId=ricsim_g1_$i 1 120
+              fi
+            done
+
+            START_ID=2000

 
 

-        START_ID=2000
+            start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        start_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            if [ "$A1PMS_VERSION" == "V3" ]; then
+              a1pms_api_post_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7
+            else
+              a1pms_api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7
+            fi

 
 

-        a1pms_api_put_policy_parallel 201 "serv1" ricsim_g1_ $NUM_RICS 1 $START_ID NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7
+            print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        print_timer "Create $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
+            a1pms_equal json:policies $INSTANCES

 
 

-        INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
-        a1pms_equal json:policies $INSTANCES
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
+            done

 
 

-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
-        done
+            if [ "$A1PMS_VERSION" == "V3" ]; then
+              allPolicyIds_file_path="./tmp/.policyIds.split.res.txt"
+              allPolicies_file_path="./tmp/.allPolicies.get.res.json"
+              res="$(__do_curl $A1PMS_SERVICE_PATH$A1PMS_API_PREFIX"/v1/policies")"
+              echo $res > "./tmp/.allPolicies.get.res.json"
+              jq -r '.[].policyId' $allPolicies_file_path > $allPolicyIds_file_path
+            fi
+
+            if [ "$A1PMS_VERSION" == "V3" ]; then
+              start_timer "Update $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"
+              a1pms_api_update_policy_parallel 200 "serv1" ricsim_g1_ $NUM_RICS 1 14000 NOTRANSIENT $notificationurl testdata/OSC/pi1_template.json $NUM_POLICIES_PER_RIC 7 $allPolicyIds_file_path
+              print_timer "Update $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"
+            fi

 
 

+            start_timer "GET $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        start_timer "GET $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            if [ "$A1PMS_VERSION" == "V3" ]; then
+              a1pms_api_get_policy_parallel_v3 200 $NUM_RICS $allPolicyIds_file_path $START_ID $NUM_POLICIES_PER_RIC 7
+            else
+              a1pms_api_get_policy_parallel 200 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+            fi

 
 

-        a1pms_api_get_policy_parallel 200 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+            print_timer "GET $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        print_timer "GET $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
+            a1pms_equal json:policies $INSTANCES

 
 

-        INSTANCES=$(($NUM_RICS*$NUM_POLICIES_PER_RIC))
-        a1pms_equal json:policies $INSTANCES
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
+            done

 
 

-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            sim_equal ricsim_g1_$i num_instances $NUM_POLICIES_PER_RIC
-        done
+            start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        start_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            if [ "$A1PMS_VERSION" == "V3" ]; then
+              a1pms_api_delete_policy_parallel_v3 204 $NUM_RICS $allPolicyIds_file_path $START_ID $NUM_POLICIES_PER_RIC 7
+            else
+              a1pms_api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+            fi

 
 

-        a1pms_api_delete_policy_parallel 204 $NUM_RICS $START_ID $NUM_POLICIES_PER_RIC 7
+            print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using $__httpx and V$version policymanagementservice"

 
 

-        print_timer "Delete $((NUM_POLICIES_PER_RIC*$NUM_RICS)) polices over $interface using "$__httpx
+            a1pms_equal json:policies 0

 
 

-        a1pms_equal json:policies 0
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                sim_equal ricsim_g1_$i num_instances 0
+            done

 
 

-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            sim_equal ricsim_g1_$i num_instances 0
-        done
+            for ((i=1; i<=$NUM_RICS; i++))
+            do
+                if [ $interface == "REST+SDNC" ]; then
+                    sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
+                else
+                    sim_contains_str ricsim_g1_$i remote_hosts $A1PMS_APP_NAME
+                fi
+            done

 
 

-        for ((i=1; i<=$NUM_RICS; i++))
-        do
-            if [ $interface == "REST+SDNC" ]; then
-                sim_contains_str ricsim_g1_$i remote_hosts $SDNC_APP_NAME
-            else
-                sim_contains_str ricsim_g1_$i remote_hosts $A1PMS_APP_NAME
+            check_a1pms_logs
+            if [[ $interface = *"SDNC"* ]]; then
+                check_sdnc_logs

             fi
             fi

-        done

 
 

-        check_a1pms_logs
-        if [[ $interface = *"SDNC"* ]]; then
-            check_sdnc_logs
-        fi
+            store_logs          "${__httpx}__${interface}"

 
 

-        store_logs          "${__httpx}__${interface}"
+        done

 
     done
 
 
     done
 

diff --git a/test/auto-test/ONAP_UC.sh b/test/auto-test/ONAP_UC.sh
index 6c699d1..3dc724d 100755 (executable)
--- a/test/auto-test/ONAP_UC.sh
+++ b/test/auto-test/ONAP_UC.sh
@@ -283,11 +283,17 @@ for interface in $TESTED_VARIANTS ; do
     done
 
     # Check status OSC
     done
 
     # Check status OSC

-    VAL='NOT IN EFFECT'
+    if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+      VAL='NOT IN EFFECT'
+      VAL2="false"
+    else
+      VAL='NOT_ENFORCED'
+      VAL2="OTHER_REASON"
+    fi

     for ((i=1; i<=$OSC_NUM_RICS; i++))
     do
     for ((i=1; i<=$OSC_NUM_RICS; i++))
     do

-        a1pms_api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "false"
-        a1pms_api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "false"
+        a1pms_api_get_policy_status 200 $((3000+$i)) OSC "$VAL" "$VAL2"
+        a1pms_api_get_policy_status 200 $((4000+$i)) OSC "$VAL" "$VAL2"

     done
 
     # Note: Status callback is not tested since this callback (http POST) is made from the
     done
 
     # Note: Status callback is not tested since this callback (http POST) is made from the

diff --git a/test/auto-test/Suite-Verify-jobs.sh b/test/auto-test/Suite-Verify-jobs.sh
index d53af8f..ef97938 100644 (file)
--- a/test/auto-test/Suite-Verify-jobs.sh
+++ b/test/auto-test/Suite-Verify-jobs.sh
@@ -31,4 +31,6 @@ suite_setup
 
 ##########################################
 
 
 ##########################################
 

-suite_complete
\ No newline at end of file
+suite_complete
+
+exit

diff --git a/test/auto-test/verify-jobs-nonrtric.sh b/test/auto-test/verify-jobs-nonrtric.sh
index 7bee3fa..e93e1a7 100644 (file)
--- a/test/auto-test/verify-jobs-nonrtric.sh
+++ b/test/auto-test/verify-jobs-nonrtric.sh
@@ -21,6 +21,11 @@
 TEST_DIRECTORY="test/auto-test"
 TEST_SCRIPT="./Suite-Verify-jobs.sh"
 DOCKER_COMPOSE_VERSION="v2.21.0"
 TEST_DIRECTORY="test/auto-test"
 TEST_SCRIPT="./Suite-Verify-jobs.sh"
 DOCKER_COMPOSE_VERSION="v2.21.0"

+PULL_IMAGE_TYPE="remote-remove"
+RUN_MODE="docker"
+IMAGE_VERSION="release"
+ENV_FLAG="--env-file"
+ENV_FILE="../common/test_env-oran-h-release.sh"

 
 # Check if jq is installed, and install it if not
 if ! command -v jq &> /dev/null; then
 
 # Check if jq is installed, and install it if not
 if ! command -v jq &> /dev/null; then


@@ -50,7 +55,8 @@ fi
 
 cd "$TEST_DIRECTORY"
 sudo chmod 775 "$TEST_SCRIPT"
 
 cd "$TEST_DIRECTORY"
 sudo chmod 775 "$TEST_SCRIPT"

-"$TEST_SCRIPT" remote-remove docker release --env-file ../common/test_env-oran-h-release.sh
+"$TEST_SCRIPT" $PULL_IMAGE_TYPE $RUN_MODE $IMAGE_VERSION $ENV_FLAG $ENV_FILE
+exit_val=$?

 
 # Remove docker-compose after tests are done
 if command -v docker-compose &> /dev/null; then
 
 # Remove docker-compose after tests are done
 if command -v docker-compose &> /dev/null; then


@@ -62,3 +68,5 @@ if command -v jq &> /dev/null; then
     echo "Removing jq..."
     sudo apt-get remove -y jq
 fi
     echo "Removing jq..."
     sudo apt-get remove -y jq
 fi

+
+exit $exit_val

diff --git a/test/common/a1pms_api_functions.sh b/test/common/a1pms_api_functions.sh
index b80bb25..5fb6e25 100644 (file)
--- a/test/common/a1pms_api_functions.sh
+++ b/test/common/a1pms_api_functions.sh
@@ -26,7 +26,7 @@
 # arg: <image-tag-suffix> (selects staging, snapshot, release etc)
 # <image-tag-suffix> is present only for images with staging, snapshot,release tags
 __A1PMS_imagesetup() {
 # arg: <image-tag-suffix> (selects staging, snapshot, release etc)
 # <image-tag-suffix> is present only for images with staging, snapshot,release tags
 __A1PMS_imagesetup() {

-       __check_and_create_image_var A1PMS "A1PMS_IMAGE" "A1PMS_IMAGE_BASE" "A1PMS_IMAGE_TAG" $1 "$A1PMS_DISPLAY_NAME" ""
+  __check_and_create_image_var A1PMS "A1PMS_IMAGE" "A1PMS_IMAGE_BASE" "A1PMS_IMAGE_TAG" $1 "$A1PMS_DISPLAY_NAME" ""

 }
 
 # Pull image from remote repo or use locally built image
 }
 
 # Pull image from remote repo or use locally built image


@@ -35,62 +35,62 @@ __A1PMS_imagesetup() {
 # <pull-policy-original> Shall be used for images that does not allow overriding
 # Both var may contain: 'remote', 'remote-remove' or 'local'
 __A1PMS_imagepull() {
 # <pull-policy-original> Shall be used for images that does not allow overriding
 # Both var may contain: 'remote', 'remote-remove' or 'local'
 __A1PMS_imagepull() {

-       __check_and_pull_image $1 "$A1PMS_DISPLAY_NAME" $A1PMS_APP_NAME A1PMS_IMAGE
+  __check_and_pull_image $1 "$A1PMS_DISPLAY_NAME" $A1PMS_APP_NAME A1PMS_IMAGE

 }
 
 # Build image (only for simulator or interfaces stubs owned by the test environment)
 # arg: <image-tag-suffix> (selects staging, snapshot, release etc)
 # <image-tag-suffix> is present only for images with staging, snapshot,release tags
 __A1PMS_imagebuild() {
 }
 
 # Build image (only for simulator or interfaces stubs owned by the test environment)
 # arg: <image-tag-suffix> (selects staging, snapshot, release etc)
 # <image-tag-suffix> is present only for images with staging, snapshot,release tags
 __A1PMS_imagebuild() {

-       echo -e $RED" Image for app A1PMS shall never be built"$ERED
+  echo -e $RED" Image for app A1PMS shall never be built"$ERED

 }
 
 # Generate a string for each included image using the app display name and a docker images format string
 # If a custom image repo is used then also the source image from the local repo is listed
 # arg: <docker-images-format-string> <file-to-append>
 __A1PMS_image_data() {
 }
 
 # Generate a string for each included image using the app display name and a docker images format string
 # If a custom image repo is used then also the source image from the local repo is listed
 # arg: <docker-images-format-string> <file-to-append>
 __A1PMS_image_data() {

-       echo -e "$A1PMS_DISPLAY_NAME\t$(docker images --format $1 $A1PMS_IMAGE)" >>   $2
-       if [ ! -z "$A1PMS_IMAGE_SOURCE" ]; then
-               echo -e "-- source image --\t$(docker images --format $1 $A1PMS_IMAGE_SOURCE)" >>   $2
-       fi
+  echo -e "$A1PMS_DISPLAY_NAME\t$(docker images --format $1 $A1PMS_IMAGE)" >>$2
+  if [ ! -z "$A1PMS_IMAGE_SOURCE" ]; then
+    echo -e "-- source image --\t$(docker images --format $1 $A1PMS_IMAGE_SOURCE)" >>$2
+  fi

 }
 
 # Scale kubernetes resources to zero
 # All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action.
 # This function is called for apps fully managed by the test script
 __A1PMS_kube_scale_zero() {
 }
 
 # Scale kubernetes resources to zero
 # All resources shall be ordered to be scaled to 0, if relevant. If not relevant to scale, then do no action.
 # This function is called for apps fully managed by the test script
 __A1PMS_kube_scale_zero() {

-       __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS
+  __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS

 }
 
 # Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
 # This function is called for pre-started apps not managed by the test script.
 __A1PMS_kube_scale_zero_and_wait() {
 }
 
 # Scale kubernetes resources to zero and wait until this has been accomplished, if relevant. If not relevant to scale, then do no action.
 # This function is called for pre-started apps not managed by the test script.
 __A1PMS_kube_scale_zero_and_wait() {

-       __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-policymanagementservice
+  __kube_scale_and_wait_all_resources $KUBE_NONRTRIC_NAMESPACE app "$KUBE_NONRTRIC_NAMESPACE"-policymanagementservice

 }
 
 # Delete all kube resources for the app
 # This function is called for apps managed by the test script.
 __A1PMS_kube_delete_all() {
 }
 
 # Delete all kube resources for the app
 # This function is called for apps managed by the test script.
 __A1PMS_kube_delete_all() {

-       __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS
+  __kube_delete_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS

 }
 
 # Store docker logs
 # This function is called for apps managed by the test script.
 # args: <log-dir> <file-prefix>
 __A1PMS_store_docker_logs() {
 }
 
 # Store docker logs
 # This function is called for apps managed by the test script.
 # args: <log-dir> <file-prefix>
 __A1PMS_store_docker_logs() {

-       if [ $RUNMODE == "KUBE" ]; then
-               kubectl $KUBECONF  logs -l "autotest=A1PMS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 > $1$2_a1pms.log 2>&1
-       else
-               docker logs $A1PMS_APP_NAME > $1$2_a1pms.log 2>&1
-       fi
+  if [ $RUNMODE == "KUBE" ]; then
+    kubectl $KUBECONF logs -l "autotest=A1PMS" -n $KUBE_NONRTRIC_NAMESPACE --tail=-1 >$1$2_a1pms.log 2>&1
+  else
+    docker logs $A1PMS_APP_NAME >$1$2_a1pms.log 2>&1
+  fi

 }
 
 # Initial setup of protocol, host and ports
 # This function is called for apps managed by the test script.
 # args: -
 __A1PMS_initial_setup() {
 }
 
 # Initial setup of protocol, host and ports
 # This function is called for apps managed by the test script.
 # args: -
 __A1PMS_initial_setup() {

-       use_a1pms_rest_http
-       export A1PMS_SIDECAR_JWT_FILE=""
+  use_a1pms_rest_http
+  export A1PMS_SIDECAR_JWT_FILE=""

 }
 
 # Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers
 }
 
 # Set app short-name, app name and namespace for logging runtime statistics of kubernetes pods or docker containers


@@ -98,20 +98,19 @@ __A1PMS_initial_setup() {
 # This function is called for apps managed by the test script as well as for pre-started apps.
 # args: -
 __A1PMS_statistics_setup() {
 # This function is called for apps managed by the test script as well as for pre-started apps.
 # args: -
 __A1PMS_statistics_setup() {

-       if [ $RUNMODE == "KUBE" ]; then
-               echo "A1PMS $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
-       else
-               echo "A1PMS $A1PMS_APP_NAME"
-       fi
+  if [ $RUNMODE == "KUBE" ]; then
+    echo "A1PMS $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE"
+  else
+    echo "A1PMS $A1PMS_APP_NAME"
+  fi

 }
 
 # Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
 # args: -
 __A1PMS_test_requirements() {
 }
 
 # Check application requirements, e.g. helm, the the test needs. Exit 1 if req not satisfied
 # args: -
 __A1PMS_test_requirements() {

-       :
+  :

 }
 
 }
 

-

 #######################################################
 
 ###########################
 #######################################################
 
 ###########################


@@ -122,55 +121,55 @@ __A1PMS_test_requirements() {
 # args: -
 # (Function for test scripts)
 use_a1pms_rest_http() {
 # args: -
 # (Function for test scripts)
 use_a1pms_rest_http() {

-       __a1pms_set_protocoll "http" $A1PMS_INTERNAL_PORT $A1PMS_EXTERNAL_PORT
+  __a1pms_set_protocoll "http" $A1PMS_INTERNAL_PORT $A1PMS_EXTERNAL_PORT

 }
 
 # Set https as the protocol to use for all communication to the A1PMS
 # args: -
 # (Function for test scripts)
 use_a1pms_rest_https() {
 }
 
 # Set https as the protocol to use for all communication to the A1PMS
 # args: -
 # (Function for test scripts)
 use_a1pms_rest_https() {

-       __a1pms_set_protocoll "https" $A1PMS_INTERNAL_SECURE_PORT $A1PMS_EXTERNAL_SECURE_PORT
+  __a1pms_set_protocoll "https" $A1PMS_INTERNAL_SECURE_PORT $A1PMS_EXTERNAL_SECURE_PORT

 }
 
 # All calls to the a1pms will be directed to the a1pms dmaap interface over http from now on
 # args: -
 # (Function for test scripts)
 use_a1pms_dmaap_http() {
 }
 
 # All calls to the a1pms will be directed to the a1pms dmaap interface over http from now on
 # args: -
 # (Function for test scripts)
 use_a1pms_dmaap_http() {

-       echo -e $BOLD"$A1PMS_DISPLAY_NAME dmaap protocol setting"$EBOLD
-       echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards the a1pms"
-       A1PMS_ADAPTER_TYPE="MR-HTTP"
-       echo ""
+  echo -e $BOLD"$A1PMS_DISPLAY_NAME dmaap protocol setting"$EBOLD
+  echo -e " Using $BOLD http $EBOLD and $BOLD DMAAP $EBOLD towards the a1pms"
+  A1PMS_ADAPTER_TYPE="MR-HTTP"
+  echo ""

 }
 
 # All calls to the a1pms will be directed to the a1pms dmaap interface over https from now on
 # args: -
 # (Function for test scripts)
 use_a1pms_dmaap_https() {
 }
 
 # All calls to the a1pms will be directed to the a1pms dmaap interface over https from now on
 # args: -
 # (Function for test scripts)
 use_a1pms_dmaap_https() {

-       echo -e $BOLD"$A1PMS_DISPLAY_NAME dmaap protocol setting"$EBOLD
-       echo -e " Using $BOLD https $EBOLD and $BOLD DMAAP $EBOLD towards the a1pms"
-       echo -e $YELLOW" Setting http instead of https - MR only uses http"$EYELLOW
-       A1PMS_ADAPTER_TYPE="MR-HTTPS"
-       echo ""
+  echo -e $BOLD"$A1PMS_DISPLAY_NAME dmaap protocol setting"$EBOLD
+  echo -e " Using $BOLD https $EBOLD and $BOLD DMAAP $EBOLD towards the a1pms"
+  echo -e $YELLOW" Setting http instead of https - MR only uses http"$EYELLOW
+  A1PMS_ADAPTER_TYPE="MR-HTTPS"
+  echo ""

 }
 
 # Setup paths to svc/container for internal and external access
 # args: <protocol> <internal-port> <external-port>
 __a1pms_set_protocoll() {
 }
 
 # Setup paths to svc/container for internal and external access
 # args: <protocol> <internal-port> <external-port>
 __a1pms_set_protocoll() {

-       echo -e $BOLD"$A1PMS_DISPLAY_NAME protocol setting"$EBOLD
-       echo -e " Using $BOLD $1 $EBOLD towards $A1PMS_DISPLAY_NAME"
+  echo -e $BOLD"$A1PMS_DISPLAY_NAME protocol setting"$EBOLD
+  echo -e " Using $BOLD $1 $EBOLD towards $A1PMS_DISPLAY_NAME"

 
 

-       ## Access to Dmaap adapter
+  ## Access to Dmaap adapter

 
 

-       A1PMS_SERVICE_PATH=$1"://"$A1PMS_APP_NAME":"$2  # docker access, container->container and script->container via proxy
-       if [ $RUNMODE == "KUBE" ]; then
-               A1PMS_SERVICE_PATH=$1"://"$A1PMS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
-       fi
+  A1PMS_SERVICE_PATH=$1"://"$A1PMS_APP_NAME":"$2 # docker access, container->container and script->container via proxy
+  if [ $RUNMODE == "KUBE" ]; then
+    A1PMS_SERVICE_PATH=$1"://"$A1PMS_APP_NAME.$KUBE_NONRTRIC_NAMESPACE":"$3 # kube access, pod->svc and script->svc via proxy
+  fi

 
 

-       # A1PMS_ADAPTER used for switching between REST and DMAAP (only REST supported currently)
-       A1PMS_ADAPTER_TYPE="REST"
-       A1PMS_ADAPTER=$A1PMS_SERVICE_PATH
+  # A1PMS_ADAPTER used for switching between REST and DMAAP (only REST supported currently)
+  A1PMS_ADAPTER_TYPE="REST"
+  A1PMS_ADAPTER=$A1PMS_SERVICE_PATH

 
 

-       echo ""
+  echo ""

 }
 
 # Make curl retries towards the a1pms for http response codes set in this env var, space separated list of codes
 }
 
 # Make curl retries towards the a1pms for http response codes set in this env var, space separated list of codes


@@ -183,190 +182,189 @@ __A1PMS_WORKER_NODE=""
 # args: PROXY|NOPROXY
 __export_a1pms_vars() {
 
 # args: PROXY|NOPROXY
 __export_a1pms_vars() {
 

-               export A1PMS_APP_NAME
-               export A1PMS_APP_NAME_ALIAS
-               export A1PMS_DISPLAY_NAME
-
-               export KUBE_NONRTRIC_NAMESPACE
-               export A1PMS_IMAGE
-               export A1PMS_INTERNAL_PORT
-               export A1PMS_INTERNAL_SECURE_PORT
-               export A1PMS_EXTERNAL_PORT
-               export A1PMS_EXTERNAL_SECURE_PORT
-               export A1PMS_CONFIG_MOUNT_PATH
-               export A1PMS_DATA_MOUNT_PATH
-               export A1PMS_CONFIG_CONFIGMAP_NAME=$A1PMS_APP_NAME"-config"
-               export A1PMS_DATA_CONFIGMAP_NAME=$A1PMS_APP_NAME"-data"
-               export A1PMS_PKG_NAME
-               export A1PMS_CONFIG_KEY
-               export DOCKER_SIM_NWNAME
-               export A1PMS_HOST_MNT_DIR
-               export A1PMS_CONFIG_FILE
-
-               export A1PMS_DATA_PV_NAME=$A1PMS_APP_NAME"-pv"
-               export A1PMS_DATA_PVC_NAME=$A1PMS_APP_NAME"-pvc"
-               ##Create a unique path for the pv each time to prevent a previous volume to be reused
-               export A1PMS_PV_PATH="a1pmsdata-"$(date +%s)
-               export A1PMS_CONTAINER_MNT_DIR
-               export HOST_PATH_BASE_DIR
-
-               if [ $1 == "PROXY" ]; then
-                       export A1PMS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT  #Set if proxy is started
-                       export A1PMS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
-                       if [ $A1PMS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$A1PMS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
-                               echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
-                       else
-                               echo " Configured with http proxy"
-                       fi
-               else
-                       export A1PMS_HTTP_PROXY_CONFIG_PORT=0
-                       export A1PMS_HTTP_PROXY_CONFIG_HOST_NAME=""
-                       echo " Configured without http proxy"
-               fi
+  export A1PMS_APP_NAME
+  export A1PMS_APP_NAME_ALIAS
+  export A1PMS_DISPLAY_NAME
+
+  export KUBE_NONRTRIC_NAMESPACE
+  export A1PMS_IMAGE
+  export A1PMS_INTERNAL_PORT
+  export A1PMS_INTERNAL_SECURE_PORT
+  export A1PMS_EXTERNAL_PORT
+  export A1PMS_EXTERNAL_SECURE_PORT
+  export A1PMS_CONFIG_MOUNT_PATH
+  export A1PMS_DATA_MOUNT_PATH
+  export A1PMS_CONFIG_CONFIGMAP_NAME=$A1PMS_APP_NAME"-config"
+  export A1PMS_DATA_CONFIGMAP_NAME=$A1PMS_APP_NAME"-data"
+  export A1PMS_PKG_NAME
+  export A1PMS_CONFIG_KEY
+  export DOCKER_SIM_NWNAME
+  export A1PMS_HOST_MNT_DIR
+  export A1PMS_CONFIG_FILE
+
+  export A1PMS_DATA_PV_NAME=$A1PMS_APP_NAME"-pv"
+  export A1PMS_DATA_PVC_NAME=$A1PMS_APP_NAME"-pvc"
+  ##Create a unique path for the pv each time to prevent a previous volume to be reused
+  export A1PMS_PV_PATH="a1pmsdata-"$(date +%s)
+  export A1PMS_CONTAINER_MNT_DIR
+  export HOST_PATH_BASE_DIR
+
+  if [ $1 == "PROXY" ]; then
+    export A1PMS_HTTP_PROXY_CONFIG_PORT=$HTTP_PROXY_CONFIG_PORT           #Set if proxy is started
+    export A1PMS_HTTP_PROXY_CONFIG_HOST_NAME=$HTTP_PROXY_CONFIG_HOST_NAME #Set if proxy is started
+    if [ $A1PMS_HTTP_PROXY_CONFIG_PORT -eq 0 ] || [ -z "$A1PMS_HTTP_PROXY_CONFIG_HOST_NAME" ]; then
+      echo -e $YELLOW" Warning: HTTP PROXY will not be configured, proxy app not started"$EYELLOW
+    else
+      echo " Configured with http proxy"
+    fi
+  else
+    export A1PMS_HTTP_PROXY_CONFIG_PORT=0
+    export A1PMS_HTTP_PROXY_CONFIG_HOST_NAME=""
+    echo " Configured without http proxy"
+  fi

 }
 
 }
 

-

 # Start the ms
 # args: (docker) PROXY|NOPROXY <config-file>
 # args: (kube) PROXY|NOPROXY <config-file> [ <data-file>]
 # (Function for test scripts)
 start_a1pms() {
 # Start the ms
 # args: (docker) PROXY|NOPROXY <config-file>
 # args: (kube) PROXY|NOPROXY <config-file> [ <data-file>]
 # (Function for test scripts)
 start_a1pms() {

-       echo -e $BOLD"Starting $A1PMS_DISPLAY_NAME"$EBOLD
-
-       if [ $RUNMODE == "KUBE" ]; then
-
-               # Check if app shall be fully managed by the test script
-               __check_included_image "A1PMS"
-               retcode_i=$?
-
-               # Check if app shall only be used by the test script
-               __check_prestarted_image "A1PMS"
-               retcode_p=$?
-
-               if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
-                       echo -e $RED"The $A1PMS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
-                       echo -e $RED"The $A1PMS_APP_NAME will not be started"$ERED
-                       exit
-               fi
-               if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
-                       echo -e $RED"The $A1PMS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
-                       echo -e $RED"The $A1PMS_APP_NAME will not be started"$ERED
-                       exit
-               fi
-
-               if [ $retcode_p -eq 0 ]; then
-                       echo -e " Using existing $A1PMS_APP_NAME deployment and service"
-                       echo " Setting $A1PMS_APP_NAME replicas=1"
-                       res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
-                       __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
-               fi
-
-               if [ $retcode_i -eq 0 ]; then
-
-                       echo -e " Creating $A1PMS_APP_NAME app and expose service"
-
-                       #Check if nonrtric namespace exists, if not create it
-                       __kube_create_namespace $KUBE_NONRTRIC_NAMESPACE
-
-                       __export_a1pms_vars $1
-
-                       # Create config map for config
-                       configfile=$PWD/tmp/$A1PMS_CONFIG_FILE
-                       cp $2 $configfile
-                       output_yaml=$PWD/tmp/a1pms-cfc.yaml
-                       __kube_create_configmap $A1PMS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $configfile $output_yaml
-
-                       # Create config map for data
-                       data_json=$PWD/tmp/$A1PMS_DATA_FILE
-                       if [ $# -lt 3 ]; then
-                               #create empty dummy file
-                               echo "{}" > $data_json
-                       else
-                               cp $3 $data_json
-                       fi
-                       output_yaml=$PWD/tmp/a1pms-cfd.yaml
-                       __kube_create_configmap $A1PMS_DATA_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $data_json $output_yaml
-
-                       ## Create pv
-                       input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"pv.yaml
-                       output_yaml=$PWD/tmp/a1pms-pv.yaml
-                       __kube_create_instance pv $A1PMS_APP_NAME $input_yaml $output_yaml
-
-                       ## Create pvc
-                       input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"pvc.yaml
-                       output_yaml=$PWD/tmp/a1pms-pvc.yaml
-                       __kube_create_instance pvc $A1PMS_APP_NAME $input_yaml $output_yaml
-
-                       # Create service
-                       input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"svc.yaml
-                       output_yaml=$PWD/tmp/a1pmssvc.yaml
-                       __kube_create_instance service $A1PMS_APP_NAME $input_yaml $output_yaml
-
-                       # Create app
-                       input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"app.yaml
-                       output_yaml=$PWD/tmp/a1pmsapp.yaml
-                       if [ -z "$A1PMS_SIDECAR_JWT_FILE" ]; then
-                               cat $input_yaml | sed  '/#A1PMS_JWT_START/,/#A1PMS_JWT_STOP/d' > $PWD/tmp/a1pmsapp_tmp.yaml
-                               input_yaml=$PWD/tmp/a1pmsapp_tmp.yaml
-                       fi
-                       __kube_create_instance app $A1PMS_APP_NAME $input_yaml $output_yaml
-
-               fi
-
-               # Keep the initial worker node in case the pod need to be "restarted" - must be made to the same node due to a volume mounted on the host
-               if [ $retcode_i -eq 0 ]; then
-                       __A1PMS_WORKER_NODE=$(kubectl $KUBECONF get pod -l "autotest=A1PMS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}')
-                       if [ -z "$__A1PMS_WORKER_NODE" ]; then
-                               echo -e $YELLOW" Cannot find worker node for pod for $A1PMS_APP_NAME, persistency may not work"$EYELLOW
-                       fi
-               else
-                       echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
-               fi
-
-               __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
-
-       else
-               __check_included_image 'A1PMS'
-               if [ $? -eq 1 ]; then
-                       echo -e $RED"The A1PMS app is not included in this test script"$ERED
-                       echo -e $RED"The A1PMS will not be started"$ERED
-                       exit
-               fi
-
-               curdir=$PWD
-               cd $SIM_GROUP
-               cd a1pms
-               cd $A1PMS_HOST_MNT_DIR
-               #cd ..
-               if [ -d db ]; then
-                       if [ "$(ls -A $DIR)" ]; then
-                               echo -e $BOLD" Cleaning files in mounted dir: $PWD/db"$EBOLD
-                               rm -rf db/*  &> /dev/null
-                               if [ $? -ne 0 ]; then
-                                       echo -e $RED" Cannot remove database files in: $PWD"$ERED
-                                       exit 1
-                               fi
-                       fi
-               else
-                       echo " No files in mounted dir or dir does not exists"
-                       mkdir db
-               fi
-               cd $curdir
-
-               __export_a1pms_vars $1
-
-               dest_file=$SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_HOST_MNT_DIR/application.yaml
-
-               envsubst < $2 > $dest_file
-
-               __start_container $A1PMS_COMPOSE_DIR "" NODOCKERARGS 1 $A1PMS_APP_NAME
-
-               __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
-       fi
-
-       __collect_endpoint_stats_image_info "A1PMS" $A1PMS_IMAGE
-       echo ""
-       return 0
+  echo -e $BOLD"Starting $A1PMS_DISPLAY_NAME"$EBOLD
+
+  if [ $RUNMODE == "KUBE" ]; then
+
+    # Check if app shall be fully managed by the test script
+    __check_included_image "A1PMS"
+    retcode_i=$?
+
+    # Check if app shall only be used by the test script
+    __check_prestarted_image "A1PMS"
+    retcode_p=$?
+
+    if [ $retcode_i -ne 0 ] && [ $retcode_p -ne 0 ]; then
+      echo -e $RED"The $A1PMS_APP_NAME app is not included as managed nor prestarted in this test script"$ERED
+      echo -e $RED"The $A1PMS_APP_NAME will not be started"$ERED
+      exit
+    fi
+    if [ $retcode_i -eq 0 ] && [ $retcode_p -eq 0 ]; then
+      echo -e $RED"The $A1PMS_APP_NAME app is included both as managed and prestarted in this test script"$ERED
+      echo -e $RED"The $A1PMS_APP_NAME will not be started"$ERED
+      exit
+    fi
+
+    if [ $retcode_p -eq 0 ]; then
+      echo -e " Using existing $A1PMS_APP_NAME deployment and service"
+      echo " Setting $A1PMS_APP_NAME replicas=1"
+      res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+      __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+    fi
+
+    if [ $retcode_i -eq 0 ]; then
+
+      echo -e " Creating $A1PMS_APP_NAME app and expose service"
+
+      #Check if nonrtric namespace exists, if not create it
+      __kube_create_namespace $KUBE_NONRTRIC_NAMESPACE
+
+      __export_a1pms_vars $1
+
+      # Create config map for config
+      configfile=$PWD/tmp/$A1PMS_CONFIG_FILE
+      cp $2 $configfile
+      output_yaml=$PWD/tmp/a1pms-cfc.yaml
+      __kube_create_configmap $A1PMS_CONFIG_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $configfile $output_yaml
+
+      # Create config map for data
+      data_json=$PWD/tmp/$A1PMS_DATA_FILE
+      if [ $# -lt 3 ]; then
+        #create empty dummy file
+        echo "{}" >$data_json
+      else
+        cp $3 $data_json
+      fi
+      output_yaml=$PWD/tmp/a1pms-cfd.yaml
+      __kube_create_configmap $A1PMS_DATA_CONFIGMAP_NAME $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $data_json $output_yaml
+
+      ## Create pv
+      input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"pv.yaml
+      output_yaml=$PWD/tmp/a1pms-pv.yaml
+      __kube_create_instance pv $A1PMS_APP_NAME $input_yaml $output_yaml
+
+      ## Create pvc
+      input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"pvc.yaml
+      output_yaml=$PWD/tmp/a1pms-pvc.yaml
+      __kube_create_instance pvc $A1PMS_APP_NAME $input_yaml $output_yaml
+
+      # Create service
+      input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"svc.yaml
+      output_yaml=$PWD/tmp/a1pmssvc.yaml
+      __kube_create_instance service $A1PMS_APP_NAME $input_yaml $output_yaml
+
+      # Create app
+      input_yaml=$SIM_GROUP"/"$A1PMS_COMPOSE_DIR"/"app.yaml
+      output_yaml=$PWD/tmp/a1pmsapp.yaml
+      if [ -z "$A1PMS_SIDECAR_JWT_FILE" ]; then
+        cat $input_yaml | sed '/#A1PMS_JWT_START/,/#A1PMS_JWT_STOP/d' >$PWD/tmp/a1pmsapp_tmp.yaml
+        input_yaml=$PWD/tmp/a1pmsapp_tmp.yaml
+      fi
+      __kube_create_instance app $A1PMS_APP_NAME $input_yaml $output_yaml
+
+    fi
+
+    # Keep the initial worker node in case the pod need to be "restarted" - must be made to the same node due to a volume mounted on the host
+    if [ $retcode_i -eq 0 ]; then
+      __A1PMS_WORKER_NODE=$(kubectl $KUBECONF get pod -l "autotest=A1PMS" -n $KUBE_NONRTRIC_NAMESPACE -o jsonpath='{.items[*].spec.nodeName}')
+      if [ -z "$__A1PMS_WORKER_NODE" ]; then
+        echo -e $YELLOW" Cannot find worker node for pod for $A1PMS_APP_NAME, persistency may not work"$EYELLOW
+      fi
+    else
+      echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+    fi
+
+    __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
+
+  else
+    __check_included_image 'A1PMS'
+    if [ $? -eq 1 ]; then
+      echo -e $RED"The A1PMS app is not included in this test script"$ERED
+      echo -e $RED"The A1PMS will not be started"$ERED
+      exit
+    fi
+
+    curdir=$PWD
+    cd $SIM_GROUP
+    cd a1pms
+    cd $A1PMS_HOST_MNT_DIR
+    #cd ..
+    if [ -d db ]; then
+      if [ "$(ls -A $DIR)" ]; then
+        echo -e $BOLD" Cleaning files in mounted dir: $PWD/db"$EBOLD
+        rm -rf db/* &>/dev/null
+        if [ $? -ne 0 ]; then
+          echo -e $RED" Cannot remove database files in: $PWD"$ERED
+          exit 1
+        fi
+      fi
+    else
+      echo " No files in mounted dir or dir does not exists"
+      mkdir db
+    fi
+    cd $curdir
+
+    __export_a1pms_vars $1
+
+    dest_file=$SIM_GROUP/$A1PMS_COMPOSE_DIR/$A1PMS_HOST_MNT_DIR/application.yaml
+
+    envsubst <$2 >$dest_file
+
+    __start_container $A1PMS_COMPOSE_DIR "" NODOCKERARGS 1 $A1PMS_APP_NAME
+
+    __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
+  fi
+
+  __collect_endpoint_stats_image_info "A1PMS" $A1PMS_IMAGE
+  echo ""
+  return 0

 }
 
 # Stop the a1pms
 }
 
 # Stop the a1pms


@@ -374,297 +372,295 @@ start_a1pms() {
 # args: -
 # (Function for test scripts)
 stop_a1pms() {
 # args: -
 # (Function for test scripts)
 stop_a1pms() {

-       echo -e $BOLD"Stopping $A1PMS_DISPLAY_NAME"$EBOLD
-
-       if [ $RUNMODE == "KUBE" ]; then
-
-               __check_prestarted_image "A1PMS"
-               if [ $? -eq 0 ]; then
-                       echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
-                       res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
-                       __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
-                       return 0
-               fi
-               __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS
-               echo "  Deleting the replica set - a new will be started when the app is started"
-               tmp=$(kubectl $KUBECONF delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=PA")
-               if [ $? -ne 0 ]; then
-                       echo -e $RED" Could not delete replica set "$RED
-                       ((RES_CONF_FAIL++))
-                       return 1
-               fi
-       else
-               docker stop $A1PMS_APP_NAME &> ./tmp/.dockererr
-               if [ $? -ne 0 ]; then
-                       __print_err "Could not stop $A1PMS_APP_NAME" $@
-                       cat ./tmp/.dockererr
-                       ((RES_CONF_FAIL++))
-                       return 1
-               fi
-       fi
-       echo -e $BOLD$GREEN"Stopped"$EGREEN$EBOLD
-       echo ""
-       return 0
+  echo -e $BOLD"Stopping $A1PMS_DISPLAY_NAME"$EBOLD
+
+  if [ $RUNMODE == "KUBE" ]; then
+
+    __check_prestarted_image "A1PMS"
+    if [ $? -eq 0 ]; then
+      echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+      res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+      __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 0
+      return 0
+    fi
+    __kube_scale_all_resources $KUBE_NONRTRIC_NAMESPACE autotest A1PMS
+    echo "  Deleting the replica set - a new will be started when the app is started"
+    tmp=$(kubectl $KUBECONF delete rs -n $KUBE_NONRTRIC_NAMESPACE -l "autotest=PA")
+    if [ $? -ne 0 ]; then
+      echo -e $RED" Could not delete replica set "$RED
+      ((RES_CONF_FAIL++))
+      return 1
+    fi
+  else
+    docker stop $A1PMS_APP_NAME &>./tmp/.dockererr
+    if [ $? -ne 0 ]; then
+      __print_err "Could not stop $A1PMS_APP_NAME" $@
+      cat ./tmp/.dockererr
+      ((RES_CONF_FAIL++))
+      return 1
+    fi
+  fi
+  echo -e $BOLD$GREEN"Stopped"$EGREEN$EBOLD
+  echo ""
+  return 0

 }
 
 # Start a previously stopped a1pms
 # args: -
 # (Function for test scripts)
 start_stopped_a1pms() {
 }
 
 # Start a previously stopped a1pms
 # args: -
 # (Function for test scripts)
 start_stopped_a1pms() {

-       echo -e $BOLD"Starting (the previously stopped) $A1PMS_DISPLAY_NAME"$EBOLD
-
-       if [ $RUNMODE == "KUBE" ]; then
-
-               __check_prestarted_image "A1PMS"
-               if [ $? -eq 0 ]; then
-                       echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
-                       res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
-                       __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
-                       __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
-                       return 0
-               fi
-
-               # Tie the A1PMS to the same worker node it was initially started on
-               # A PVC of type hostPath is mounted to A1PMS, for persistent storage, so the A1PMS must always be on the node which mounted the volume
-               if [ -z "$__A1PMS_WORKER_NODE" ]; then
-                       echo -e $RED" No initial worker node found for pod "$RED
-                       ((RES_CONF_FAIL++))
-                       return 1
-               else
-                       echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__A1PMS_WORKER_NODE to deployment for $A1PMS_APP_NAME. Pod will always run on this worker node: $__A1PMS_WORKER_NODE"$BOLD
-                       echo -e $BOLD" The mounted volume is mounted as hostPath and only available on that worker node."$BOLD
-                       tmp=$(kubectl $KUBECONF patch deployment $A1PMS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__A1PMS_WORKER_NODE'"}}}}}')
-                       if [ $? -ne 0 ]; then
-                               echo -e $YELLOW" Cannot set nodeSelector to deployment for $A1PMS_APP_NAME, persistency may not work"$EYELLOW
-                       fi
-                       __kube_scale deployment $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
-               fi
-       else
-               docker start $A1PMS_APP_NAME &> ./tmp/.dockererr
-               if [ $? -ne 0 ]; then
-                       __print_err "Could not start (the stopped) $A1PMS_APP_NAME" $@
-                       cat ./tmp/.dockererr
-                       ((RES_CONF_FAIL++))
-                       return 1
-               fi
-       fi
-       __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
-       if [ $? -ne 0 ]; then
-               return 1
-       fi
-       echo ""
-       return 0
-}
+  echo -e $BOLD"Starting (the previously stopped) $A1PMS_DISPLAY_NAME"$EBOLD
+
+  if [ $RUNMODE == "KUBE" ]; then

 
 

+    __check_prestarted_image "A1PMS"
+    if [ $? -eq 0 ]; then
+      echo -e $YELLOW" Persistency may not work for app $A1PMS_APP_NAME in multi-worker node config when running it as a prestarted app"$EYELLOW
+      res_type=$(__kube_get_resource_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE)
+      __kube_scale $res_type $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+      __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
+      return 0
+    fi
+
+    # Tie the A1PMS to the same worker node it was initially started on
+    # A PVC of type hostPath is mounted to A1PMS, for persistent storage, so the A1PMS must always be on the node which mounted the volume
+    if [ -z "$__A1PMS_WORKER_NODE" ]; then
+      echo -e $RED" No initial worker node found for pod "$RED
+      ((RES_CONF_FAIL++))
+      return 1
+    else
+      echo -e $BOLD" Setting nodeSelector kubernetes.io/hostname=$__A1PMS_WORKER_NODE to deployment for $A1PMS_APP_NAME. Pod will always run on this worker node: $__A1PMS_WORKER_NODE"$BOLD
+      echo -e $BOLD" The mounted volume is mounted as hostPath and only available on that worker node."$BOLD
+      tmp=$(kubectl $KUBECONF patch deployment $A1PMS_APP_NAME -n $KUBE_NONRTRIC_NAMESPACE --patch '{"spec": {"template": {"spec": {"nodeSelector": {"kubernetes.io/hostname": "'$__A1PMS_WORKER_NODE'"}}}}}')
+      if [ $? -ne 0 ]; then
+        echo -e $YELLOW" Cannot set nodeSelector to deployment for $A1PMS_APP_NAME, persistency may not work"$EYELLOW
+      fi
+      __kube_scale deployment $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE 1
+    fi
+  else
+    docker start $A1PMS_APP_NAME &>./tmp/.dockererr
+    if [ $? -ne 0 ]; then
+      __print_err "Could not start (the stopped) $A1PMS_APP_NAME" $@
+      cat ./tmp/.dockererr
+      ((RES_CONF_FAIL++))
+      return 1
+    fi
+  fi
+  __check_service_start $A1PMS_APP_NAME $A1PMS_SERVICE_PATH$A1PMS_ALIVE_URL
+  if [ $? -ne 0 ]; then
+    return 1
+  fi
+  echo ""
+  return 0
+}

 
 # Function to prepare the a1pms configuration according to the current simulator configuration
 # args: SDNC|NOSDNC <output-file> [ <sim-group> <adapter-class> ]
 # (Function for test scripts)
 prepare_a1pms_config() {
 
 # Function to prepare the a1pms configuration according to the current simulator configuration
 # args: SDNC|NOSDNC <output-file> [ <sim-group> <adapter-class> ]
 # (Function for test scripts)
 prepare_a1pms_config() {

-       echo -e $BOLD"Prepare A1PMS config"$EBOLD
-
-       echo " Writing a1pms config for "$A1PMS_APP_NAME" to file: "$2
-
-       if [ $# != 2 ] && [ $# != 4 ];  then
-               ((RES_CONF_FAIL++))
-       __print_err "need two or four args,  SDNC|NOSDNC <output-file> [ <sim-group> <adapter-class> ]" $@
-               exit 1
-       fi
-
-       if [ $1 == "SDNC" ]; then
-               echo -e " Config$BOLD including SDNC$EBOLD configuration"
-       elif [ $1 == "NOSDNC" ];  then
-               echo -e " Config$BOLD excluding SDNC$EBOLD configuration"
-       else
-               ((RES_CONF_FAIL++))
-       __print_err "need three args,  SDNC|NOSDNC <output-file> HEADER|NOHEADER" $@
-               exit 1
-       fi
-
-       config_json="\n            {"
-       if [ $1 == "SDNC" ]; then
-               config_json=$config_json"\n   \"controller\": ["
-               config_json=$config_json"\n                     {"
-               config_json=$config_json"\n                       \"name\": \"$SDNC_APP_NAME\","
-               config_json=$config_json"\n                       \"baseUrl\": \"$SDNC_SERVICE_PATH\","
-               config_json=$config_json"\n                       \"userName\": \"$SDNC_USER\","
-               config_json=$config_json"\n                       \"password\": \"$SDNC_PWD\""
-               config_json=$config_json"\n                     }"
-               config_json=$config_json"\n   ],"
-       fi
-       if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
-               :
-       else
-               config_json=$config_json"\n   \"streams_publishes\": {"
-               config_json=$config_json"\n                            \"dmaap_publisher\": {"
-               config_json=$config_json"\n                              \"type\": \"message-router\","
-               config_json=$config_json"\n                              \"dmaap_info\": {"
-               config_json=$config_json"\n                                \"topic_url\": \"$MR_SERVICE_PATH$MR_WRITE_URL\""
-               config_json=$config_json"\n                              }"
-               config_json=$config_json"\n                            }"
-               config_json=$config_json"\n   },"
-               config_json=$config_json"\n   \"streams_subscribes\": {"
-               config_json=$config_json"\n                             \"dmaap_subscriber\": {"
-               config_json=$config_json"\n                               \"type\": \"message-router\","
-               config_json=$config_json"\n                               \"dmaap_info\": {"
-               config_json=$config_json"\n                                   \"topic_url\": \"$MR_SERVICE_PATH$MR_READ_URL\""
-               config_json=$config_json"\n                                 }"
-               config_json=$config_json"\n                               }"
-               config_json=$config_json"\n   },"
-       fi
-
-       config_json=$config_json"\n   \"ric\": ["
-
-       if [ $RUNMODE == "KUBE" ]; then
-               result=$(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.items[?(@.metadata.labels.autotest=="RICSIM")].metadata.name}')
-               rics=""
-               ric_cntr=0
-               if [ $? -eq 0 ] && [ ! -z "$result" ]; then
-                       for im in $result; do
-                               if [[ $im != *"-0" ]]; then
-                                       ric_subdomain=$(kubectl $KUBECONF get pod $im -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.spec.subdomain}')
-                                       rics=$rics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
-                                       let ric_cntr=ric_cntr+1
-                               fi
-                       done
-               fi
-               result=$(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.items[?(@.metadata.labels.autotest=="RICMEDIATORSIM")].metadata.name}')
-               oranrics=""
-               if [ $? -eq 0 ] && [ ! -z "$result" ]; then
-                       for im in $result; do
-                               if [[ $im != *"-0" ]]; then
-                                       ric_subdomain=$(kubectl $KUBECONF get pod $im -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.spec.subdomain}')
-                                       rics=$rics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
-                                       oranrics=$oranrics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
-                                       let ric_cntr=ric_cntr+1
-                               fi
-                       done
-               fi
-               if [ $ric_cntr -eq 0 ]; then
-                       echo $YELLOW"Warning: No rics found for the configuration"$EYELLOW
-               fi
-       else
-           rics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=a1sim" --filter "status=running" --format {{.Names}})
-               oranrics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=orana1sim" --filter "status=running" --format {{.Names}})
-
-               rics="$rics $oranrics"
-
-               if [ $? -ne 0 ] || [ -z "$rics" ]; then
-                       echo -e $RED" FAIL - the names of the running RIC Simulator or ORAN RIC cannot be retrieved." $ERED
-                       ((RES_CONF_FAIL++))
-                       exit 1
-               fi
-       fi
-       cntr=0
-       for ric in $rics; do
-               if [ $cntr -gt 0 ]; then
-                       config_json=$config_json"\n          ,"
-               fi
-               config_json=$config_json"\n          {"
-               if [ $RUNMODE == "KUBE" ]; then
-                       ric_id=${ric%.*.*} #extract pod id from full hosthame
-                       ric_id=$(echo "$ric_id" | tr '-' '_')
-               else
-                       ric_id=$(echo "$ric" | tr '-' '_')  #ric var still needs underscore as it is different from the container name
-               fi
-               echo " Found a1 sim: "$ric 
-               config_json=$config_json"\n            \"name\": \"$ric_id\","
-
-               xricfound=0
-               for xric in $oranrics; do
-                       if [ $xric == $ric ]; then
-                               xricfound=1
-                       fi
-               done
-               if [ $xricfound -eq 0 ]; then
-                       config_json=$config_json"\n            \"baseUrl\": \"$RIC_SIM_HTTPX://$ric:$RIC_SIM_PORT\","
-               else
-                       config_json=$config_json"\n            \"baseUrl\": \"$RICMEDIATOR_SIM_HTTPX://$ric:$RICMEDIATOR_SIM_PORT\","
-               fi
-               if [ ! -z "$3" ]; then
-                       if [[ $ric == "$3"* ]]; then
-                       config_json=$config_json"\n            \"customAdapterClass\": \"$4\","
-                       fi
-               fi
-               if [ $1 == "SDNC" ]; then
-                       config_json=$config_json"\n            \"controller\": \"$SDNC_APP_NAME\","
-               fi
-               config_json=$config_json"\n            \"managedElementIds\": ["
-               config_json=$config_json"\n              \"me1_$ric_id\","
-               config_json=$config_json"\n              \"me2_$ric_id\""
-               config_json=$config_json"\n            ]"
-               config_json=$config_json"\n          }"
-               let cntr=cntr+1
-       done
-
-       config_json=$config_json"\n           ]"
-       config_json=$config_json"\n}"
-
-       config_json="{\"config\":"$config_json"}"
-
-       printf "$config_json">$2
-
-       echo ""
+  echo -e $BOLD"Prepare A1PMS config"$EBOLD
+
+  echo " Writing a1pms config for "$A1PMS_APP_NAME" to file: "$2
+
+  if [ $# != 2 ] && [ $# != 4 ]; then
+    ((RES_CONF_FAIL++))
+    __print_err "need two or four args,  SDNC|NOSDNC <output-file> [ <sim-group> <adapter-class> ]" $@
+    exit 1
+  fi
+
+  if [ $1 == "SDNC" ]; then
+    echo -e " Config$BOLD including SDNC$EBOLD configuration"
+  elif [ $1 == "NOSDNC" ]; then
+    echo -e " Config$BOLD excluding SDNC$EBOLD configuration"
+  else
+    ((RES_CONF_FAIL++))
+    __print_err "need three args,  SDNC|NOSDNC <output-file> HEADER|NOHEADER" $@
+    exit 1
+  fi
+
+  config_json="\n            {"
+  if [ $1 == "SDNC" ]; then
+    config_json=$config_json"\n   \"controller\": ["
+    config_json=$config_json"\n                     {"
+    config_json=$config_json"\n                       \"name\": \"$SDNC_APP_NAME\","
+    config_json=$config_json"\n                       \"baseUrl\": \"$SDNC_SERVICE_PATH\","
+    config_json=$config_json"\n                       \"userName\": \"$SDNC_USER\","
+    config_json=$config_json"\n                       \"password\": \"$SDNC_PWD\""
+    config_json=$config_json"\n                     }"
+    config_json=$config_json"\n   ],"
+  fi
+  if [[ "$A1PMS_FEATURE_LEVEL" == *"NO-DMAAP"* ]]; then
+    :
+  else
+    config_json=$config_json"\n   \"streams_publishes\": {"
+    config_json=$config_json"\n                            \"dmaap_publisher\": {"
+    config_json=$config_json"\n                              \"type\": \"message-router\","
+    config_json=$config_json"\n                              \"dmaap_info\": {"
+    config_json=$config_json"\n                                \"topic_url\": \"$MR_SERVICE_PATH$MR_WRITE_URL\""
+    config_json=$config_json"\n                              }"
+    config_json=$config_json"\n                            }"
+    config_json=$config_json"\n   },"
+    config_json=$config_json"\n   \"streams_subscribes\": {"
+    config_json=$config_json"\n                             \"dmaap_subscriber\": {"
+    config_json=$config_json"\n                               \"type\": \"message-router\","
+    config_json=$config_json"\n                               \"dmaap_info\": {"
+    config_json=$config_json"\n                                   \"topic_url\": \"$MR_SERVICE_PATH$MR_READ_URL\""
+    config_json=$config_json"\n                                 }"
+    config_json=$config_json"\n                               }"
+    config_json=$config_json"\n   },"
+  fi
+
+  config_json=$config_json"\n   \"ric\": ["
+
+  if [ $RUNMODE == "KUBE" ]; then
+    result=$(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.items[?(@.metadata.labels.autotest=="RICSIM")].metadata.name}')
+    rics=""
+    ric_cntr=0
+    if [ $? -eq 0 ] && [ ! -z "$result" ]; then
+      for im in $result; do
+        if [[ $im != *"-0" ]]; then
+          ric_subdomain=$(kubectl $KUBECONF get pod $im -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.spec.subdomain}')
+          rics=$rics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
+          let ric_cntr=ric_cntr+1
+        fi
+      done
+    fi
+    result=$(kubectl $KUBECONF get pods -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.items[?(@.metadata.labels.autotest=="RICMEDIATORSIM")].metadata.name}')
+    oranrics=""
+    if [ $? -eq 0 ] && [ ! -z "$result" ]; then
+      for im in $result; do
+        if [[ $im != *"-0" ]]; then
+          ric_subdomain=$(kubectl $KUBECONF get pod $im -n $KUBE_A1SIM_NAMESPACE -o jsonpath='{.spec.subdomain}')
+          rics=$rics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
+          oranrics=$oranrics" "$im"."$ric_subdomain"."$KUBE_A1SIM_NAMESPACE
+          let ric_cntr=ric_cntr+1
+        fi
+      done
+    fi
+    if [ $ric_cntr -eq 0 ]; then
+      echo $YELLOW"Warning: No rics found for the configuration"$EYELLOW
+    fi
+  else
+    rics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=a1sim" --filter "status=running" --format {{.Names}})
+    oranrics=$(docker ps --filter "name=$RIC_SIM_PREFIX" --filter "network=$DOCKER_SIM_NWNAME" --filter "label=orana1sim" --filter "status=running" --format {{.Names}})
+
+    rics="$rics $oranrics"
+
+    if [ $? -ne 0 ] || [ -z "$rics" ]; then
+      echo -e $RED" FAIL - the names of the running RIC Simulator or ORAN RIC cannot be retrieved." $ERED
+      ((RES_CONF_FAIL++))
+      exit 1
+    fi
+  fi
+  cntr=0
+  for ric in $rics; do
+    if [ $cntr -gt 0 ]; then
+      config_json=$config_json"\n          ,"
+    fi
+    config_json=$config_json"\n          {"
+    if [ $RUNMODE == "KUBE" ]; then
+      ric_id=${ric%.*.*} #extract pod id from full hosthame
+      ric_id=$(echo "$ric_id" | tr '-' '_')
+    else
+      ric_id=$(echo "$ric" | tr '-' '_') #ric var still needs underscore as it is different from the container name
+    fi
+    echo " Found a1 sim: "$ric
+    config_json=$config_json"\n            \"name\": \"$ric_id\","
+
+    xricfound=0
+    for xric in $oranrics; do
+      if [ $xric == $ric ]; then
+        xricfound=1
+      fi
+    done
+    if [ $xricfound -eq 0 ]; then
+      config_json=$config_json"\n            \"baseUrl\": \"$RIC_SIM_HTTPX://$ric:$RIC_SIM_PORT\","
+    else
+      config_json=$config_json"\n            \"baseUrl\": \"$RICMEDIATOR_SIM_HTTPX://$ric:$RICMEDIATOR_SIM_PORT\","
+    fi
+    if [ ! -z "$3" ]; then
+      if [[ $ric == "$3"* ]]; then
+        config_json=$config_json"\n            \"customAdapterClass\": \"$4\","
+      fi
+    fi
+    if [ $1 == "SDNC" ]; then
+      config_json=$config_json"\n            \"controller\": \"$SDNC_APP_NAME\","
+    fi
+    config_json=$config_json"\n            \"managedElementIds\": ["
+    config_json=$config_json"\n              \"me1_$ric_id\","
+    config_json=$config_json"\n              \"me2_$ric_id\""
+    config_json=$config_json"\n            ]"
+    config_json=$config_json"\n          }"
+    let cntr=cntr+1
+  done
+
+  config_json=$config_json"\n           ]"
+  config_json=$config_json"\n}"
+
+  config_json="{\"config\":"$config_json"}"
+
+  printf "$config_json" >$2
+
+  echo ""

 }
 
 # Load the the appl config for the a1pms into a config map
 a1pms_load_config() {
 }
 
 # Load the the appl config for the a1pms into a config map
 a1pms_load_config() {

-       echo -e $BOLD"A1PMS - load config from "$EBOLD$1
-       data_json=$PWD/tmp/$A1PMS_DATA_FILE
-       cp $1 $data_json
-       output_yaml=$PWD/tmp/a1pms-cfd.yaml
-       __kube_create_configmap $A1PMS_APP_NAME"-data" $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $data_json $output_yaml
-       echo ""
+  echo -e $BOLD"A1PMS - load config from "$EBOLD$1
+  data_json=$PWD/tmp/$A1PMS_DATA_FILE
+  cp $1 $data_json
+  output_yaml=$PWD/tmp/a1pms-cfd.yaml
+  __kube_create_configmap $A1PMS_APP_NAME"-data" $KUBE_NONRTRIC_NAMESPACE autotest A1PMS $data_json $output_yaml
+  echo ""

 }
 
 }
 

-

 # Turn on debug level tracing in the a1pms
 # args: -
 # (Function for test scripts)
 set_a1pms_debug() {
 # Turn on debug level tracing in the a1pms
 # args: -
 # (Function for test scripts)
 set_a1pms_debug() {

-       echo -e $BOLD"Setting a1pms debug logging"$EBOLD
-       curlString="$A1PMS_SERVICE_PATH$A1PMS_ACTUATOR -X POST  -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}"
-       result=$(__do_curl "$curlString")
-       if [ $? -ne 0 ]; then
-               __print_err "could not set debug mode" $@
-               ((RES_CONF_FAIL++))
-               return 1
-       fi
-       echo ""
-       return 0
+  echo -e $BOLD"Setting a1pms debug logging"$EBOLD
+  curlString="$A1PMS_SERVICE_PATH$A1PMS_ACTUATOR -X POST  -H Content-Type:application/json -d {\"configuredLevel\":\"debug\"}"
+  result=$(__do_curl "$curlString")
+  if [ $? -ne 0 ]; then
+    __print_err "could not set debug mode" $@
+    ((RES_CONF_FAIL++))
+    return 1
+  fi
+  echo ""
+  return 0

 }
 
 # Turn on trace level tracing in the a1pms
 # args: -
 # (Function for test scripts)
 set_a1pms_trace() {
 }
 
 # Turn on trace level tracing in the a1pms
 # args: -
 # (Function for test scripts)
 set_a1pms_trace() {

-       echo -e $BOLD"Setting a1pms trace logging"$EBOLD
-       curlString="$A1PMS_SERVICE_PATH$A1PMS_ACTUATOR -X POST  -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}"
-       result=$(__do_curl "$curlString")
-       if [ $? -ne 0 ]; then
-               __print_err "could not set trace mode" $@
-               ((RES_CONF_FAIL++))
-               return 1
-       fi
-       echo ""
-       return 0
+  echo -e $BOLD"Setting a1pms trace logging"$EBOLD
+  curlString="$A1PMS_SERVICE_PATH$A1PMS_ACTUATOR -X POST  -H Content-Type:application/json -d {\"configuredLevel\":\"trace\"}"
+  result=$(__do_curl "$curlString")
+  if [ $? -ne 0 ]; then
+    __print_err "could not set trace mode" $@
+    ((RES_CONF_FAIL++))
+    return 1
+  fi
+  echo ""
+  return 0

 }
 
 # Perform curl retries when making direct call to the a1pms for the specified http response codes
 # Speace separated list of http response codes
 # args: [<response-code>]*
 use_a1pms_retries() {
 }
 
 # Perform curl retries when making direct call to the a1pms for the specified http response codes
 # Speace separated list of http response codes
 # args: [<response-code>]*
 use_a1pms_retries() {

-       echo -e $BOLD"Do curl retries to the a1pms REST inteface for these response codes:$@"$EBOLD
-       AGENT_RETRY_CODES=$@
-       echo ""
-       return
+  echo -e $BOLD"Do curl retries to the a1pms REST inteface for these response codes:$@"$EBOLD
+  AGENT_RETRY_CODES=$@
+  echo ""
+  return

 }
 
 # Check the a1pms logs for WARNINGs and ERRORs
 # args: -
 # (Function for test scripts)
 check_a1pms_logs() {
 }
 
 # Check the a1pms logs for WARNINGs and ERRORs
 # args: -
 # (Function for test scripts)
 check_a1pms_logs() {

-       __check_container_logs "A1PMS" $A1PMS_APP_NAME $A1PMS_LOGPATH WARN ERR
+  __check_container_logs "A1PMS" $A1PMS_APP_NAME $A1PMS_LOGPATH WARN ERR

 }
 
 #########################################################
 }
 
 #########################################################


@@ -676,19 +672,22 @@ check_a1pms_logs() {
 # args: json:<url> <target-value> [<timeout-in-seconds]
 # (Function for test scripts)
 a1pms_equal() {
 # args: json:<url> <target-value> [<timeout-in-seconds]
 # (Function for test scripts)
 a1pms_equal() {

-    echo "(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >> $HTTPLOG
-       if [ $# -eq 2 ] || [ $# -eq 3 ]; then
-               if [[ $1 == "json:"* ]]; then
-                       if [ "$A1PMS_VERSION" == "V2" ]; then
-                               __var_test "A1PMS" $A1PMS_SERVICE_PATH$A1PMS_API_PREFIX"/v2/" $1 "=" $2 $3
-                       else
-                               __var_test "A1PMS" $A1PMS_SERVICE_PATH"/" $1 "=" $2 $3
-                       fi
-                       return 0
-               fi
-       fi
-       __print_err "needs two or three args: json:<json-array-param> <target-value> [ timeout ]" $@
-       return 1
+  echo "(${BASH_LINENO[0]}): ${FUNCNAME[0]}" $@ >>$HTTPLOG
+  if [ $# -eq 2 ] || [ $# -eq 3 ]; then
+    if [[ $1 == "json:"* ]]; then
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+        __var_test "A1PMS" $A1PMS_SERVICE_PATH$A1PMS_API_PREFIX"/v2/" $1 "=" $2 $3
+      elif [ "$A1PMS_VERSION" == "V3" ]; then
+        echo "var test execution for V3"
+        __var_test "A1PMS" $A1PMS_SERVICE_PATH$A1PMS_API_PREFIX"/v1/" $1 "=" $2 $3
+      else
+        __var_test "A1PMS" $A1PMS_SERVICE_PATH"/" $1 "=" $2 $3
+      fi
+      return 0
+    fi
+  fi
+  __print_err "needs two or three args: json:<json-array-param> <target-value> [ timeout ]" $@
+  return 1

 }
 
 # API Test function: GET /policies and V2 GET /v2/policy-instances
 }
 
 # API Test function: GET /policies and V2 GET /v2/policy-instances


@@ -696,255 +695,272 @@ a1pms_equal() {
 # args(V2): <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]
 # (Function for test scripts)
 a1pms_api_get_policies() {
 # args(V2): <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]
 # (Function for test scripts)
 a1pms_api_get_policies() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               paramError=0
-               variableParams=$(($#-4))
-               if [ $# -lt 4 ]; then
-                       paramError=1
-               elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
-                       paramError=1
-               elif [ $# -gt 5 ] && [ $(($variableParams%7)) -ne 0 ]; then
-                       paramError=1
-               fi
-
-               if [ $paramError -ne 0 ]; then
-                       __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]" $@
-                       return 1
-               fi
-       else
-               paramError=0
-               variableParams=$(($#-4))
-               if [ $# -lt 4 ]; then
-                       paramError=1
-               elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
-                       paramError=1
-               elif [ $# -gt 5 ] && [ $(($variableParams%5)) -ne 0 ]; then
-                       paramError=1
-               fi
-
-               if [ $paramError -ne 0 ]; then
-                       __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
-                       return 1
-               fi
-       fi
-
-       queryparams=""
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $2 != "NORIC" ]; then
-                       queryparams="?ric_id="$2
-               fi
-               if [ $3 != "NOSERVICE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?service_id="$3
-                       else
-                               queryparams=$queryparams"&service_id="$3
-                       fi
-               fi
-               if [ $4 != "NOTYPE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?policytype_id="$4
-                       else
-                               queryparams=$queryparams"&policytype_id="$4
-                       fi
-               fi
-
-               query="/v2/policy-instances"$queryparams
-               res="$(__do_curl_to_api A1PMS GET $query)"
-               status=${res:${#res}-3}
-
-               if [ $status -ne $1 ]; then
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               if [ $# -gt 4 ]; then
-                       body=${res:0:${#res}-3}
-                       if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
-                               targetJson="["
-                       else
-                               targetJson="["
-                               arr=(${@:5})
-
-                               for ((i=0; i<$(($#-4)); i=i+7)); do
-
-                                       if [ "$targetJson" != "[" ]; then
-                                               targetJson=$targetJson","
-                                       fi
-                                       targetJson=$targetJson"{\"policy_id\":\"$UUID${arr[$i]}\",\"ric_id\":\"${arr[$i+1]}\",\"service_id\":\"${arr[$i+2]}\",\"policytype_id\":"
-                                       if [ "${arr[$i+3]}" == "EMPTY" ]; then
-                                               targetJson=$targetJson"\"\","
-                                       else
-                                               targetJson=$targetJson"\"${arr[$i+3]}\","
-                                       fi
-                                       targetJson=$targetJson"\"transient\":${arr[$i+4]},\"status_notification_uri\":\"${arr[$i+5]}\","
-                                       file="./tmp/.p.json"
-                                       sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+6]} > $file
-                                       json=$(cat $file)
-                                       targetJson=$targetJson"\"policy_data\":"$json"}"
-                               done
-                       fi
-
-                       targetJson=$targetJson"]"
-                       targetJson="{\"policies\": $targetJson}"
-                       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-                       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_body
-                               return 1
-                       fi
-               fi
-       else
-               if [ $2 != "NORIC" ]; then
-                       queryparams="?ric="$2
-               fi
-               if [ $3 != "NOSERVICE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?service="$3
-                       else
-                               queryparams=$queryparams"&service="$3
-                       fi
-               fi
-               if [ $4 != "NOTYPE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?type="$4
-                       else
-                               queryparams=$queryparams"&type="$4
-                       fi
-               fi
-
-               query="/policies"$queryparams
-               res="$(__do_curl_to_api A1PMS GET $query)"
-               status=${res:${#res}-3}
-
-               if [ $status -ne $1 ]; then
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               if [ $# -gt 4 ]; then
-                       if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
-                               targetJson="["
-                       else
-                               body=${res:0:${#res}-3}
-                               targetJson="["
-                               arr=(${@:5})
-
-                               for ((i=0; i<$(($#-4)); i=i+5)); do
-
-                                       if [ "$targetJson" != "[" ]; then
-                                               targetJson=$targetJson","
-                                       fi
-                                       targetJson=$targetJson"{\"id\":\"$UUID${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i+1]}\",\"service\":\"${arr[$i+2]}\",\"type\":"
-                                       if [ "${arr[$i+3]}" == "EMPTY" ]; then
-                                               targetJson=$targetJson"\"\","
-                                       else
-                                               targetJson=$targetJson"\"${arr[$i+3]}\","
-                                       fi
-                                       file="./tmp/.p.json"
-                                       sed 's/XXX/'${arr[$i]}'/g' ${arr[$i+4]} > $file
-                                       json=$(cat $file)
-                                       targetJson=$targetJson"\"json\":"$json"}"
-                               done
-                       fi
-
-                       targetJson=$targetJson"]"
-                       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-                       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_body
-                               return 1
-                       fi
-               fi
-       fi
-       __collect_endpoint_stats "A1PMS" 00 "GET" $A1PMS_API_PREFIX"/v2/policy-instances" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@

 
 

-}
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    paramError=0
+    variableParams=$(($# - 4))
+    if [ $# -lt 4 ]; then
+      paramError=1
+    elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
+      paramError=1
+    elif [ $# -gt 5 ] && [ $(($variableParams % 7)) -ne 0 ]; then
+      paramError=1
+    fi

 
 

+    if [ $paramError -ne 0 ]; then
+      __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <transient> <notification-url> <template-file>]*]" $@
+      return 1
+    fi
+  else
+    paramError=0
+    variableParams=$(($# - 4))
+    if [ $# -lt 4 ]; then
+      paramError=1
+    elif [ $# -eq 5 ] && [ $5 != "NOID" ]; then
+      paramError=1
+    elif [ $# -gt 5 ] && [ $(($variableParams % 5)) -ne 0 ]; then
+      paramError=1
+    fi
+
+    if [ $paramError -ne 0 ]; then
+      __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <policy-type-id>|NOTYPE [ NOID | [<policy-id> <ric-id> <service-id> EMPTY|<policy-type-id> <template-file>]*]" $@
+      return 1
+    fi
+  fi
+
+  queryparams=""
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $2 != "NORIC" ]; then
+      queryparams="?ric_id="$2
+    fi
+    if [ $3 != "NOSERVICE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?service_id="$3
+      else
+        queryparams=$queryparams"&service_id="$3
+      fi
+    fi
+    if [ $4 != "NOTYPE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?policytype_id="$4
+      else
+        queryparams=$queryparams"&policytype_id="$4
+      fi
+    fi
+
+    query="/v2/policy-instances"$queryparams
+    res="$(__do_curl_to_api A1PMS GET $query)"
+    status=${res:${#res}-3}
+
+    if [ $status -ne $1 ]; then
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi

 
 

-# API Test function: GET /policy and V2 GET /v2/policies/{policy_id}
+    if [ $# -gt 4 ]; then
+      body=${res:0:${#res}-3}
+      if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
+        targetJson="["
+      else
+        targetJson="["
+        arr=(${@:5})
+
+        for ((i = 0; i < $(($# - 4)); i = i + 7)); do
+
+          if [ "$targetJson" != "[" ]; then
+            targetJson=$targetJson","
+          fi
+          targetJson=$targetJson"{\"policy_id\":\"$UUID${arr[$i]}\",\"ric_id\":\"${arr[$i + 1]}\",\"service_id\":\"${arr[$i + 2]}\",\"policytype_id\":"
+          if [ "${arr[$i + 3]}" == "EMPTY" ]; then
+            targetJson=$targetJson"\"\","
+          else
+            targetJson=$targetJson"\"${arr[$i + 3]}\","
+          fi
+          targetJson=$targetJson"\"transient\":${arr[$i + 4]},\"status_notification_uri\":\"${arr[$i + 5]}\","
+          file="./tmp/.p.json"
+          sed 's/XXX/'${arr[$i]}'/g' ${arr[$i + 6]} >$file
+          json=$(cat $file)
+          targetJson=$targetJson"\"policy_data\":"$json"}"
+        done
+      fi
+
+      targetJson=$targetJson"]"
+      targetJson="{\"policies\": $targetJson}"
+      echo "TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  else
+    if [ $2 != "NORIC" ]; then
+      queryparams="?ric="$2
+    fi
+    if [ $3 != "NOSERVICE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?service="$3
+      else
+        queryparams=$queryparams"&service="$3
+      fi
+    fi
+    if [ $4 != "NOTYPE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?type="$4
+      else
+        queryparams=$queryparams"&type="$4
+      fi
+    fi
+
+    query="/policies"$queryparams
+    res="$(__do_curl_to_api A1PMS GET $query)"
+    status=${res:${#res}-3}
+
+    if [ $status -ne $1 ]; then
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+
+    if [ $# -gt 4 ]; then
+      if [ $# -eq 5 ] && [ $5 == "NOID" ]; then
+        targetJson="["
+      else
+        body=${res:0:${#res}-3}
+        targetJson="["
+        arr=(${@:5})
+
+        for ((i = 0; i < $(($# - 4)); i = i + 5)); do
+
+          if [ "$targetJson" != "[" ]; then
+            targetJson=$targetJson","
+          fi
+          targetJson=$targetJson"{\"id\":\"$UUID${arr[$i]}\",\"lastModified\":\"????\",\"ric\":\"${arr[$i + 1]}\",\"service\":\"${arr[$i + 2]}\",\"type\":"
+          if [ "${arr[$i + 3]}" == "EMPTY" ]; then
+            targetJson=$targetJson"\"\","
+          else
+            targetJson=$targetJson"\"${arr[$i + 3]}\","
+          fi
+          file="./tmp/.p.json"
+          sed 's/XXX/'${arr[$i]}'/g' ${arr[$i + 4]} >$file
+          json=$(cat $file)
+          targetJson=$targetJson"\"json\":"$json"}"
+        done
+      fi
+
+      targetJson=$targetJson"]"
+      echo "TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  fi
+  __collect_endpoint_stats "A1PMS" 00 "GET" $A1PMS_API_PREFIX"/v2/policy-instances" $status
+  __log_test_pass
+  return 0
+
+}
+
+# API Test function: GET /policy, V2 GET /v2/policies/{policy_id} and V3 GET a1policymanagement/v1/policies/{policy_id}

 # args: <response-code>  <policy-id> [<template-file>]
 # args(V2): <response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]
 # args: <response-code>  <policy-id> [<template-file>]
 # args(V2): <response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]

-

 # (Function for test scripts)
 a1pms_api_get_policy() {
 # (Function for test scripts)
 a1pms_api_get_policy() {

-       __log_test_start $@
-
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -ne 2 ] && [ $# -ne 8 ]; then
-                       __print_err "<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]" $@
-                       return 1
-               fi
-               query="/v2/policies/$UUID$2"
-       else
-               if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-                       __print_err "<response-code>  <policy-id> [<template-file>] " $@
-                       return 1
-               fi
-               query="/policy?id=$UUID$2"
-       fi
-       res="$(__do_curl_to_api A1PMS GET $query)"
-       status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -eq 8 ]; then
-
-                       #Create a policy json to compare with
-                       body=${res:0:${#res}-3}
-
-                       targetJson="\"ric_id\":\"$5\",\"policy_id\":\"$UUID$2\",\"service_id\":\"$4\""
-                       if [ $7 != "NOTRANSIENT" ]; then
-                               targetJson=$targetJson", \"transient\":$7"
-                       fi
-                       if [ $6 != "NOTYPE" ]; then
-                               targetJson=$targetJson", \"policytype_id\":\"$6\""
-                       else
-                               targetJson=$targetJson", \"policytype_id\":\"\""
-                       fi
-                       if [ $8 != "NOURL" ]; then
-                               targetJson=$targetJson", \"status_notification_uri\":\"$8\""
-                       fi
-
-                       data=$(sed 's/XXX/'${2}'/g' $3)
-                       targetJson=$targetJson", \"policy_data\":$data"
-                       targetJson="{$targetJson}"
-
-                       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-                       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_body
-                               return 1
-                       fi
-               fi
-       else
-               if [ $# -eq 3 ]; then
-                       #Create a policy json to compare with
-                       body=${res:0:${#res}-3}
-                       file="./tmp/.p.json"
-                       sed 's/XXX/'${2}'/g' $3 > $file
-                       targetJson=$(< $file)
-                       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-                       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_body
-                       fi
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 01 "GET" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -ne 2 ] && [ $# -ne 8 ]; then
+      __print_err "<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]" $@
+      return 1
+    fi
+    query="/v2/policies/$UUID$2"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    if [ $# -ne 2 ] && [ $# -ne 8 ]; then
+      __print_err "<response-code> <policy-id> [ <template-file> <service-name> <ric-id> <policytype-id>|NOTYPE <transient> <notification-url>|NOURL ]" $@
+      return 1
+    fi
+    query="/v1/policies/$UUID$2"
+  else
+    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+      __print_err "<response-code>  <policy-id> [<template-file>] " $@
+      return 1
+    fi
+    query="/policy?id=$UUID$2"
+  fi
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -eq 8 ]; then
+
+      #Create a policy json to compare with
+      body=${res:0:${#res}-3}
+
+      targetJson="\"ric_id\":\"$5\",\"policy_id\":\"$UUID$2\",\"service_id\":\"$4\""
+      if [ $7 != "NOTRANSIENT" ]; then
+        targetJson=$targetJson", \"transient\":$7"
+      fi
+      if [ $6 != "NOTYPE" ]; then
+        targetJson=$targetJson", \"policytype_id\":\"$6\""
+      else
+        targetJson=$targetJson", \"policytype_id\":\"\""
+      fi
+      if [ $8 != "NOURL" ]; then
+        targetJson=$targetJson", \"status_notification_uri\":\"$8\""
+      fi
+
+      data=$(sed 's/XXX/'${2}'/g' $3)
+      targetJson=$targetJson", \"policy_data\":$data"
+      targetJson="{$targetJson}"
+
+      echo "TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    if [ $# -eq 8 ]; then
+      #Create a policy json to compare with
+      body=${res:0:${#res}-3}
+      data=$(sed 's/XXX/'${2}'/g' $3)
+      targetJson=$data
+
+      echo "TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  else
+    if [ $# -eq 3 ]; then
+      #Create a policy json to compare with
+      body=${res:0:${#res}-3}
+      file="./tmp/.p.json"
+      sed 's/XXX/'${2}'/g' $3 >$file
+      targetJson=$(<$file)
+      echo "TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+      fi
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 01 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 # API Test function: PUT /policy and V2 PUT /policies
 }
 
 # API Test function: PUT /policy and V2 PUT /policies


@@ -952,94 +968,209 @@ a1pms_api_get_policy() {
 # args(V2): <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]
 # (Function for test scripts)
 a1pms_api_put_policy() {
 # args(V2): <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]
 # (Function for test scripts)
 a1pms_api_put_policy() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -lt 8 ] || [ $# -gt 9 ]; then
-                       __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]" $@
-                       return 1
-               fi
-       else
-               if [ $# -lt 7 ] || [ $# -gt 8 ]; then
-                       __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]" $@
-                       return 1
-               fi
-       fi
-
-       count=0
-       max=1
-       serv=$2
-       ric=$3
-       pt=$4
-       pid=$5
-       trans=$6
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               noti=$7
-               temp=$8
-               if [ $# -eq 9 ]; then
-                       max=$9
-               fi
-       else
-               temp=$7
-               if [ $# -eq 8 ]; then
-                       max=$8
-               fi
-       fi
-
-       while [ $count -lt $max ]; do
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-
-                       query="/v2/policies"
-
-                       inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
-                       if [ $trans != "NOTRANSIENT" ]; then
-                               inputJson=$inputJson", \"transient\":$trans"
-                       fi
-                       if [ $pt != "NOTYPE" ]; then
-                               inputJson=$inputJson", \"policytype_id\":\"$pt\""
-                       else
-                               inputJson=$inputJson", \"policytype_id\":\"\""
-                       fi
-                       if [ $noti != "NOURL" ]; then
-                               inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
-                       fi
-                       file="./tmp/.p.json"
-                       data=$(sed 's/XXX/'${pid}'/g' $temp)
-                       inputJson=$inputJson", \"policy_data\":$data"
-                       inputJson="{$inputJson}"
-                       echo $inputJson > $file
-               else
-                       query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
-
-                       if [ $pt != "NOTYPE" ]; then
-                               query=$query"&type=$pt"
-                       fi
-
-                       if [ $trans != NOTRANSIENT ]; then
-                               query=$query"&transient=$trans"
-                       fi
-
-                       file="./tmp/.p.json"
-                       sed 's/XXX/'${pid}'/g' $temp > $file
-               fi
-       res="$(__do_curl_to_api A1PMS PUT $query $file)"
-       status=${res:${#res}-3}
-               echo -ne " Executing "$count"("$max")${SAMELINE}"
-               if [ $status -ne $1 ]; then
-                       echo " Executed "$count"?("$max")"
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-               let pid=$pid+1
-               let count=$count+1
-               echo -ne " Executed  "$count"("$max")${SAMELINE}"
-       done
-       __collect_endpoint_stats "A1PMS" 02 "PUT" $A1PMS_API_PREFIX"/v2/policies" $status $max
-       echo ""
-
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ] || [ "$A1PMS_VERSION" == "V3" ]; then
+    if [ $# -lt 8 ] || [ $# -gt 9 ]; then
+      __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]" $@
+      return 1
+    fi
+  else
+    if [ $# -lt 7 ] || [ $# -gt 8 ]; then
+      __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]" $@
+      return 1
+    fi
+  fi
+
+  count=0
+  max=1
+  serv=$2
+  ric=$3
+  pt=$4
+  pid=$5
+  trans=$6
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    noti=$7
+    temp=$8
+    if [ $# -eq 9 ]; then
+      max=$9
+    fi
+  else
+    temp=$7
+    if [ $# -eq 8 ]; then
+      max=$8
+    fi
+  fi
+
+  while [ $count -lt $max ]; do
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+
+      query="/v2/policies"
+
+      inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
+      if [ $trans != "NOTRANSIENT" ]; then
+        inputJson=$inputJson", \"transient\":$trans"
+      fi
+      if [ $pt != "NOTYPE" ]; then
+        inputJson=$inputJson", \"policytype_id\":\"$pt\""
+      else
+        inputJson=$inputJson", \"policytype_id\":\"\""
+      fi
+      if [ $noti != "NOURL" ]; then
+        inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
+      fi
+      file="./tmp/.p.json"
+      data=$(sed 's/XXX/'${pid}'/g' $temp)
+      inputJson=$inputJson", \"policy_data\":$data"
+      inputJson="{$inputJson}"
+      echo $inputJson >$file
+    else
+      query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
+
+      if [ $pt != "NOTYPE" ]; then
+        query=$query"&type=$pt"
+      fi
+
+      if [ $trans != NOTRANSIENT ]; then
+        query=$query"&transient=$trans"
+      fi
+
+      file="./tmp/.p.json"
+      sed 's/XXX/'${pid}'/g' $temp >$file
+    fi
+    res="$(__do_curl_to_api A1PMS PUT $query $file)"
+    status=${res:${#res}-3}
+    echo -ne " Executing "$count"("$max")${SAMELINE}"
+    if [ $status -ne $1 ]; then
+      echo " Executed "$count"?("$max")"
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Executed  "$count"("$max")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 02 "PUT" ${A1PMS_API_PREFIX}${query} ${status} ${max}
+  echo ""
+
+  __log_test_pass
+  return 0
+}
+
+# API Test function: V3 PUT a1policymanagement/v1/policies
+# args: <response-code>  <policy-id>  <template-file> [<count>]
+# args(V2): <response-code> <policy-id> <template-file> [<count>]
+# (Function for test scripts)
+a1pms_api_put_policy_v3() {
+  __log_test_start $@
+
+  if [ $# -lt 3 ] || [ $# -gt 4 ]; then
+    __print_err "<response-code> <policy-id> <template-file> [<count>]" $@
+    return 1
+  fi
+
+  count=0
+  max=1
+  pid=$2
+  temp=$3
+
+  if [ $# -eq 4 ]; then
+    max=$4
+  fi
+
+  while [ $count -lt $max ]; do
+    query="/v1/policies/$UUID$pid"
+    file="./tmp/.p_v3.json"
+    let update_value=$pid+300
+    data=$(sed 's/XXX/'${update_value}'/g' $temp)
+    inputJson="$data"
+    echo $inputJson >$file
+    res="$(__do_curl_to_api A1PMS PUT $query $file)"
+    status=${res:${#res}-3}
+    echo -ne " Executing "$count"("$max")${SAMELINE}"
+    if [ $status -ne $1 ]; then
+      echo " Executed "$count"?("$max")"
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Executed  "$count"("$max")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 02 "PUT" ${A1PMS_API_PREFIX}${query} ${status} ${max}
+  echo ""
+
+  __log_test_pass
+  return 0
+}
+
+# API Test function: V£ POST a1policymanagement/v1/policies
+# args: <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <template-file> [<count>]
+# args(V2): <response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]
+# (Function for test scripts)
+a1pms_api_post_policy_v3() {
+  __log_test_start $@
+
+  if [ $# -lt 8 ] || [ $# -gt 9 ]; then
+    __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient>|NOTRANSIENT <notification-url>|NOURL <template-file> [<count>]" $@
+    return 1
+  fi
+
+  count=0
+  max=1
+  serv=$2
+  ric=$3
+  pt=$4
+  pid=$5
+  trans=$6
+  noti=$7
+  temp=$8
+  if [ $# -eq 9 ]; then
+    max=$9
+  fi
+
+  while [ $count -lt $max ]; do
+    query="/v1/policies"
+
+    inputJson="\"nearRtRicId\":\"$ric\""
+    if [ $pt != "NOTYPE" ]; then
+      inputJson=$inputJson", \"policyTypeId\":\"$pt\""
+    else
+      inputJson=$inputJson", \"policyTypeId\":\"\""
+    fi
+    if [ $serv != "NOSERVICE" ]; then
+      inputJson=$inputJson", \"serviceId\":\"$serv\""
+    fi
+    if [ $noti != "NONOTIFYURL" ]; then
+      inputJson=$inputJson", \"statusNotificationUri\":\"$noti\""
+    fi
+    if [ $trans != "NOTRANSIENT" ]; then
+      inputJson=$inputJson", \"transient\":\"$trans\""
+    fi
+    file="./tmp/.p.json"
+    data=$(sed 's/XXX/'${pid}'/g' $temp)
+    inputJson=$inputJson", \"policyObject\":$data"
+    inputJson=$inputJson", \"policyId\":\"$UUID$pid\""
+    inputJson="{$inputJson}"
+    echo $inputJson >$file
+    res="$(__do_curl_to_api A1PMS POST $query $file)"
+    status=${res:${#res}-3}
+    echo -ne " Executing "$count"("$max")${SAMELINE}"
+    if [ $status -ne $1 ]; then
+      echo " Executed "$count"?("$max")"
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Executed  "$count"("$max")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 02 "PUT" ${A1PMS_API_PREFIX}${A1PMS_VERSION} ${status} ${max}
+  echo ""
+
+  __log_test_pass
+  return 0

 }
 
 # API Test function: PUT /policy and V2 PUT /policies, to run in batch
 }
 
 # API Test function: PUT /policy and V2 PUT /policies, to run in batch


@@ -1048,114 +1179,114 @@ a1pms_api_put_policy() {
 # (Function for test scripts)
 
 a1pms_api_put_policy_batch() {
 # (Function for test scripts)
 
 a1pms_api_put_policy_batch() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -lt 8 ] || [ $# -gt 9 ]; then
-                       __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <notification-url>|NOURL <template-file> [<count>]" $@
-                       return 1
-               fi
-       else
-               if [ $# -lt 7 ] || [ $# -gt 8 ]; then
-                       __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <template-file> [<count>]" $@
-                       return 1
-               fi
-       fi
-
-       count=0
-       max=1
-       serv=$2
-       ric=$3
-       pt=$4
-       pid=$5
-       trans=$6
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               noti=$7
-               temp=$8
-               if [ $# -eq 9 ]; then
-                       max=$9
-               fi
-       else
-               temp=$7
-               if [ $# -eq 8 ]; then
-                       max=$8
-               fi
-       fi
-
-       ARR=""
-       while [ $count -lt $max ]; do
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       query="/v2/policies"
-
-                       inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
-                       if [ $trans != "NOTRANSIENT" ]; then
-                               inputJson=$inputJson", \"transient\":$trans"
-                       fi
-                       if [ $pt != "NOTYPE" ]; then
-                               inputJson=$inputJson", \"policytype_id\":\"$pt\""
-                       else
-                               inputJson=$inputJson", \"policytype_id\":\"\""
-                       fi
-                       if [ $noti != "NOURL" ]; then
-                               inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
-                       fi
-                       file="./tmp/.p.json"
-                       data=$(sed 's/XXX/'${pid}'/g' $temp)
-                       inputJson=$inputJson", \"policy_data\":$data"
-                       inputJson="{$inputJson}"
-                       echo $inputJson > $file
-               else
-                       query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
-
-                       if [ $pt != "NOTYPE" ]; then
-                               query=$query"&type=$pt"
-                       fi
-
-                       if [ $trans != NOTRANSIENT ]; then
-                               query=$query"&transient=$trans"
-                       fi
-                       file="./tmp/.p.json"
-                       sed 's/XXX/'${pid}'/g' $temp > $file
-               fi
-       res="$(__do_curl_to_api A1PMS PUT_BATCH $query $file)"
-       status=${res:${#res}-3}
-               echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"
-
-               if [ $status -ne 200 ]; then
-                       echo " Requested(batch) "$count"?("$max")"
-                       __log_test_fail_status_code 200 $status
-                       return 1
-               fi
-               cid=${res:0:${#res}-3}
-               ARR=$ARR" "$cid
-               let pid=$pid+1
-               let count=$count+1
-               echo -ne " Requested(batch)  "$count"("$max")${SAMELINE}"
-       done
-
-       echo ""
-       count=0
-       for cid in $ARR; do
-
-       res="$(__do_curl_to_api A1PMS RESPONSE $cid)"
-       status=${res:${#res}-3}
-               echo -ne " Accepting(batch) "$count"("$max")${SAMELINE}"
-
-               if [ $status -ne $1 ]; then
-                       echo " Accepted(batch) "$count"?("$max")"
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               let count=$count+1
-               echo -ne " Accepted(batch)  "$count"("$max")${SAMELINE}"
-       done
-       __collect_endpoint_stats "A1PMS" 02 "PUT" $A1PMS_API_PREFIX"/v2/policies" $1 $max
-
-       echo ""
-
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -lt 8 ] || [ $# -gt 9 ]; then
+      __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <notification-url>|NOURL <template-file> [<count>]" $@
+      return 1
+    fi
+  else
+    if [ $# -lt 7 ] || [ $# -gt 8 ]; then
+      __print_err "<response-code> <service-name> <ric-id> <policytype-id>|NOTYPE <policy-id> <transient> <template-file> [<count>]" $@
+      return 1
+    fi
+  fi
+
+  count=0
+  max=1
+  serv=$2
+  ric=$3
+  pt=$4
+  pid=$5
+  trans=$6
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    noti=$7
+    temp=$8
+    if [ $# -eq 9 ]; then
+      max=$9
+    fi
+  else
+    temp=$7
+    if [ $# -eq 8 ]; then
+      max=$8
+    fi
+  fi
+
+  ARR=""
+  while [ $count -lt $max ]; do
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      query="/v2/policies"
+
+      inputJson="\"ric_id\":\"$ric\",\"policy_id\":\"$UUID$pid\",\"service_id\":\"$serv\""
+      if [ $trans != "NOTRANSIENT" ]; then
+        inputJson=$inputJson", \"transient\":$trans"
+      fi
+      if [ $pt != "NOTYPE" ]; then
+        inputJson=$inputJson", \"policytype_id\":\"$pt\""
+      else
+        inputJson=$inputJson", \"policytype_id\":\"\""
+      fi
+      if [ $noti != "NOURL" ]; then
+        inputJson=$inputJson", \"status_notification_uri\":\"$noti\""
+      fi
+      file="./tmp/.p.json"
+      data=$(sed 's/XXX/'${pid}'/g' $temp)
+      inputJson=$inputJson", \"policy_data\":$data"
+      inputJson="{$inputJson}"
+      echo $inputJson >$file
+    else
+      query="/policy?id=$UUID$pid&ric=$ric&service=$serv"
+
+      if [ $pt != "NOTYPE" ]; then
+        query=$query"&type=$pt"
+      fi
+
+      if [ $trans != NOTRANSIENT ]; then
+        query=$query"&transient=$trans"
+      fi
+      file="./tmp/.p.json"
+      sed 's/XXX/'${pid}'/g' $temp >$file
+    fi
+    res="$(__do_curl_to_api A1PMS PUT_BATCH $query $file)"
+    status=${res:${#res}-3}
+    echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"
+
+    if [ $status -ne 200 ]; then
+      echo " Requested(batch) "$count"?("$max")"
+      __log_test_fail_status_code 200 $status
+      return 1
+    fi
+    cid=${res:0:${#res}-3}
+    ARR=$ARR" "$cid
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Requested(batch)  "$count"("$max")${SAMELINE}"
+  done
+
+  echo ""
+  count=0
+  for cid in $ARR; do
+
+    res="$(__do_curl_to_api A1PMS RESPONSE $cid)"
+    status=${res:${#res}-3}
+    echo -ne " Accepting(batch) "$count"("$max")${SAMELINE}"
+
+    if [ $status -ne $1 ]; then
+      echo " Accepted(batch) "$count"?("$max")"
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+
+    let count=$count+1
+    echo -ne " Accepted(batch)  "$count"("$max")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 02 "PUT" $A1PMS_API_PREFIX"/v2/policies" $1 $max
+
+  echo ""
+
+  __log_test_pass
+  return 0

 }
 
 # API Test function: PUT /policy and V2 PUT /policies, to run in i parallel for a number of rics
 }
 
 # API Test function: PUT /policy and V2 PUT /policies, to run in i parallel for a number of rics


@@ -1163,568 +1294,998 @@ a1pms_api_put_policy_batch() {
 # args(V2): <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_put_policy_parallel() {
 # args(V2): <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_put_policy_parallel() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -ne 11 ]; then
-                       __print_err "<response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>" $@
-                       return 1
-               fi
-       else
-               if [ $# -ne 10 ]; then
-                       __print_err " <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>" $@
-                       return 1
-               fi
-       fi
-       resp_code=$1; shift;
-       serv=$1; shift
-       ric_base=$1; shift;
-       num_rics=$1; shift;
-       type=$1; shift;
-       start_id=$1; shift;
-       transient=$1; shift;
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               noti=$1; shift;
-       else
-               noti=""
-       fi
-       template=$1; shift;
-       count=$1; shift;
-       pids=$1; shift;
-
-       #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
-       if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
-               echo " Info - a1pms_api_put_policy_parallel uses only the a1pms REST interface - create over dmaap in parallel is not supported"
-               echo " Info - will execute over a1pms REST"
-       fi
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $serv == "NOSERVICE" ]; then
-                       serv=""
-               fi
-               query="$A1PMS_API_PREFIX/v2/policies"
-       else
-               if [ $serv == "NOSERVICE" ]; then
-                       serv=""
-               fi
-               query="/policy?service=$serv"
-
-               if [ $type != "NOTYPE" ]; then
-                       query=$query"&type=$type"
-               fi
-
-               if [ $transient != NOTRANSIENT ]; then
-                       query=$query"&transient=$transient"
-               fi
-       fi
-
-       urlbase=${A1PMS_ADAPTER}${query}
-
-       httpproxy="NOPROXY"
-       if [ ! -z "$KUBE_PROXY_PATH" ]; then
-               httpproxy=$KUBE_PROXY_PATH
-       fi
-
-       for ((i=1; i<=$pids; i++))
-       do
-               uuid=$UUID
-               if [ -z "$uuid" ]; then
-                       uuid="NOUUID"
-               fi
-               echo "" > "./tmp/.pid${i}.res.txt"
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
-               else
-                       echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i $httpproxy > "./tmp/.pid${i}.txt"
-               fi
-               echo $i
-       done  | xargs -n 1 -I{} -P $pids bash -c '{
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -ne 11 ]; then
+      __print_err "These all arguments needed <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>" $@
+      return 1
+    fi
+  fi
+
+  resp_code=$1
+  shift
+  serv=$1
+  shift
+  ric_base=$1
+  shift
+  num_rics=$1
+  shift
+  type=$1
+  shift
+  start_id=$1
+  shift
+  transient=$1
+  shift
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    noti=$1
+    shift
+  else
+    noti=""
+  fi
+  template=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_put_policy_parallel uses only the a1pms REST interface - create over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $serv == "NOSERVICE" ]; then
+      serv=""
+    fi
+    query="$A1PMS_API_PREFIX/v2/policies"
+  else
+    if [ $serv == "NOSERVICE" ]; then
+      serv=""
+    fi
+    query="/policy?service=$serv"
+
+    if [ $type != "NOTYPE" ]; then
+      query=$query"&type=$type"
+    fi
+
+    if [ $transient != NOTRANSIENT ]; then
+      query=$query"&transient=$transient"
+    fi
+  fi
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    uuid=$UUID
+    if [ -z "$uuid" ]; then
+      uuid="NOUUID"
+    fi
+    echo "" >"./tmp/.pid${i}.res.txt"
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy >"./tmp/.pid${i}.txt"
+    else
+      echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $template $count $pids $i $httpproxy >"./tmp/.pid${i}.txt"
+    fi
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{

                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.txt")
                python3 ../common/create_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt
        }'
                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.txt")
                python3 ../common/create_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt
        }'

-       msg=""
-       for ((i=1; i<=$pids; i++))
-       do
-               file="./tmp/.pid${i}.res.txt"
-               tmp=$(< $file)
-               if [ -z "$tmp" ]; then
-                       echo " Process $i : unknown result (result file empty"
-                       msg="failed"
-               else
-                       res=${tmp:0:1}
-                       if [ $res == "0" ]; then
-                               echo " Process $i : OK - "${tmp:1}
-                       else
-                               echo " Process $i : failed - "${tmp:1}
-                               msg="failed"
-                       fi
-               fi
-       done
-       if [ -z $msg ]; then
-               __collect_endpoint_stats "A1PMS" 02 "PUT" $A1PMS_API_PREFIX"/v2/policies" $resp_code $(($count*$num_rics))
-               __log_test_pass " $(($count*$num_rics)) policy request(s) executed"
-               return 0
-       fi
-
-       __log_test_fail_general "One of more processes failed to execute"
-       return 1
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 02 "PUT" $A1PMS_API_PREFIX"/v2/policies" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1

 }
 
 }
 

-# API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}
+# API Test function: V3 POST /policies, to run in i parallel for a number of rics
+# args: <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads>
+# args(V3): <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>
+# (Function for test scripts)
+a1pms_api_post_policy_parallel() {
+  __log_test_start $@
+
+  if [ $# -ne 11 ]; then
+    __print_err "These all arguments needed <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads>" $@
+    return 1
+  fi
+
+  resp_code=$1
+  shift
+  serv=$1
+  shift
+  ric_base=$1
+  shift
+  num_rics=$1
+  shift
+  type=$1
+  shift
+  start_id=$1
+  shift
+  transient=$1
+  shift
+  noti=$1
+  shift
+  template=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_put_policy_parallel uses only the a1pms REST interface - create over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  if [ $serv == "NOSERVICE" ]; then
+    serv=""
+  fi
+  query="$A1PMS_API_PREFIX/v1/policies"
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    uuid=$UUID
+    if [ -z "$uuid" ]; then
+      uuid="NOUUID"
+    fi
+    echo "" >"./tmp/.pid${i}.res.txt"
+    echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy >"./tmp/.pid${i}.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{
+               arg=$(echo {})
+               echo " Parallel process $arg started"
+               tmp=$(< "./tmp/.pid${arg}.txt")
+               python3 ../common/create_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt
+       }'
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 02 "POST" $A1PMS_API_PREFIX"/v1/policies" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1
+}
+
+# API Test function: V3 PUT /policies, to run in i parallel for a number of rics
+# args: <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <template-file> <count-per-ric> <number-of-threads> <policy-ids-file-path>
+# args(V3): <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads> <policy-ids-file-path>
+# (Function for test scripts)
+a1pms_api_update_policy_parallel() {
+  __log_test_start $@
+
+  if [ $# -ne 12 ]; then
+    __print_err "These all arguments needed <response-code> <service-name> <ric-id-base> <number-of-rics> <policytype-id> <policy-start-id> <transient> <notification-url>|NOURL <template-file> <count-per-ric> <number-of-threads> <policy-ids-file-path>" $@
+    return 1
+  fi
+
+  resp_code=$1
+  shift
+  serv=$1
+  shift
+  ric_base=$1
+  shift
+  num_rics=$1
+  shift
+  type=$1
+  shift
+  start_id=$1
+  shift
+  transient=$1
+  shift
+  noti=$1
+  shift
+  template=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+  policy_ids_file_path=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_put_policy_parallel uses only the a1pms REST interface - create over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  if [ $serv == "NOSERVICE" ]; then
+    serv=""
+  fi
+  query="$A1PMS_API_PREFIX/v1/policies"
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    uuid=$UUID
+    if [ -z "$uuid" ]; then
+      uuid="NOUUID"
+    fi
+    echo "" >"./tmp/.pid${i}.res.txt"
+    echo $resp_code $urlbase $ric_base $num_rics $uuid $start_id $serv $type $transient $noti $template $count $pids $i $httpproxy $policy_ids_file_path >"./tmp/.pid${i}.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{
+               arg=$(echo {})
+               echo " Parallel process $arg started"
+               tmp=$(< "./tmp/.pid${arg}.txt")
+      python3 ../common/update_policies_process.py $tmp > ./tmp/.pid${arg}.res.txt
+       }'
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 02 "POST" $A1PMS_API_PREFIX"/v1/policies" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1
+}
+
+# API Test function: DELETE /policy, V2 DELETE /v2/policies/{policy_id} and V3 DELETE a1policymanagement/v1/policies/{policy_id}

 # args: <response-code> <policy-id> [count]
 # (Function for test scripts)
 a1pms_api_delete_policy() {
 # args: <response-code> <policy-id> [count]
 # (Function for test scripts)
 a1pms_api_delete_policy() {

-       __log_test_start $@
+  __log_test_start $@

 
 

-    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-        __print_err "<response-code> <policy-id> [count]" $@
-        return 1
+  if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+    __print_err "<response-code> <policy-id> [count]" $@
+    return 1
+  fi
+
+  count=0
+  max=1
+
+  if [ $# -eq 3 ]; then
+    max=$3
+  fi
+
+  pid=$2
+
+  while [ $count -lt $max ]; do
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      query="/v2/policies/"$UUID$pid
+    elif [ "$A1PMS_VERSION" == "V3" ]; then
+      query="/v1/policies/"$UUID$pid
+    else
+      query="/policy?id="$UUID$pid
+    fi
+    res="$(__do_curl_to_api A1PMS DELETE $query)"
+    status=${res:${#res}-3}
+    echo -ne " Executing "${count}"("${max}")${SAMELINE}"
+
+    if [ $status -ne $1 ]; then
+      echo " Executed "${count}"?("${max}")"
+      __log_test_fail_status_code $1 $status
+      return 1

     fi
 
     fi
 

-       count=0
-       max=1
-
-       if [ $# -eq 3 ]; then
-               max=$3
-       fi
-
-       pid=$2
-
-       while [ $count -lt $max ]; do
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       query="/v2/policies/"$UUID$pid
-               else
-                       query="/policy?id="$UUID$pid
-               fi
-               res="$(__do_curl_to_api A1PMS DELETE $query)"
-               status=${res:${#res}-3}
-               echo -ne " Executing "$count"("$max")${SAMELINE}"
-
-               if [ $status -ne $1 ]; then
-                       echo " Executed "$count"?("$max")"
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               let pid=$pid+1
-               let count=$count+1
-               echo -ne " Executed  "$count"("$max")${SAMELINE}"
-       done
-       __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $status $max
-       echo ""
-
-       __log_test_pass
-       return 0
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Executed  "${count}"("${max}")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 03 "DELETE" ${A1PMS_API_PREFIX}${query} ${status} ${max}
+  echo ""
+
+  __log_test_pass
+  return 0

 }
 
 # API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in batch
 # args: <response-code> <policy-id> [count]
 # (Function for test scripts)
 a1pms_api_delete_policy_batch() {
 }
 
 # API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in batch
 # args: <response-code> <policy-id> [count]
 # (Function for test scripts)
 a1pms_api_delete_policy_batch() {

-       __log_test_start $@
+  __log_test_start $@
+
+  if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+    __print_err "<response-code> <policy-id> [count]" $@
+    return 1
+  fi
+
+  count=0
+  max=1
+
+  if [ $# -eq 3 ]; then
+    max=$3
+  fi
+
+  pid=$2
+  ARR=""
+  while [ $count -lt $max ]; do
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      query="/v2/policies/"$UUID$pid
+    else
+      query="/policy?id="$UUID$pid
+    fi
+    res="$(__do_curl_to_api A1PMS DELETE_BATCH $query)"
+    status=${res:${#res}-3}
+    echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"

 
 

-    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-        __print_err "<response-code> <policy-id> [count]" $@
-        return 1
+    if [ $status -ne 200 ]; then
+      echo " Requested(batch) "$count"?("$max")"
+      __log_test_fail_status_code 200 $status
+      return 1
+    fi
+    cid=${res:0:${#res}-3}
+    ARR=$ARR" "$cid
+    let pid=$pid+1
+    let count=$count+1
+    echo -ne " Requested(batch)  "$count"("$max")${SAMELINE}"
+  done
+
+  echo ""
+
+  count=0
+  for cid in $ARR; do
+
+    res="$(__do_curl_to_api A1PMS RESPONSE $cid)"
+    status=${res:${#res}-3}
+    echo -ne " Deleting(batch) "$count"("$max")${SAMELINE}"
+
+    if [ $status -ne $1 ]; then
+      echo " Deleted(batch) "$count"?("$max")"
+      __log_test_fail_status_code $1 $status
+      return 1

     fi
 
     fi
 

-       count=0
-       max=1
-
-       if [ $# -eq 3 ]; then
-               max=$3
-       fi
-
-       pid=$2
-       ARR=""
-       while [ $count -lt $max ]; do
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       query="/v2/policies/"$UUID$pid
-               else
-                       query="/policy?id="$UUID$pid
-               fi
-               res="$(__do_curl_to_api A1PMS DELETE_BATCH $query)"
-               status=${res:${#res}-3}
-               echo -ne " Requesting(batch) "$count"("$max")${SAMELINE}"
-
-               if [ $status -ne 200 ]; then
-                       echo " Requested(batch) "$count"?("$max")"
-                       __log_test_fail_status_code 200 $status
-                       return 1
-               fi
-               cid=${res:0:${#res}-3}
-               ARR=$ARR" "$cid
-               let pid=$pid+1
-               let count=$count+1
-               echo -ne " Requested(batch)  "$count"("$max")${SAMELINE}"
-       done
-
-       echo ""
-
-       count=0
-       for cid in $ARR; do
-
-       res="$(__do_curl_to_api A1PMS RESPONSE $cid)"
-       status=${res:${#res}-3}
-               echo -ne " Deleting(batch) "$count"("$max")${SAMELINE}"
-
-               if [ $status -ne $1 ]; then
-                       echo " Deleted(batch) "$count"?("$max")"
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               let count=$count+1
-               echo -ne " Deleted(batch)  "$count"("$max")${SAMELINE}"
-       done
-       __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $1 $max
-
-       echo ""
-
-       __log_test_pass
-       return 0
+    let count=$count+1
+    echo -ne " Deleted(batch)  "$count"("$max")${SAMELINE}"
+  done
+  __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $1 $max
+
+  echo ""
+
+  __log_test_pass
+  return 0

 }
 
 # API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in i parallel for a number of rics
 # args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_delete_policy_parallel() {
 }
 
 # API Test function: DELETE /policy and V2 DELETE /v2/policies/{policy_id}, to run in i parallel for a number of rics
 # args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_delete_policy_parallel() {

-       __log_test_start $@
-
-    if [ $# -ne 5 ]; then
-        __print_err " <response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>" $@
-        return 1
+  __log_test_start $@
+
+  if [ $# -ne 5 ]; then
+    __print_err " <response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>" $@
+    return 1
+  fi
+  resp_code=$1
+  shift
+  num_rics=$1
+  shift
+  start_id=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_delete_policy_parallel uses only the a1pms REST interface - delete over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="$A1PMS_API_PREFIX/v2/policies/"
+  else
+    query="/policy"
+  fi
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    uuid=$UUID
+    if [ -z "$uuid" ]; then
+      uuid="NOUUID"

     fi
     fi

-       resp_code=$1; shift;
-       num_rics=$1; shift;
-       start_id=$1; shift;
-       count=$1; shift;
-       pids=$1; shift;
-
-       #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
-       if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
-               echo " Info - a1pms_api_delete_policy_parallel uses only the a1pms REST interface - delete over dmaap in parallel is not supported"
-               echo " Info - will execute over a1pms REST"
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="$A1PMS_API_PREFIX/v2/policies/"
-       else
-               query="/policy"
-       fi
-
-       urlbase=${A1PMS_ADAPTER}${query}
-
-       httpproxy="NOPROXY"
-       if [ ! -z "$KUBE_PROXY_PATH" ]; then
-               httpproxy=$KUBE_PROXY_PATH
-       fi
-
-       for ((i=1; i<=$pids; i++))
-       do
-               uuid=$UUID
-               if [ -z "$uuid" ]; then
-                       uuid="NOUUID"
-               fi
-               echo "" > "./tmp/.pid${i}.del.res.txt"
-               echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy> "./tmp/.pid${i}.del.txt"
-               echo $i
-       done  | xargs -n 1 -I{} -P $pids bash -c '{
+    echo "" >"./tmp/.pid${i}.del.res.txt"
+    echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy >"./tmp/.pid${i}.del.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{

                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.del.txt")
                python3 ../common/delete_policies_process.py $tmp > ./tmp/.pid${arg}.del.res.txt
        }'
                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.del.txt")
                python3 ../common/delete_policies_process.py $tmp > ./tmp/.pid${arg}.del.res.txt
        }'

-       msg=""
-       for ((i=1; i<=$pids; i++))
-       do
-               file="./tmp/.pid${i}.del.res.txt"
-               tmp=$(< $file)
-               if [ -z "$tmp" ]; then
-                       echo " Process $i : unknown result (result file empty"
-                       msg="failed"
-               else
-                       res=${tmp:0:1}
-                       if [ $res == "0" ]; then
-                               echo " Process $i : OK - "${tmp:1}
-                       else
-                               echo " Process $i : failed - "${tmp:1}
-                               msg="failed"
-                       fi
-               fi
-       done
-       if [ -z $msg ]; then
-               __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $resp_code $(($count*$num_rics))
-               __log_test_pass " $(($count*$num_rics)) policy request(s) executed"
-               return 0
-       fi
-
-       __log_test_fail_general "One of more processes failed to execute"
-       return 1
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.del.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1
+}
+
+# API Test function: V3 DELETE a1policymanagement/v1/policies/{policy_id}, to run in i parallel for a number of rics
+# args: <responseCode> <numberOfRics> <PolicyIdsFilePath> <countPerRic> <numberOfThreads>
+# (Function for test scripts)
+a1pms_api_delete_policy_parallel_v3() {
+  __log_test_start $@
+
+  if [ $# -ne 6 ]; then
+    __print_err " <responseCode> <numberOfRics> <PolicyIdsFilePath> <StartID> <countPerRic> <numberOfThreads>" $@
+    return 1
+  fi
+  resp_code=$1
+  shift
+  num_rics=$1
+  shift
+  policy_ids_file_path=$1
+  shift
+  start_id=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_delete_policy_parallel uses only the a1pms REST interface - delete over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  query="$A1PMS_API_PREFIX/v1/policies/"
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    echo "" >"./tmp/.pid${i}.del.res.txt"
+    echo $resp_code $urlbase $policy_ids_file_path $start_id $pids $i $httpproxy >"./tmp/.pid${i}.del.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{
+               arg=$(echo {})
+               echo " Parallel process $arg started"
+               tmp=$(< "./tmp/.pid${arg}.del.txt")
+               python3 ../common/delete_policies_process_v3.py $tmp > ./tmp/.pid${arg}.del.res.txt
+       }'
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.del.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 03 "DELETE" $A1PMS_API_PREFIX"/v1/policies/{policy_id}" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1

 }
 
 # API Test function: GET /policy and V2 GET /v2/policies/{policy_id}, to run in i parallel for a number of rics
 # args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_get_policy_parallel() {
 }
 
 # API Test function: GET /policy and V2 GET /v2/policies/{policy_id}, to run in i parallel for a number of rics
 # args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
 # (Function for test scripts)
 a1pms_api_get_policy_parallel() {

-       __log_test_start $@
-
-    if [ $# -ne 5 ]; then
-        __print_err " <response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>" $@
-        return 1
+  __log_test_start $@
+
+  if [ $# -ne 5 ]; then
+    __print_err " <response-code> <ric-id-base> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>" $@
+    return 1
+  fi
+  resp_code=$1
+  shift
+  num_rics=$1
+  shift
+  start_id=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_get_policy_parallel uses only the a1pms REST interface - GET over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="$A1PMS_API_PREFIX/v2/policies/"
+  else
+    query="/policy"
+  fi
+
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    uuid=$UUID
+    if [ -z "$uuid" ]; then
+      uuid="NOUUID"

     fi
     fi

-       resp_code=$1; shift;
-       num_rics=$1; shift;
-       start_id=$1; shift;
-       count=$1; shift;
-       pids=$1; shift;
-
-       #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
-       if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
-               echo " Info - a1pms_api_get_policy_parallel uses only the a1pms REST interface - GET over dmaap in parallel is not supported"
-               echo " Info - will execute over a1pms REST"
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="$A1PMS_API_PREFIX/v2/policies/"
-       else
-               query="/policy"
-       fi
-
-       urlbase=${A1PMS_ADAPTER}${query}
-
-       httpproxy="NOPROXY"
-       if [ ! -z "$KUBE_PROXY_PATH" ]; then
-               httpproxy=$KUBE_PROXY_PATH
-       fi
-
-       for ((i=1; i<=$pids; i++))
-       do
-               uuid=$UUID
-               if [ -z "$uuid" ]; then
-                       uuid="NOUUID"
-               fi
-               echo "" > "./tmp/.pid${i}.get.res.txt"
-               echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy> "./tmp/.pid${i}.get.txt"
-               echo $i
-       done  | xargs -n 1 -I{} -P $pids bash -c '{
+    echo "" >"./tmp/.pid${i}.get.res.txt"
+    echo $resp_code $urlbase $num_rics $uuid $start_id $count $pids $i $httpproxy >"./tmp/.pid${i}.get.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{

                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.get.txt")
                python3 ../common/get_policies_process.py $tmp > ./tmp/.pid${arg}.get.res.txt
        }'
                arg=$(echo {})
                echo " Parallel process $arg started"
                tmp=$(< "./tmp/.pid${arg}.get.txt")
                python3 ../common/get_policies_process.py $tmp > ./tmp/.pid${arg}.get.res.txt
        }'

-       msg=""
-       for ((i=1; i<=$pids; i++))
-       do
-               file="./tmp/.pid${i}.get.res.txt"
-               tmp=$(< $file)
-               if [ -z "$tmp" ]; then
-                       echo " Process $i : unknown result (result file empty"
-                       msg="failed"
-               else
-                       res=${tmp:0:1}
-                       if [ $res == "0" ]; then
-                               echo " Process $i : OK - "${tmp:1}
-                       else
-                               echo " Process $i : failed - "${tmp:1}
-                               msg="failed"
-                       fi
-               fi
-       done
-       if [ -z $msg ]; then
-               __collect_endpoint_stats "A1PMS" 04 "GET" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $resp_code $(($count*$num_rics))
-               __log_test_pass " $(($count*$num_rics)) policy request(s) executed"
-               return 0
-       fi
-
-       __log_test_fail_general "One of more processes failed to execute"
-       return 1
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.get.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 04 "GET" $A1PMS_API_PREFIX"/v2/policies/{policy_id}" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1
+}
+
+# API Test function: V3 GET a1policymanagement/v1/policies/{policy_id}, to run in i parallel for a number of rics
+# args: <response-code> <number-of-rics> <policy-start-id> <count-per-ric> <number-of-threads>
+# (Function for test scripts)
+a1pms_api_get_policy_parallel_v3() {
+  __log_test_start $@
+
+  if [ $# -ne 6 ]; then
+    __print_err " <responseCode> <numberOfRics> <PolicyIdsFilePath> <startID> <countPerRic> <numberOfThreads>" $@
+    return 1
+  fi
+  resp_code=$1
+  shift
+  num_rics=$1
+  shift
+  policy_ids_file_path=$1
+  shift
+  start_id=$1
+  shift
+  count=$1
+  shift
+  pids=$1
+  shift
+
+  #if [ $A1PMS_ADAPTER != $RESTBASE ] && [ $A1PMS_ADAPTER != $RESTBASE_SECURE ]; then
+  if [ $A1PMS_ADAPTER_TYPE != "REST" ]; then
+    echo " Info - a1pms_api_get_policy_parallel uses only the a1pms REST interface - GET over dmaap in parallel is not supported"
+    echo " Info - will execute over a1pms REST"
+  fi
+
+  query="$A1PMS_API_PREFIX/v1/policies/"
+  urlbase=${A1PMS_ADAPTER}${query}
+
+  httpproxy="NOPROXY"
+  if [ ! -z "$KUBE_PROXY_PATH" ]; then
+    httpproxy=$KUBE_PROXY_PATH
+  fi
+
+  for ((i = 1; i <= $pids; i++)); do
+    echo "" >"./tmp/.pid${i}.get.res.txt"
+    echo $resp_code $urlbase $policy_ids_file_path $start_id $pids $i $httpproxy >"./tmp/.pid${i}.get.txt"
+    echo $i
+  done | xargs -n 1 -I{} -P $pids bash -c '{
+               arg=$(echo {})
+               echo " Parallel process $arg started"
+               tmp=$(< "./tmp/.pid${arg}.get.txt")
+               python3 ../common/get_policies_process_v3.py $tmp > ./tmp/.pid${arg}.get.res.txt
+       }'
+  msg=""
+  for ((i = 1; i <= $pids; i++)); do
+    file="./tmp/.pid${i}.get.res.txt"
+    tmp=$(<$file)
+    if [ -z "$tmp" ]; then
+      echo " Process $i : unknown result (result file empty"
+      msg="failed"
+    else
+      res=${tmp:0:1}
+      if [ $res == "0" ]; then
+        echo " Process $i : OK - "${tmp:1}
+      else
+        echo " Process $i : failed - "${tmp:1}
+        msg="failed"
+      fi
+    fi
+  done
+  if [ -z $msg ]; then
+    __collect_endpoint_stats "A1PMS" 04 "GET" $A1PMS_API_PREFIX"/v1/policies/{policyId}" $resp_code $(($count * $num_rics))
+    __log_test_pass " $(($count * $num_rics)) policy request(s) executed"
+    return 0
+  fi
+
+  __log_test_fail_general "One of more processes failed to execute"
+  return 1

 }
 
 # API Test function: GET /policy_ids and V2 GET /v2/policies
 # args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)
 # (Function for test scripts)
 a1pms_api_get_policy_ids() {
 }
 
 # API Test function: GET /policy_ids and V2 GET /v2/policies
 # args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)
 # (Function for test scripts)
 a1pms_api_get_policy_ids() {

-       __log_test_start $@
+  __log_test_start $@

 
 

-    if [ $# -lt 4 ]; then
-               __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)" $@
-               return 1
-       fi
-
-       queryparams=""
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $2 != "NORIC" ]; then
-                       queryparams="?ric_id="$2
-               fi
-
-               if [ $3 != "NOSERVICE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?service_id="$3
-                       else
-                               queryparams=$queryparams"&service_id="$3
-                       fi
-               fi
-               if [ $4 != "NOTYPE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?policytype_id="$4
-                       else
-                               queryparams=$queryparams"&policytype_id="$4
-                       fi
-               fi
-
-               query="/v2/policies"$queryparams
-       else
-               if [ $2 != "NORIC" ]; then
-                       queryparams="?ric="$2
-               fi
-
-               if [ $3 != "NOSERVICE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?service="$3
-                       else
-                               queryparams=$queryparams"&service="$3
-                       fi
-               fi
-               if [ $4 != "NOTYPE" ]; then
-                       if [ -z $queryparams ]; then
-                               queryparams="?type="$4
-                       else
-                               queryparams=$queryparams"&type="$4
-                       fi
-               fi
-
-               query="/policy_ids"$queryparams
-       fi
+  if [ $# -lt 4 ]; then
+    __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)" $@
+    return 1
+  fi

 
 

-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
+  queryparams=""

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -gt 4 ]; then
-               body=${res:0:${#res}-3}
-               targetJson="["
-
-               for pid in ${@:5} ; do
-                       if [ "$targetJson" != "[" ]; then
-                               targetJson=$targetJson","
-                       fi
-                       if [ $pid != "NOID" ]; then
-                               targetJson=$targetJson"\"$UUID$pid\""
-                       fi
-               done
-
-               targetJson=$targetJson"]"
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson="{\"policy_ids\": $targetJson}"
-               fi
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 04 "GET" $A1PMS_API_PREFIX"/v2/policies" $status
-       __log_test_pass
-       return 0
-}
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $2 != "NORIC" ]; then
+      queryparams="?ric_id="$2
+    fi

 
 

-# API Test function: V2 GET /v2/policy-types/{policyTypeId}
-# args(V2): <response-code> <policy-type-id> [<schema-file>]
-# (Function for test scripts)
-a1pms_api_get_policy_type() {
-       __log_test_start $@
+    if [ $3 != "NOSERVICE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?service_id="$3
+      else
+        queryparams=$queryparams"&service_id="$3
+      fi
+    fi
+    if [ $4 != "NOTYPE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?policytype_id="$4
+      else
+        queryparams=$queryparams"&policytype_id="$4
+      fi
+    fi

 
 

-       if [ "$A1PMS_VERSION" != "V2" ]; then
-               __log_test_fail_not_supported
-               return 1
-       fi
+    query="/v2/policies"$queryparams
+  else
+    if [ $2 != "NORIC" ]; then
+      queryparams="?ric="$2
+    fi

 
 

-    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-        __print_err "<response-code> <policy-type-id> [<schema-file>]" $@
-        return 1
+    if [ $3 != "NOSERVICE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?service="$3
+      else
+        queryparams=$queryparams"&service="$3
+      fi
+    fi
+    if [ $4 != "NOTYPE" ]; then
+      if [ -z $queryparams ]; then
+        queryparams="?type="$4
+      else
+        queryparams=$queryparams"&type="$4
+      fi

     fi
     fi

-       query="/v2/policy-types/$2"

 
 

-       res="$(__do_curl_to_api A1PMS GET $query)"
-       status=${res:${#res}-3}
+    query="/policy_ids"$queryparams
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 4 ]; then
+    body=${res:0:${#res}-3}
+    targetJson="["
+
+    for pid in ${@:5}; do
+      if [ "$targetJson" != "[" ]; then
+        targetJson=$targetJson","
+      fi
+      if [ $pid != "NOID" ]; then
+        targetJson=$targetJson"\"$UUID$pid\""
+      fi
+    done
+
+    targetJson=$targetJson"]"
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson="{\"policy_ids\": $targetJson}"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
+  __collect_endpoint_stats "A1PMS" 04 "GET" $A1PMS_API_PREFIX"/v2/policies" $status
+  __log_test_pass
+  return 0
+}

 
 

-       if [ $# -eq 3 ]; then
+# API Test function: V3 GET a1policymanagement/v1/policies
+# args: <response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)
+# (Function for test scripts)
+a1pms_api_get_all_policies_v3() {
+  __log_test_start $@

 
 

-               body=${res:0:${#res}-3}
+  if [ $# -lt 4 ]; then
+    __print_err "<response-code> <ric-id>|NORIC <service-id>|NOSERVICE <type-id>|NOTYPE ([<policy-instance-id]*|NOID)" $@
+    return 1
+  fi

 
 

-               targetJson=$(< $3)
-               targetJson="{\"policy_schema\":$targetJson}"
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+  queryparams=""

 
 

-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
+  if [ $2 != "NORIC" ]; then
+    queryparams="?nearRtRicId="$2
+  fi

 
 

-       __collect_endpoint_stats "A1PMS" 05 "GET" $A1PMS_API_PREFIX"/v2/policy-types/{policyTypeId}" $status
-       __log_test_pass
-       return 0
+  if [ $3 != "NOSERVICE" ]; then
+    if [ -z $queryparams ]; then
+      queryparams="?serviceId="$3
+    else
+      queryparams=$queryparams"&serviceId="$3
+    fi
+  fi
+  if [ $4 != "NOTYPE" ]; then
+    if [ -z $queryparams ]; then
+      queryparams="?policyTypeId="$4
+    else
+      queryparams=$queryparams"&policyTypeId="$4
+    fi
+  fi
+
+  query="/v1/policies"$queryparams
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 4 ]; then
+    body=${res:0:${#res}-3}
+    targetJson="["
+
+    for pid in ${@:5}; do
+      if [ "$targetJson" != "[" ]; then
+        targetJson=$targetJson","
+      fi
+      IFS=':' read -r policy_id ric_id <<<"$pid"
+      if [ $policy_id != "NOID" ]; then
+        targetJson=$targetJson"{ \"policyId\": \"${UUID}${policy_id}\", \"nearRtRicId\": \"$ric_id\" }"
+      fi
+    done
+
+    targetJson=$targetJson"]"
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 04 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0
+}
+
+# API Test function: V2 GET a1-policy/v2/policy-types/{policyTypeId} and V3 GET a1policymanagement/v1/policytypes/{policyTypeId}
+# args(V2): <response-code> <policy-type-id> [<schema-file>]
+# (Function for test scripts)
+a1pms_api_get_policy_type() {
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" != "V2" ] && [ "$A1PMS_VERSION" != "V3" ]; then
+    __log_test_fail_not_supported
+    return 1
+  fi
+
+  if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+    __print_err "<response-code> <policy-type-id> [<schema-file>]" $@
+    return 1
+  fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/policy-types/$2"
+  fi
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/policytypes/$2"
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -eq 3 ]; then
+
+    body=${res:0:${#res}-3}
+
+    targetJson=$(<$3)
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson="{\"policy_schema\":$targetJson}"
+    elif [ "$A1PMS_VERSION" == "V3" ]; then
+      targetJson="$targetJson"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 05 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 # API Test function: GET /policy_schema
 # args: <response-code> <policy-type-id> [<schema-file>]
 # (Function for test scripts)
 a1pms_api_get_policy_schema() {
 }
 
 # API Test function: GET /policy_schema
 # args: <response-code> <policy-type-id> [<schema-file>]
 # (Function for test scripts)
 a1pms_api_get_policy_schema() {

-       __log_test_start $@
+  __log_test_start $@

 
 

-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               __log_test_fail_not_supported
-               return 1
-       fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    __log_test_fail_not_supported
+    return 1
+  fi

 
 

-    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-        __print_err "<response-code> <policy-type-id> [<schema-file>]" $@
-        return 1
-    fi
-       query="/policy_schema?id=$2"
-       res="$(__do_curl_to_api A1PMS GET $query)"
-       status=${res:${#res}-3}
+  if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+    __print_err "<response-code> <policy-type-id> [<schema-file>]" $@
+    return 1
+  fi
+  query="/policy_schema?id=$2"
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi

 
 

-       if [ $# -eq 3 ]; then
+  if [ $# -eq 3 ]; then

 
 

-               body=${res:0:${#res}-3}
+    body=${res:0:${#res}-3}

 
 

-               targetJson=$(< $3)
+    targetJson=$(<$3)

 
 

-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")

 
 

-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi

 
 

-       __collect_endpoint_stats "A1PMS" 06 "GET" $A1PMS_API_PREFIX"/v2/policy_schema" $status
-       __log_test_pass
-       return 0
+  __collect_endpoint_stats "A1PMS" 06 "GET" $A1PMS_API_PREFIX"/v2/policy_schema" $status
+  __log_test_pass
+  return 0

 }
 
 # API Test function: GET /policy_schemas
 }
 
 # API Test function: GET /policy_schemas


@@ -1732,743 +2293,906 @@ a1pms_api_get_policy_schema() {
 # args(V2): <response-code>
 # (Function for test scripts)
 a1pms_api_get_policy_schemas() {
 # args(V2): <response-code>
 # (Function for test scripts)
 a1pms_api_get_policy_schemas() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -ne 1 ]; then
-                       __print_err "<response-code>" $@
-                       return 1
-               fi
-       else
-               if [ $# -lt 2 ]; then
-                       __print_err "<response-code> <ric-id>|NORIC [<schema-file>|NOFILE]*" $@
-                       return 1
-               fi
-       fi
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/policy-schemas"
-       else
-               query="/policy_schemas"
-               if [ $2 != "NORIC" ]; then
-                       query=$query"?ric="$2
-               fi
-       fi
-
-       res="$(__do_curl_to_api A1PMS GET $query)"
-       status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -gt 2 ]; then
-               body=${res:0:${#res}-3}
-               targetJson="["
-
-               for file in ${@:3} ; do
-                       if [ "$targetJson" != "[" ]; then
-                               targetJson=$targetJson","
-                       fi
-                       if [ $file == "NOFILE" ]; then
-                               targetJson=$targetJson"{}"
-                       else
-                               targetJson=$targetJson$(< $file)
-                       fi
-               done
-
-               targetJson=$targetJson"]"
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson="{\"policy_schemas\": $targetJson }"
-               fi
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 07 "GET" $A1PMS_API_PREFIX"/v2/policy-schemas" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -ne 1 ]; then
+      __print_err "<response-code>" $@
+      return 1
+    fi
+  else
+    if [ $# -lt 2 ]; then
+      __print_err "<response-code> <ric-id>|NORIC [<schema-file>|NOFILE]*" $@
+      return 1
+    fi
+  fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/policy-schemas"
+  else
+    query="/policy_schemas"
+    if [ $2 != "NORIC" ]; then
+      query=$query"?ric="$2
+    fi
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 2 ]; then
+    body=${res:0:${#res}-3}
+    targetJson="["
+
+    for file in ${@:3}; do
+      if [ "$targetJson" != "[" ]; then
+        targetJson=$targetJson","
+      fi
+      if [ $file == "NOFILE" ]; then
+        targetJson=$targetJson"{}"
+      else
+        targetJson=$targetJson$(<$file)
+      fi
+    done
+
+    targetJson=$targetJson"]"
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson="{\"policy_schemas\": $targetJson }"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 07 "GET" $A1PMS_API_PREFIX"/v2/policy-schemas" $status
+  __log_test_pass
+  return 0

 }
 
 # API Test function: GET /policy_status and V2 GET /policies/{policy_id}/status
 # arg: <response-code> <policy-id> [ (STD|STD2 <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>) ]
 # (Function for test scripts)
 a1pms_api_get_policy_status() {
 }
 
 # API Test function: GET /policy_status and V2 GET /policies/{policy_id}/status
 # arg: <response-code> <policy-id> [ (STD|STD2 <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>) ]
 # (Function for test scripts)
 a1pms_api_get_policy_status() {

-       __log_test_start $@
-
-    if [ $# -lt 2 ] || [ $# -gt 5 ]; then
-               __print_err "<response-code> <policy-id> [(STD <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>)]" $@
-               return 1
-       fi
-
-       targetJson=""
-       if [ $# -eq 2 ]; then
-               :
-       elif [ "$3" == "STD" ]; then
-               targetJson="{\"enforceStatus\":\"$4\""
-               if [ $# -eq 5 ]; then
-                       targetJson=$targetJson",\"reason\":\"$5\""
-               fi
-               targetJson=$targetJson"}"
-       elif [ "$3" == "STD2" ]; then
-               if [ $4 == "EMPTY" ]; then
-                       targetJson="{\"enforceStatus\":\"\""
-               else
-                       targetJson="{\"enforceStatus\":\"$4\""
-               fi
-               if [ $# -eq 5 ]; then
-                       if [ $5 == "EMPTY" ]; then
-                               targetJson=$targetJson",\"enforceReason\":\"\""
-                       else
-                               targetJson=$targetJson",\"enforceReason\":\"$5\""
-                       fi
-               fi
-               targetJson=$targetJson"}"
-       elif [ "$3" == "OSC" ]; then
-               targetJson="{\"instance_status\":\"$4\""
-               if [ $# -eq 5 ]; then
-                       targetJson=$targetJson",\"has_been_deleted\":\"$5\""
-               fi
-               targetJson=$targetJson",\"created_at\":\"????\"}"
-       else
-               __print_err "<response-code> (STD <enforce-status> [<reason>])|(OSC <instance-status> <has-been-deleted>)" $@
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/policies/$UUID$2/status"
-               targetJson="{\"last_modified\":\"????\",\"status\":$targetJson}"
-       else
-               query="/policy_status?id="$UUID$2
-       fi
-
-       res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-       if [ $# -gt 2 ]; then
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               body=${res:0:${#res}-3}
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-       __collect_endpoint_stats "A1PMS" 08 "GET" $A1PMS_API_PREFIX"/v2/policies/{policy_id}/status" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ $# -lt 2 ] || [ $# -gt 5 ]; then
+    __print_err "<response-code> <policy-id> [(STD <enforce-status>|EMPTY [<reason>|EMPTY])|(OSC <instance-status> <has-been-deleted>)]" $@
+    return 1
+  fi
+
+  targetJson=""
+  if [ $# -eq 2 ]; then
+    :
+  elif [ "$3" == "STD" ]; then
+    targetJson="{\"enforceStatus\":\"$4\""
+    if [ $# -eq 5 ]; then
+      targetJson=$targetJson",\"reason\":\"$5\""
+    fi
+    targetJson=$targetJson"}"
+  elif [ "$3" == "STD2" ]; then
+    if [ $4 == "EMPTY" ]; then
+      targetJson="{\"enforceStatus\":\"\""
+    else
+      targetJson="{\"enforceStatus\":\"$4\""
+    fi
+    if [ $# -eq 5 ]; then
+      if [ $5 == "EMPTY" ]; then
+        targetJson=$targetJson",\"enforceReason\":\"\""
+      else
+        targetJson=$targetJson",\"enforceReason\":\"$5\""
+      fi
+    fi
+    targetJson=$targetJson"}"
+  elif [ "$3" == "OSC" ]; then
+    if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+      targetJson="{\"instance_status\":\"$4\""
+      if [ $# -eq 5 ]; then
+        targetJson=$targetJson",\"has_been_deleted\":\"$5\""
+      fi
+      targetJson=$targetJson",\"created_at\":\"????\"}"
+    else
+      targetJson="{\"enforceStatus\":\"$4\""
+      if [ $# -eq 5 ]; then
+        targetJson=$targetJson",\"enforceReason\":\"$5\"}"
+      fi
+    fi
+  else
+    __print_err "<response-code> (STD <enforce-status> [<reason>])|(OSC <instance-status> <has-been-deleted>)" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/policies/$UUID$2/status"
+    targetJson="{\"last_modified\":\"????\",\"status\":$targetJson}"
+  else
+    query="/policy_status?id="$UUID$2
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+  if [ $# -gt 2 ]; then
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    body=${res:0:${#res}-3}
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+  __collect_endpoint_stats "A1PMS" 08 "GET" $A1PMS_API_PREFIX"/v2/policies/{policy_id}/status" $status
+  __log_test_pass
+  return 0

 }
 
 # API Test function: GET /policy_types and V2 GET /v2/policy-types
 # args: <response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]
 # (Function for test scripts)
 a1pms_api_get_policy_types() {
 }
 
 # API Test function: GET /policy_types and V2 GET /v2/policy-types
 # args: <response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]
 # (Function for test scripts)
 a1pms_api_get_policy_types() {

-       __log_test_start $@
-
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]" $@
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -eq 1 ]; then
-                       query="/v2/policy-types"
-               elif [ $2 == "NORIC" ]; then
-                       query="/v2/policy-types"
-               else
-                       query="/v2/policy-types?ric_id=$2"
-               fi
-       else
-               if [ $# -eq 1 ]; then
-                       query="/policy_types"
-               elif [ $2 == "NORIC" ]; then
-                       query="/policy_types"
-               else
-                       query="/policy_types?ric=$2"
-               fi
-       fi
+  __log_test_start $@
+
+  if [ $# -lt 1 ]; then
+    __print_err "<response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -eq 1 ]; then
+      query="/v2/policy-types"
+    elif [ $2 == "NORIC" ]; then
+      query="/v2/policy-types"
+    else
+      query="/v2/policy-types?ric_id=$2"
+    fi
+  else
+    if [ $# -eq 1 ]; then
+      query="/policy_types"
+    elif [ $2 == "NORIC" ]; then
+      query="/policy_types"
+    else
+      query="/policy_types?ric=$2"
+    fi
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 2 ]; then
+    body=${res:0:${#res}-3}
+    targetJson="["
+
+    for pid in ${@:3}; do
+      if [ "$targetJson" != "[" ]; then
+        targetJson=$targetJson","
+      fi
+      if [ $pid == "EMPTY" ]; then
+        pid=""
+      fi
+      targetJson=$targetJson"\"$pid\""
+    done
+
+    targetJson=$targetJson"]"
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson="{\"policytype_ids\": $targetJson }"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")

 
 

-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -gt 2 ]; then
-               body=${res:0:${#res}-3}
-               targetJson="["
-
-               for pid in ${@:3} ; do
-                       if [ "$targetJson" != "[" ]; then
-                               targetJson=$targetJson","
-                       fi
-                       if [ $pid == "EMPTY" ]; then
-                               pid=""
-                       fi
-                       targetJson=$targetJson"\"$pid\""
-               done
-
-               targetJson=$targetJson"]"
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson="{\"policytype_ids\": $targetJson }"
-               fi
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 09 "GET" $A1PMS_API_PREFIX"/v2/policy-types" $status
-       __log_test_pass
-       return 0
+  __collect_endpoint_stats "A1PMS" 09 "GET" $A1PMS_API_PREFIX"/v2/policy-types" $status
+  __log_test_pass
+  return 0
+}
+
+# API Test function:  V3 GET a1policymanagement/v1/policytypes
+# args: <response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]
+# (Function for test scripts)
+a1pms_api_get_policy_types_v3() {
+  __log_test_start $@
+
+  if [ $# -lt 1 ]; then
+    __print_err "<response-code> [<ric-id>|NORIC [<policy-type-id>|EMPTY [<policy-type-id>]*]]" $@
+    return 1
+  fi
+
+  if [ $# -eq 1 ]; then
+    query="/v1/policytypes"
+  elif [ $2 == "NORIC" ]; then
+    query="/v1/policytypes"
+  else
+    query="/v1/policytypes?nearRtRicId=$2"
+  fi
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 2 ]; then
+    body=${res:0:${#res}-3}
+    targetJson="["
+
+    for pid in ${@:3}; do
+      if [ "$targetJson" != "[" ]; then
+        targetJson=$targetJson","
+      fi
+      IFS=':' read -r policy_type_id ric_id <<<"$pid"
+      #                        if [ -n "$policy_type_id" ] && [ -n "$ric_id" ]; then
+      if [ $policy_type_id == "EMPTY" ]; then
+        policy_type_id=""
+      fi
+      targetJson=$targetJson"{ \"policyTypeId\": \"$policy_type_id\", \"nearRtRicId\": \"$ric_id\" }"
+      #                        fi
+    done
+
+    targetJson=$targetJson"]"
+
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 09 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 #########################################################
 #### Test case functions Health check
 #########################################################
 
 }
 
 #########################################################
 #### Test case functions Health check
 #########################################################
 

-# API Test function: GET /status and V2 GET /status
+# API Test function: GET /status and V2 GET /status or (v1/status for a1pmsV3)

 # args: <response-code>
 # (Function for test scripts)
 a1pms_api_get_status() {
 # args: <response-code>
 # (Function for test scripts)
 a1pms_api_get_status() {

-       __log_test_start $@
-    if [ $# -ne 1 ]; then
-               __print_err "<response-code>" $@
-               return 1
-       fi
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/status"
-       else
-               query="/status"
-       fi
-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 10 "GET" $A1PMS_API_PREFIX"/v2/status" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+  if [ $# -ne 1 ]; then
+    __print_err "<response-code>" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/status"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/status"
+  else
+    query="/status"
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 10 "GET" $A1PMS_API_PREFIX$query $status
+  __log_test_pass
+  return 0

 }
 
 # API Test function: GET /status (root) without api prefix
 # args: <response-code>
 # (Function for test scripts)
 a1pms_api_get_status_root() {
 }
 
 # API Test function: GET /status (root) without api prefix
 # args: <response-code>
 # (Function for test scripts)
 a1pms_api_get_status_root() {

-       __log_test_start $@
-    if [ $# -ne 1 ]; then
-               __print_err "<response-code>" $@
-               return 1
-       fi
-       query="/status"
-       TMP_PREFIX=$A1PMS_API_PREFIX
-       A1PMS_API_PREFIX=""
-    res="$(__do_curl_to_api A1PMS GET $query)"
-       A1PMS_API_PREFIX=$TMP_PREFIX
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 19 "GET" "/status" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+  if [ $# -ne 1 ]; then
+    __print_err "<response-code>" $@
+    return 1
+  fi
+  query="/status"
+  TMP_PREFIX=$A1PMS_API_PREFIX
+  A1PMS_API_PREFIX=""
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  A1PMS_API_PREFIX=$TMP_PREFIX
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 19 "GET" "/status" $status
+  __log_test_pass
+  return 0

 }
 
 #########################################################
 #### Test case functions RIC Repository
 #########################################################
 
 }
 
 #########################################################
 #### Test case functions RIC Repository
 #########################################################
 

-# API Test function: GET /ric and V2 GET /v2/rics/ric
+# API Test function: GET /ric, V2 GET /v2/rics/ric, and V3 GET a1policymanagement/v1/rics/ric

 # args: <reponse-code> <management-element-id> [<ric-id>]
 # (V2) args: <reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [<string-of-ricinfo>]
 # (V2) example of <string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4"
 # (V2) format of ric-info:  <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
 
 # args: <reponse-code> <management-element-id> [<ric-id>]
 # (V2) args: <reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [<string-of-ricinfo>]
 # (V2) example of <string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4"
 # (V2) format of ric-info:  <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
 

-

 # (Function for test scripts)
 a1pms_api_get_ric() {
 # (Function for test scripts)
 a1pms_api_get_ric() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               if [ $# -lt 3 ]; then
-                       __print_err "<reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [string-of-ricinfo>]" $@
-                       return 1
-               fi
-               search=""
-               if [ $2 != "NOME" ]; then
-                       search="?managed_element_id="$2
-               fi
-               if [ $3 != "NORIC" ]; then
-                       if [ -z $search ]; then
-                               search="?ric_id="$3
-                       else
-                               search=$search"&ric_id="$3
-                       fi
-               fi
-               query="/v2/rics/ric"$search
-
-               res="$(__do_curl_to_api A1PMS GET $query)"
-               status=${res:${#res}-3}
-
-               if [ $status -ne $1 ]; then
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               if [ $# -gt 3 ]; then
-                       body=${res:0:${#res}-3}
-                       res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V2" "$4" )
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_general "Could not create target ric info json"
-                               return 1
-                       fi
-
-                       targetJson=$(<./tmp/.tmp_rics.json)
-                       targetJson=${targetJson:1:${#targetJson}-2} #remove array brackets
-                       echo " TARGET JSON: $targetJson" >> $HTTPLOG
-                       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-                       if [ $res -ne 0 ]; then
-                               __log_test_fail_body
-                               return 1
-                       fi
-               fi
-       else
-               if [ $# -lt 2 ] || [ $# -gt 3 ]; then
-                       __print_err "<reponse-code> <management-element-id> [<ric-id>]" $@
-                       return 1
-               fi
-
-               query="/ric?managedElementId="$2
-
-               res="$(__do_curl_to_api A1PMS GET $query)"
-               status=${res:${#res}-3}
-
-               if [ $status -ne $1 ]; then
-                       __log_test_fail_status_code $1 $status
-                       return 1
-               fi
-
-               if [ $# -eq 3 ]; then
-                       body=${res:0:${#res}-3}
-                       if [ "$body" != "$3" ]; then
-                               __log_test_fail_body
-                               return 1
-                       fi
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 11 "GET" $A1PMS_API_PREFIX"/v2/rics/ric" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    if [ $# -lt 3 ]; then
+      __print_err "<reponse-code> <management-element-id>|NOME <ric-id>|<NORIC> [string-of-ricinfo>]" $@
+      return 1
+    fi
+    search=""
+    if [ $2 != "NOME" ]; then
+      search="?managed_element_id="$2
+    fi
+    if [ $3 != "NORIC" ]; then
+      if [ -z $search ]; then
+        search="?ric_id="$3
+      else
+        search=$search"&ric_id="$3
+      fi
+    fi
+    query="/v2/rics/ric"$search
+
+    res="$(__do_curl_to_api A1PMS GET $query)"
+    status=${res:${#res}-3}
+
+    if [ $status -ne $1 ]; then
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+
+    if [ $# -gt 3 ]; then
+      body=${res:0:${#res}-3}
+      res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V2" "$4")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_general "Could not create target ric info json"
+        return 1
+      fi
+
+      targetJson=$(<./tmp/.tmp_rics.json)
+      targetJson=${targetJson:1:${#targetJson}-2} #remove array brackets
+      echo " TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    if [ $# -lt 3 ]; then
+      __print_err "<reponseCode> <managementElementId>|NOME <ricId>|<NORIC> [stringOfRicInfo>]" $@
+      return 1
+    fi
+    search=""
+    if [ $2 != "NOME" ]; then
+      search="?managedElementId="$2
+    fi
+    if [ $3 != "NORIC" ]; then
+      if [ -z $search ]; then
+        search="?ricId="$3
+      else
+        search=$search"&ricId="$3
+      fi
+    fi
+    query="/v1/rics/ric"$search
+
+    res="$(__do_curl_to_api A1PMS GET $query)"
+    status=${res:${#res}-3}
+
+    if [ $status -ne $1 ]; then
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+
+    if [ $# -gt 3 ]; then
+      body=${res:0:${#res}-3}
+      res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "${A1PMS_VERSION}" "$4")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_general "Could not create target ric info json"
+        return 1
+      fi
+
+      targetJson=$(<./tmp/.tmp_rics.json)
+      targetJson=${targetJson:1:${#targetJson}-2} #remove array brackets
+      echo " TARGET JSON: $targetJson" >>$HTTPLOG
+      res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+      if [ $res -ne 0 ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  else
+    if [ $# -lt 2 ] || [ $# -gt 3 ]; then
+      __print_err "<reponseCode> <managedElementIds> [<ricId>]" $@
+      return 1
+    fi
+
+    query="/ric?managedElementId="$2
+
+    res="$(__do_curl_to_api A1PMS GET $query)"
+    status=${res:${#res}-3}
+
+    if [ $status -ne $1 ]; then
+      __log_test_fail_status_code $1 $status
+      return 1
+    fi
+
+    if [ $# -eq 3 ]; then
+      body=${res:0:${#res}-3}
+      if [ "$body" != "$3" ]; then
+        __log_test_fail_body
+        return 1
+      fi
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 11 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API test function: GET /rics and V2 GET /v2/rics
+# API test function: GET /rics, V2 GET /v2/rics, and V3 GET /a1policymanagement/v1/rics

 # args: <reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]
 # example of <space-separate-string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4 ricsim_g1_1:me2_........."
 # format of ric-info:  <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
 # (Function for test scripts)
 a1pms_api_get_rics() {
 # args: <reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]
 # example of <space-separate-string-of-ricinfo> = "ricsim_g1_1:me1_ricsim_g1_1,me2_ricsim_g1_1:1,2,4 ricsim_g1_1:me2_........."
 # format of ric-info:  <ric-id>:<list-of-mes>:<list-of-policy-type-ids>
 # (Function for test scripts)
 a1pms_api_get_rics() {

-       __log_test_start $@
+  __log_test_start $@

 
 

-    if [ $# -lt 2 ]; then
-               __print_err "<reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]" $@
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/rics"
-               if [ $2 != "NOTYPE" ]; then
-                       query="/v2/rics?policytype_id="$2
-               fi
-       else
-               query="/rics"
-               if [ $2 != "NOTYPE" ]; then
-                       query="/rics?policyType="$2
-               fi
-       fi
+  if [ $# -lt 2 ]; then
+    __print_err "<reponse-code> <policy-type-id>|NOTYPE [<space-separate-string-of-ricinfo>]" $@
+    return 1
+  fi

 
 

-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/rics"
+    if [ $2 != "NOTYPE" ]; then
+      query="/v2/rics?policytype_id="$2
+    fi
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/rics"
+    if [ $2 != "NOTYPE" ]; then
+      query=${query}"?policyTypeId="$2
+    fi
+  else
+    query="/rics"
+    if [ $2 != "NOTYPE" ]; then
+      query="/rics?policyType="$2
+    fi
+  fi
+
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 2 ]; then
+    body=${res:0:${#res}-3}
+    res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "${A1PMS_VERSION}" "$3")
+    if [ $res -ne 0 ]; then
+      __log_test_fail_general "Could not create target ric info json"
+      return 1
+    fi

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -gt 2 ]; then
-               body=${res:0:${#res}-3}
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V2" "$3" )
-               else
-                       res=$(python3 ../common/create_rics_json.py "./tmp/.tmp_rics.json" "V1" "$3" )
-               fi
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_general "Could not create target ric info json"
-                       return 1
-               fi
-
-               targetJson=$(<./tmp/.tmp_rics.json)
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson="{\"rics\": $targetJson }"
-               fi
-       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 12 "GET" $A1PMS_API_PREFIX"/v2/rics" $status
-       __log_test_pass
-       return 0
+    targetJson=$(<./tmp/.tmp_rics.json)
+    if [ "$A1PMS_VERSION" == "V2" ] || [ "$A1PMS_VERSION" == "V3" ]; then
+      targetJson="{\"rics\": $targetJson }"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi
+
+  __collect_endpoint_stats "A1PMS" 12 "GET" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 ##################################################################
 #### API Test case functions Service registry and supervision ####
 ##################################################################
 
 }
 
 ##################################################################
 #### API Test case functions Service registry and supervision ####
 ##################################################################
 

-# API test function: PUT /service and V2 PUT /service
+# API test function: PUT /service, V2 PUT /service and V3 PUT a1policymanagement/v1/services

 # args: <response-code>  <service-name> <keepalive-timeout> <callbackurl>
 # (Function for test scripts)
 a1pms_api_put_service() {
 # args: <response-code>  <service-name> <keepalive-timeout> <callbackurl>
 # (Function for test scripts)
 a1pms_api_put_service() {

-       __log_test_start $@
-    if [ $# -ne 4 ]; then
-        __print_err "<response-code>  <service-name> <keepalive-timeout> <callbackurl>" $@
-        return 1
-    fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/services"
-               json="{\"callback_url\": \""$4"\",\"keep_alive_interval_seconds\": \""$3"\",\"service_id\": \""$2"\"}"
-       else
-               query="/service"
-               json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceName\": \""$2"\"}"
-       fi
-    file="./tmp/.tmp.json"
-       echo "$json" > $file
-
-    res="$(__do_curl_to_api A1PMS PUT $query $file)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 13 "PUT" $A1PMS_API_PREFIX"/v2/service" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+  if [ $# -ne 4 ]; then
+    __print_err "<response-code>  <service-name> <keepalive-timeout> <callbackurl>" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/services"
+    json="{\"callback_url\": \""$4"\",\"keep_alive_interval_seconds\": \""$3"\",\"service_id\": \""$2"\"}"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/services"
+    json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceId\": \""$2"\"}"
+  else
+    query="/service"
+    json="{\"callbackUrl\": \""$4"\",\"keepAliveIntervalSeconds\": \""$3"\",\"serviceName\": \""$2"\"}"
+  fi
+  file="./tmp/.tmp.json"
+  echo "$json" >$file
+
+  res="$(__do_curl_to_api A1PMS PUT $query $file)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 13 "PUT" $A1PMS_API_PREFIX$query $status
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API test function: GET /services and V2 GET /v2/services
+# API test function: GET /services, V2 GET /v2/services and V3 /a1policymanagement/v1/services

 #args: <response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) | (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]
 # (Function for test scripts)
 a1pms_api_get_services() {
 #args: <response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) | (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]
 # (Function for test scripts)
 a1pms_api_get_services() {

-       __log_test_start $@
-       #Number of accepted parameters: 1, 2, 4, 7, 10, 13,...
-       paramError=1
-       if [ $# -eq 1 ]; then
-               paramError=0
-       elif [ $# -eq 2 ] && [ $2 != "NOSERVICE" ]; then
-               paramError=0
-       elif [ $# -eq 5 ]; then
-               paramError=0
-       elif [ $# -gt 5 ] && [ $2 == "NOSERVICE" ]; then
-               argLen=$(($#-2))
-               if [ $(($argLen%3)) -eq 0 ]; then
-                       paramError=0
-               fi
-       fi
+  __log_test_start $@
+  #Number of accepted parameters: 1, 2, 4, 7, 10, 13,...
+  paramError=1
+  if [ $# -eq 1 ]; then
+    paramError=0
+  elif [ $# -eq 2 ] && [ $2 != "NOSERVICE" ]; then
+    paramError=0
+  elif [ $# -eq 5 ]; then
+    paramError=0
+  elif [ $# -gt 5 ] && [ $2 == "NOSERVICE" ]; then
+    argLen=$(($# - 2))
+    if [ $(($argLen % 3)) -eq 0 ]; then
+      paramError=0
+    fi
+  fi

 
 

-    if [ $paramError -ne 0 ]; then
-               __print_err "<response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) | (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]" $@
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/services"
-
-               if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
-                       query="/v2/services?service_id="$2
-               fi
-       else
-               query="/services"
-
-               if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
-                       query="/services?name="$2
-               fi
-       fi
-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
+  if [ $paramError -ne 0 ]; then
+    __print_err "<response-code> [ (<query-service-name> <target-service-name> <keepalive-timeout> <callbackurl>) | (NOSERVICE <target-service-name> <keepalive-timeout> <callbackurl> [<target-service-name> <keepalive-timeout> <callbackurl>]* )]" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/services"
+    if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
+      query="/v2/services?service_id="$2
+    fi
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/services"
+    if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
+      query="/v1/services?serviceId="$2
+    fi
+  else
+    query="/services"
+
+    if [ $# -gt 1 ] && [ $2 != "NOSERVICE" ]; then
+      query="/services?name="$2
+    fi
+  fi
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -gt 2 ]; then
+    variableArgCount=$(($# - 2))
+    body=${res:0:${#res}-3}
+    targetJson="["
+    shift
+    shift
+    cntr=0
+    while [ $cntr -lt $variableArgCount ]; do
+      servicename=$1
+      shift
+      timeout=$1
+      shift
+      callback=$1
+      shift
+      if [ $cntr -gt 0 ]; then
+        targetJson=$targetJson","
+      fi
+      # timeSinceLastActivitySeconds value cannot be checked since value varies
+      if [ "$A1PMS_VERSION" == "V2" ]; then
+        targetJson=$targetJson"{\"service_id\": \""$servicename"\",\"keep_alive_interval_seconds\": "$timeout",\"time_since_last_activity_seconds\":\"????\",\"callback_url\": \""$callback"\"}"
+      elif [ "$A1PMS_VERSION" == "V3" ]; then
+        targetJson=$targetJson"{\"serviceId\": \""$servicename"\",\"keepAliveIntervalSeconds\": "$timeout",\"timeSinceLastActivitySeconds\":\"????\",\"callbackUrl\": \""$callback"\"}"
+      else
+        targetJson=$targetJson"{\"serviceName\": \""$servicename"\",\"keepAliveIntervalSeconds\": "$timeout",\"timeSinceLastActivitySeconds\":\"????\",\"callbackUrl\": \""$callback"\"}"
+      fi
+      let cntr=cntr+3
+    done
+    targetJson=$targetJson"]"
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson="{\"service_list\": $targetJson }"
+      URL_for_Collect_End_Point="/v2/services"
+    elif [ "$A1PMS_VERSION" == "V3" ]; then
+      targetJson="{\"serviceList\": $targetJson }"
+      URL_for_Collect_End_Point="/v1/services"
+    fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1
+    fi
+  fi

 
 

-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -gt 2 ]; then
-               variableArgCount=$(($#-2))
-               body=${res:0:${#res}-3}
-       targetJson="["
-               shift; shift;
-               cntr=0
-               while [ $cntr -lt $variableArgCount ]; do
-                       servicename=$1; shift;
-                       timeout=$1; shift;
-                       callback=$1; shift;
-                       if [ $cntr -gt 0 ]; then
-                               targetJson=$targetJson","
-                       fi
-                       # timeSinceLastActivitySeconds value cannot be checked since value varies
-                       if [ "$A1PMS_VERSION" == "V2" ]; then
-                               targetJson=$targetJson"{\"service_id\": \""$servicename"\",\"keep_alive_interval_seconds\": "$timeout",\"time_since_last_activity_seconds\":\"????\",\"callback_url\": \""$callback"\"}"
-                       else
-                               targetJson=$targetJson"{\"serviceName\": \""$servicename"\",\"keepAliveIntervalSeconds\": "$timeout",\"timeSinceLastActivitySeconds\":\"????\",\"callbackUrl\": \""$callback"\"}"
-                       fi
-                       let cntr=cntr+3
-               done
-               targetJson=$targetJson"]"
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson="{\"service_list\": $targetJson }"
-               fi
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 14 "GET" $A1PMS_API_PREFIX"/v2/services" $status
-       __log_test_pass
-       return 0
+  __collect_endpoint_stats "A1PMS" 14 "GET" $A1PMS_API_PREFIX$URL_for_Collect_End_Point $status
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API test function: GET /services V2 GET /v2/services -  (only checking service names)
+# API test function: GET /services, V2 GET /v2/services and V3 /a1policymanagement/v1/services -  (only checking service names)

 # args: <response-code> [<service-name>]*"
 # (Function for test scripts)
 a1pms_api_get_service_ids() {
 # args: <response-code> [<service-name>]*"
 # (Function for test scripts)
 a1pms_api_get_service_ids() {

-       __log_test_start $@
-
-    if [ $# -lt 1 ]; then
-               __print_err "<response-code> [<service-name>]*" $@
-               return 1
-       fi
-
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-           query="/v2/services"
-       else
-       query="/services"
-       fi
-    res="$(__do_curl_to_api A1PMS GET $query)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       body=${res:0:${#res}-3}
-       targetJson="["
-       for rapp in ${@:2} ; do
-               if [ "$targetJson" != "[" ]; then
-                       targetJson=$targetJson","
-               fi
-               if [ "$A1PMS_VERSION" == "V2" ]; then
-                       targetJson=$targetJson"{\"callback_url\":\"????\",\"keep_alive_interval_seconds\":\"????\",\"service_id\":\""$rapp"\",\"time_since_last_activity_seconds\":\"????\"}"
-               else
-                       targetJson=$targetJson"{\"callbackUrl\":\"????\",\"keepAliveIntervalSeconds\":\"????\",\"serviceName\":\""$rapp"\",\"timeSinceLastActivitySeconds\":\"????\"}"
-               fi
-       done
-
-       targetJson=$targetJson"]"
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               targetJson="{\"service_list\": $targetJson }"
-       fi
-       echo "TARGET JSON: $targetJson" >> $HTTPLOG
-       res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-       if [ $res -ne 0 ]; then
-               __log_test_fail_body
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 14 "GET" $A1PMS_API_PREFIX"/v2/services" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ $# -lt 1 ]; then
+    __print_err "<response-code> [<service-name>]*" $@
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/services"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/services"
+  else
+    query="/services"
+  fi
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  body=${res:0:${#res}-3}
+  targetJson="["
+  for rapp in ${@:2}; do
+    if [ "$targetJson" != "[" ]; then
+      targetJson=$targetJson","
+    fi
+    if [ "$A1PMS_VERSION" == "V2" ]; then
+      targetJson=$targetJson"{\"callback_url\":\"????\",\"keep_alive_interval_seconds\":\"????\",\"service_id\":\""$rapp"\",\"time_since_last_activity_seconds\":\"????\"}"
+    elif [ "$A1PMS_VERSION" == "V3" ]; then
+      targetJson=$targetJson"{\"callbackUrl\":\"????\",\"keepAliveIntervalSeconds\":\"????\",\"serviceId\":\""$rapp"\",\"timeSinceLastActivitySeconds\":\"????\"}"
+    else
+      targetJson=$targetJson"{\"callbackUrl\":\"????\",\"keepAliveIntervalSeconds\":\"????\",\"serviceName\":\""$rapp"\",\"timeSinceLastActivitySeconds\":\"????\"}"
+    fi
+  done
+
+  targetJson=$targetJson"]"
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    targetJson="{\"service_list\": $targetJson }"
+    URL_for_Collect_End_Point="/v2/services"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    targetJson="{\"serviceList\": $targetJson }"
+    URL_for_Collect_End_Point="/v1/services"
+  fi
+  echo "TARGET JSON: $targetJson" >>$HTTPLOG
+  res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+  if [ $res -ne 0 ]; then
+    __log_test_fail_body
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 14 "GET" $A1PMS_API_PREFIX$URL_for_Collect_End_Point $status
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API test function: DELETE /services and V2 DELETE /v2/services/{serviceId}
+# API test function: DELETE /services, V2 DELETE /v2/services/{serviceId} and V3 DELETE a1policymanagement/v1/services/{serviceId}

 # args: <response-code> <service-name>
 # (Function for test scripts)
 a1pms_api_delete_services() {
 # args: <response-code> <service-name>
 # (Function for test scripts)
 a1pms_api_delete_services() {

-       __log_test_start $@
-
-    if [ $# -ne 2 ]; then
-               __print_err "<response-code> <service-name>" $@
-               return 1
-       fi
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/services/"$2
-       else
-               query="/services?name="$2
-       fi
-    res="$(__do_curl_to_api A1PMS DELETE $query)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 15 "DELETE" $A1PMS_API_PREFIX"/v2/services/{serviceId}" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ $# -ne 2 ]; then
+    __print_err "<response-code> <service-name>" $@
+    return 1
+  fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    url_part="/v2/services/"
+    query=${url_part}${2}
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    url_part="/v1/services/"
+    query=${url_part}${2}
+  else
+    query="/services?name="$2
+  fi
+  res="$(__do_curl_to_api A1PMS DELETE $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 15 "DELETE" ${A1PMS_API_PREFIX}${url_part}"{serviceId}" $status
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API test function: PUT /services/keepalive and V2 PUT /v2/services/{service_id}/keepalive
+# API test function: PUT /services/keepalive, V2 PUT /v2/services/{service_id}/keepalive and V3 DELETE a1policymanagement/v1/services/{serviceId}

 # args: <response-code> <service-name>
 # (Function for test scripts)
 a1pms_api_put_services_keepalive() {
 # args: <response-code> <service-name>
 # (Function for test scripts)
 a1pms_api_put_services_keepalive() {

-       __log_test_start $@
-
-    if [ $# -ne 2 ]; then
-               __print_err "<response-code> <service-name>" $@
-               return 1
-       fi
-       if [ "$A1PMS_VERSION" == "V2" ]; then
-               query="/v2/services/$2/keepalive"
-       else
-       query="/services/keepalive?name="$2
-       fi
-
-    res="$(__do_curl_to_api A1PMS PUT $query)"
-    status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 16 "PUT" $A1PMS_API_PREFIX"/v2/services/{service_id}/keepalive" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ $# -ne 2 ]; then
+    __print_err "<response-code> <service-name>" $@
+    return 1
+  fi
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/services/$2/keepalive"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    query="/v1/services/$2/keepalive"
+  else
+    query="/services/keepalive?name="$2
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    empty_json_body={}
+    res="$(__do_curl_to_api A1PMS PUT ${query} ${empty_json_body})"
+  else
+    res="$(__do_curl_to_api A1PMS PUT ${query})"
+  fi
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code ${1} ${status}
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 16 "PUT" ${A1PMS_API_PREFIX}${query} ${status}
+  __log_test_pass
+  return 0

 }
 
 ##################################################################
 #### API Test case functions Configuration                    ####
 ##################################################################
 
 }
 
 ##################################################################
 #### API Test case functions Configuration                    ####
 ##################################################################
 

-# API Test function: PUT /v2/configuration
+# API Test function: PUT "/v2/configuration" or V3 PUT "a1policymanagement/v1/configuration"

 # args: <response-code> <config-file>
 # (Function for test scripts)
 a1pms_api_put_configuration() {
 # args: <response-code> <config-file>
 # (Function for test scripts)
 a1pms_api_put_configuration() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" != "V2" ]; then
-               __log_test_fail_not_supported
-               return 1
-       fi
-
-    if [ $# -ne 2 ]; then
-        __print_err "<response-code> <config-file>" $@
-        return 1
-    fi
-       if [ ! -f $2 ]; then
-               __log_test_fail_general "Config file "$2", does not exist"
-               return 1
-       fi
-       inputJson=$(< $2)
-       # if [ $RUNMODE == "DOCKER" ]; then  #In kube the file already has a header
-       #       inputJson="{\"config\":"$inputJson"}"
-       # fi
-       file="./tmp/.config.json"
-       echo $inputJson > $file
-       query="/v2/configuration"
-       res="$(__do_curl_to_api A1PMS PUT $query $file)"
-       status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       __collect_endpoint_stats "A1PMS" 17 "PUT" $A1PMS_API_PREFIX"/v2/configuration" $status
-       __log_test_pass
-       return 0
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" != "V2" ] && [ "$A1PMS_VERSION" != "V3" ]; then
+    __log_test_fail_not_supported
+    return 1
+  fi
+
+  if [ $# -ne 2 ]; then
+    __print_err "<response-code> <config-file>" $@
+    return 1
+  fi
+  if [ ! -f $2 ]; then
+    __log_test_fail_general "Config file "$2", does not exist"
+    return 1
+  fi
+  inputJson=$(<$2)
+  # if [ $RUNMODE == "DOCKER" ]; then  #In kube the file already has a header
+  #    inputJson="{\"config\":"$inputJson"}"
+  # fi
+  file="./tmp/.config.json"
+  echo $inputJson >$file
+  if [ "$A1PMS_VERSION" == "V2" ]; then
+    query="/v2/configuration"
+  elif [ "$A1PMS_VERSION" == "V3" ]; then
+    #V3 has baseurl changes 'a1-policy/v2' to 'a1policymanagement/v1'
+    query="/v1/configuration"
+  fi
+  res="$(__do_curl_to_api A1PMS PUT $query $file)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  __collect_endpoint_stats "A1PMS" 17 "PUT" $A1PMS_API_PREFIX$query $status
+  __log_test_pass
+  return 0

 }
 
 }
 

-# API Test function: GET /v2/configuration
+# API Test function: GET /v2/configuration and V3 GET a1policymanagement/v1/configuration

 # args: <response-code> [<config-file>]
 # (Function for test scripts)
 a1pms_api_get_configuration() {
 # args: <response-code> [<config-file>]
 # (Function for test scripts)
 a1pms_api_get_configuration() {

-       __log_test_start $@
-
-       if [ "$A1PMS_VERSION" != "V2" ]; then
-               __log_test_fail_not_supported
-               return 1
-       fi
-
-    if [ $# -lt 1 ] || [ $# -gt 2 ]; then
-        __print_err "<response-code> [<config-file>]" $@
-        return 1
+  __log_test_start $@
+
+  if [ "$A1PMS_VERSION" != "V2" ] && [ "$A1PMS_VERSION" != "V3" ]; then
+    __log_test_fail_not_supported
+    return 1
+  fi
+
+  if [ $# -lt 1 ] || [ $# -gt 2 ]; then
+    __print_err "<response-code> [<config-file>]" $@
+    return 1
+  fi
+  if [ ! -f $2 ]; then
+    __log_test_fail_general "Config file "$2" for comparison, does not exist"
+    return 1
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    #The V3 of a1-pms URL is a1policymanagement/v1 and the v2 is a1-policy/v2
+    query="/v1/configuration"
+  else
+    query="/v2/configuration"
+  fi
+  res="$(__do_curl_to_api A1PMS GET $query)"
+  status=${res:${#res}-3}
+
+  if [ $status -ne $1 ]; then
+    __log_test_fail_status_code $1 $status
+    return 1
+  fi
+
+  if [ $# -eq 2 ]; then
+
+    body=${res:0:${#res}-3}
+
+    targetJson=$(<$2)
+    # if [ $RUNMODE == "DOCKER" ]; then  #In kube the file already has a header
+    #  inputJson="{\"config\":"$inputJson"}"
+    # fi
+    echo "TARGET JSON: $targetJson" >>$HTTPLOG
+    res=$(python3 ../common/compare_json.py "$targetJson" "$body")
+
+    if [ $res -ne 0 ]; then
+      __log_test_fail_body
+      return 1

     fi
     fi

-       if [ ! -f $2 ]; then
-               __log_test_fail_general "Config file "$2" for comparison, does not exist"
-               return 1
-       fi
-
-       query="/v2/configuration"
-       res="$(__do_curl_to_api A1PMS GET $query)"
-       status=${res:${#res}-3}
-
-       if [ $status -ne $1 ]; then
-               __log_test_fail_status_code $1 $status
-               return 1
-       fi
-
-       if [ $# -eq 2 ]; then
-
-               body=${res:0:${#res}-3}
-
-               targetJson=$(< $2)
-               # if [ $RUNMODE == "DOCKER" ]; then  #In kube the file already has a header
-               #       inputJson="{\"config\":"$inputJson"}"
-               # fi
-               echo "TARGET JSON: $targetJson" >> $HTTPLOG
-               res=$(python3 ../common/compare_json.py "$targetJson" "$body")
-
-               if [ $res -ne 0 ]; then
-                       __log_test_fail_body
-                       return 1
-               fi
-       fi
-
-       __collect_endpoint_stats "A1PMS" 18 "GET" $A1PMS_API_PREFIX"/v2/configuration" $status
-       __log_test_pass
-       return 0
+  fi
+
+  if [ "$A1PMS_VERSION" == "V3" ]; then
+    __collect_endpoint_stats "A1PMS" 18 "GET" $A1PMS_API_PREFIX"/v1/configuration" $status
+  else
+    __collect_endpoint_stats "A1PMS" 18 "GET" $A1PMS_API_PREFIX"/v2/configuration" $status
+  fi
+  __log_test_pass
+  return 0

 }
 
 ##########################################
 }
 
 ##########################################


@@ -2482,28 +3206,28 @@ a1pms_api_get_configuration() {
 # (Function for test scripts)
 
 a1pms_kube_pvc_reset() {
 # (Function for test scripts)
 
 a1pms_kube_pvc_reset() {

-       __log_test_start $@
+  __log_test_start $@

 
 

-       pvc_name=$(kubectl $KUBECONF get pvc -n $KUBE_NONRTRIC_NAMESPACE  --no-headers -o custom-columns=":metadata.name" | grep policy)
-       if [ -z "$pvc_name" ]; then
-               pvc_name=policymanagementservice-vardata-pvc
-       fi
-       echo " Trying to reset pvc: "$pvc_name
-       __kube_clean_pvc $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $A1PMS_CONTAINER_MNT_DIR
+  pvc_name=$(kubectl $KUBECONF get pvc -n $KUBE_NONRTRIC_NAMESPACE --no-headers -o custom-columns=":metadata.name" | grep policy)
+  if [ -z "$pvc_name" ]; then
+    pvc_name=policymanagementservice-vardata-pvc
+  fi
+  echo " Trying to reset pvc: "$pvc_name
+  __kube_clean_pvc $A1PMS_APP_NAME $KUBE_NONRTRIC_NAMESPACE $pvc_name $A1PMS_CONTAINER_MNT_DIR

 
 

-       __log_test_pass
-       return 0
+  __log_test_pass
+  return 0

 }
 
 # args: <realm> <client-name> <client-secret>
 a1pms_configure_sec() {
 }
 
 # args: <realm> <client-name> <client-secret>
 a1pms_configure_sec() {

-       export A1PMS_CREDS_GRANT_TYPE="client_credentials"
-       export A1PMS_CREDS_CLIENT_SECRET=$3
-       export A1PMS_CREDS_CLIENT_ID=$2
-       export A1PMS_AUTH_SERVICE_URL=$KEYCLOAK_SERVICE_PATH$KEYCLOAK_TOKEN_URL_PREFIX/$1/protocol/openid-connect/token
-       export A1PMS_SIDECAR_MOUNT="/token-cache"
-       export A1PMS_SIDECAR_JWT_FILE=$A1PMS_SIDECAR_MOUNT"/jwt.txt"
-
-       export AUTHSIDECAR_APP_NAME
-       export AUTHSIDECAR_DISPLAY_NAME
-}
\ No newline at end of file
+  export A1PMS_CREDS_GRANT_TYPE="client_credentials"
+  export A1PMS_CREDS_CLIENT_SECRET=$3
+  export A1PMS_CREDS_CLIENT_ID=$2
+  export A1PMS_AUTH_SERVICE_URL=$KEYCLOAK_SERVICE_PATH$KEYCLOAK_TOKEN_URL_PREFIX/$1/protocol/openid-connect/token
+  export A1PMS_SIDECAR_MOUNT="/token-cache"
+  export A1PMS_SIDECAR_JWT_FILE=$A1PMS_SIDECAR_MOUNT"/jwt.txt"
+
+  export AUTHSIDECAR_APP_NAME
+  export AUTHSIDECAR_DISPLAY_NAME
+}

diff --git a/test/common/cr_api_functions.sh b/test/common/cr_api_functions.sh
index 4fad4c4..e7d1ba7 100644 (file)
--- a/test/common/cr_api_functions.sh
+++ b/test/common/cr_api_functions.sh
@@ -444,7 +444,7 @@ cr_delay_callback() {
 cr_api_check_all_sync_events() {
        __log_test_start $@
 
 cr_api_check_all_sync_events() {
        __log_test_start $@
 

-       if [ "$A1PMS_VERSION" != "V2" ]; then
+       if [ "$A1PMS_VERSION" != "V2" ] && [ "$A1PMS_VERSION" != "V3" ]; then

                __log_test_fail_not_supported
                return 1
        fi
                __log_test_fail_not_supported
                return 1
        fi

diff --git a/test/common/create_policies_process.py b/test/common/create_policies_process.py
index 480d5cb..d81ec74 100644 (file)
--- a/test/common/create_policies_process.py
+++ b/test/common/create_policies_process.py
@@ -47,7 +47,7 @@ try:
     uuid=str(sys.argv[5])
     start=int(sys.argv[6])
     httpproxy="NOPROXY"
     uuid=str(sys.argv[5])
     start=int(sys.argv[6])
     httpproxy="NOPROXY"

-    if ("/v2/" in baseurl):
+    if ("/v2/" in baseurl) or ("a1policymanagement/v1/" in baseurl):

         if len(sys.argv) != 16:
             print("1Expected 15 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics uuid startid service type transient notification-url templatepath count pids pid_id proxy")
             print (sys.argv[1:])
         if len(sys.argv) != 16:
             print("1Expected 15 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics uuid startid service type transient notification-url templatepath count pids pid_id proxy")
             print (sys.argv[1:])


@@ -116,20 +116,45 @@ try:
                                 data["policytype_id"]=pt
                             else:
                                 data["policytype_id"]=""
                                 data["policytype_id"]=pt
                             else:
                                 data["policytype_id"]=""

-                            if (noti != "NOURL"):
-                                data["status_notification_uri"]=noti

                             data["policy_data"]=json.loads(payload)
 
                             url_out=url
                             data_out=json.dumps(data)
                             data["policy_data"]=json.loads(payload)
 
                             url_out=url
                             data_out=json.dumps(data)

+                            if proxydict is None:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
+
+                        elif ("a1policymanagement/v1/" in baseurl):
+                            url=baseurl
+
+                            data={}
+                            data["nearRtRicId"]=ric
+                            data["serviceId"]=serv
+                            if (trans != "NOTRANSIENT"):
+                                data["transient"]=trans
+                            if (pt != "NOTYPE"):
+                                data["policyTypeId"]=pt
+                            else:
+                                data["policyTypeId"]=""
+                            if (noti != "NOURL"):
+                                data["statusNotificationUri"]=noti
+                            data["policyObject"]=json.loads(payload)
+
+                            url_out=url
+                            data_out=json.dumps(data)
+                            if proxydict is None:
+                                resp=requests.post(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.post(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)

                         else:
                             url=baseurl+"&id="+uuid+str(i)+"&ric="+str(ric)
                             url_out=url
                             data_out=json.dumps(json.loads(payload))
                         else:
                             url=baseurl+"&id="+uuid+str(i)+"&ric="+str(ric)
                             url_out=url
                             data_out=json.dumps(json.loads(payload))

-                        if proxydict is None:
-                            resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
-                        else:
-                            resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)
+                            if proxydict is None:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.put(url, data_out, headers=headers, verify=False, timeout=90, proxies=proxydict)

                         connect_ok=True
                     except Exception as e1:
                         if (retry_cnt > 1):
                         connect_ok=True
                     except Exception as e1:
                         if (retry_cnt > 1):

diff --git a/test/common/create_rics_json.py b/test/common/create_rics_json.py
index 5f2fe69..9edd31c 100644 (file)
--- a/test/common/create_rics_json.py
+++ b/test/common/create_rics_json.py
@@ -42,6 +42,11 @@ try:
         param_me='managed_element_ids'
         param_policy_type='policytype_ids'
         param_state='state'
         param_me='managed_element_ids'
         param_policy_type='policytype_ids'
         param_state='state'

+    elif (api_version == "V3"):
+        param_ric='ricId'
+        param_me='managedElementIds'
+        param_policy_type='policyTypeIds'
+        param_state='state'

     else:
         param_ric='ricName'
         param_me='managedElementIds'
     else:
         param_ric='ricName'
         param_me='managedElementIds'

diff --git a/test/common/delete_policies_process_v3.py b/test/common/delete_policies_process_v3.py
new file mode 100644 (file)
index 0000000..82b37db
--- /dev/null
+++ b/test/common/delete_policies_process_v3.py
@@ -0,0 +1,100 @@
+#  ============LICENSE_START===============================================
+#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+#  ========================================================================
+#  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
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+#  ============LICENSE_END=================================================
+#
+
+# This script delete policies spread over a number rics
+# Intended for parallel processing
+# Returns a string with result, either "0" for ok, or "1<fault description>"
+
+import sys
+import requests
+import traceback
+from time import sleep
+
+# disable warning about unverified https requests
+from requests.packages import urllib3
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+#arg responsecode baseurl num_rics uuid startid count pids pid_id proxy
+
+try:
+    if len(sys.argv) != 8:
+        print("1Expected 7 args, got "+str(len(sys.argv)-1)+ ". Args: responseCode baseurl policyIdsFilePath startId pids pidID proxy")
+        sys.exit()
+
+    responseCode=int(sys.argv[1])
+    baseurl=str(sys.argv[2])
+    policyIdsFilePath=str(sys.argv[3])
+    startId=int(sys.argv[4])
+    pids=int(sys.argv[5])
+    pidId=int(sys.argv[6])
+    httpproxy=str(sys.argv[7])
+
+    proxydict=None
+    if httpproxy != "NOPROXY":
+        proxydict = {
+            "http" : httpproxy,
+            "https" : httpproxy
+        }
+
+    http_retry_count=0
+    connect_retry_count=0
+
+    with open(str(policyIdsFilePath)) as file:
+        for policyId in file:
+            if startId%pids == (pidId - 1):
+                connect_ok=False
+                retry_cnt=5
+                while(retry_cnt>0):
+                    url=str(baseurl+policyId.strip())
+                    try:
+                        if proxydict is None:
+                            resp=requests.delete(url, verify=False, timeout=90)
+                        else:
+                            resp=requests.delete(url, verify=False, timeout=90, proxies=proxydict)
+                        connect_ok=True
+                    except Exception as e1:
+                        if (retry_cnt > 1):
+                            sleep(0.1)
+                            retry_cnt -= 1
+                            connect_retry_count += 1
+                        else:
+                            print("1DELETE failed for id:"+policyId.strip()+ ", "+str(e1) + " "+traceback.format_exc())
+                            sys.exit()
+
+                    if (connect_ok == True):
+                        if (resp.status_code == None):
+                            print("1DELETE failed for id:"+policyId.strip()+ ", expected response code: "+str(responseCode)+", got: None")
+                            sys.exit()
+                        if (resp.status_code != responseCode):
+                            if (resp.status_code >= 500) and (http_retry_count < 600 ) and (retry_cnt > 1):
+                                sleep(0.1)
+                                retry_cnt -= 1
+                                http_retry_count += 1
+                            else:
+                                print("1DELETE failed for id:"+policyId.strip()+ ", expected response code: "+str(responseCode)+", got: "+str(resp.status_code)+str(resp.raw))
+                                sys.exit()
+                        else:
+                            retry_cnt=-1
+            startId  += 1
+    print("0 http retries:"+str(http_retry_count) + ", connect retries: "+str(connect_retry_count))
+    sys.exit()
+
+except Exception as e:
+    print("1"+str(e))
+    traceback.print_exc()
+sys.exit()
\ No newline at end of file

diff --git a/test/common/get_policies_process_v3.py b/test/common/get_policies_process_v3.py
new file mode 100644 (file)
index 0000000..b62adf5
--- /dev/null
+++ b/test/common/get_policies_process_v3.py
@@ -0,0 +1,101 @@
+#  ============LICENSE_START===============================================
+#  Copyright (C) 2020-2023 Nordix Foundation. All rights reserved.
+#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+#  ========================================================================
+#  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
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+#  ============LICENSE_END=================================================
+#
+
+# This script gets policies spread over a number rics
+# Intended for parallel processing
+# Returns a string with result, either "0" for ok, or "1<fault description>"
+
+import sys
+import requests
+import traceback
+from time import sleep
+
+# disable warning about unverified https requests
+from requests.packages import urllib3
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+#arg responseCode baseurl policyIdsFilePath proxy
+
+try:
+    if len(sys.argv) != 8:
+        print("1Expected 7 args, got "+str(len(sys.argv)-1)+ ". Args: responseCode baseurl policyIdsFilePath startId pids pidID proxy")
+        sys.exit()
+
+    responseCode=int(sys.argv[1])
+    baseurl=str(sys.argv[2])
+    policyIdsFilePath=str(sys.argv[3])
+    startId=int(sys.argv[4])
+    pids=int(sys.argv[5])
+    pidId=int(sys.argv[6])
+    httpproxy=str(sys.argv[7])
+
+    proxydict=None
+    if httpproxy != "NOPROXY":
+        proxydict = {
+            "http" : httpproxy,
+            "https" : httpproxy
+        }
+
+    http_retry_count=0
+    connect_retry_count=0
+
+    with open(str(policyIdsFilePath)) as file:
+        for policyId in file:
+            if startId%pids == (pidId - 1):
+                connect_ok=False
+                retry_cnt=5
+                while(retry_cnt>0):
+                    url=str(baseurl+policyId.strip())
+                    try:
+                        if proxydict is None:
+                            resp=requests.get(url, verify=False, timeout=90)
+                        else:
+                            resp=requests.get(url, verify=False, timeout=90, proxies=proxydict)
+                        connect_ok=True
+                    except Exception as e1:
+                        if (retry_cnt > 1):
+                            sleep(0.1)
+                            retry_cnt -= 1
+                            connect_retry_count += 1
+                        else:
+                            print("1Get failed for id:"+policyId.strip()+ ", "+str(e1) + " "+traceback.format_exc())
+                            sys.exit()
+
+                    if (connect_ok == True):
+                        if (resp.status_code == None):
+                            print("1Get failed for id:"+policyId.strip()+ ", expected response code: "+str(responseCode)+", got: None")
+                            sys.exit()
+                        if (resp.status_code != responseCode):
+                            if (resp.status_code >= 500) and (http_retry_count < 600 ) and (retry_cnt > 1):
+                                sleep(0.1)
+                                retry_cnt -= 1
+                                http_retry_count += 1
+                            else:
+                                print("1Get failed for id:"+policyId.strip()+ ", expected response code: "+str(responseCode)+", got: "+str(resp.status_code)+str(resp.raw))
+                                sys.exit()
+                        else:
+                            retry_cnt=-1
+            startId  += 1
+    print("0 http retries:"+str(http_retry_count) + ", connect retries: "+str(connect_retry_count))
+    sys.exit()
+
+except Exception as e:
+    print("1"+str(e))
+    traceback.print_exc()
+sys.exit()
\ No newline at end of file

diff --git a/test/common/sdnc_api_functions.sh b/test/common/sdnc_api_functions.sh
index 4fd9de4..a18afe3 100644 (file)
--- a/test/common/sdnc_api_functions.sh
+++ b/test/common/sdnc_api_functions.sh
@@ -588,8 +588,14 @@ controller_api_get_A1_policy_status() {
     if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
         url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5/status"
         if [ $# -gt 5 ]; then
     if [ $# -ge 5 ] && [ $2 == "OSC" ]; then
         url="$ric_id/a1-p/policytypes/$4/policies/$UUID$5/status"
         if [ $# -gt 5 ]; then

-            targetJson="{\"enforceStatus\":\"$6\""
-            targetJson=$targetJson",\"enforceReason\":\"$7\"}"
+            if [[ $TEST_ENV_PROFILE =~ ^ORAN-[A-H] ]] || [[ $TEST_ENV_PROFILE =~ ^ONAP-[A-L] ]]; then
+              targetJson="{\"instance_status\":\"$6\""
+              targetJson=$targetJson",\"has_been_deleted\":\"$7\""
+              targetJson=$targetJson",\"created_at\":\"????\"}"
+            else
+              targetJson="{\"enforceStatus\":\"$6\""
+              targetJson=$targetJson",\"enforceReason\":\"$7\"}"
+            fi

         fi
                paramError=0
     elif [ $# -ge 4 ] && [ $2 == "STD" ]; then
         fi
                paramError=0
     elif [ $# -ge 4 ] && [ $2 == "STD" ]; then

diff --git a/test/common/test_env-onap-montreal.sh b/test/common/test_env-onap-montreal.sh
index 450f370..6970eb4 100644 (file)
--- a/test/common/test_env-onap-montreal.sh
+++ b/test/common/test_env-onap-montreal.sh
@@ -186,7 +186,10 @@ A1PMS_EXTERNAL_SECURE_PORT=8433                            # A1PMS container ext
 A1PMS_INTERNAL_SECURE_PORT=8433                            # A1PMS container internal secure port (container -> container)
 A1PMS_APIS="V1 V2"                                         # Supported northbound api versions
 A1PMS_VERSION="V2"                                         # Tested version of northbound API
 A1PMS_INTERNAL_SECURE_PORT=8433                            # A1PMS container internal secure port (container -> container)
 A1PMS_APIS="V1 V2"                                         # Supported northbound api versions
 A1PMS_VERSION="V2"                                         # Tested version of northbound API

+# A1PMS_V3="V3"                                            # To be used this property in further env releases

 A1PMS_API_PREFIX="/a1-policy"                              # api url prefix, only for V2. Shall contain leading "/"
 A1PMS_API_PREFIX="/a1-policy"                              # api url prefix, only for V2. Shall contain leading "/"

+# A1PMS_API_PREFIX_V3="/a1policymanagement"                # To be used this property in further env releases
+# A1PMS_V3_FLAG="true"                                       # To be used this property in further env releases

 
 A1PMS_APP_NAME="policymanagementservice"                   # Name for A1PMS container
 A1PMS_DISPLAY_NAME="Policy Management Service"
 
 A1PMS_APP_NAME="policymanagementservice"                   # Name for A1PMS container
 A1PMS_DISPLAY_NAME="Policy Management Service"


@@ -197,6 +200,7 @@ A1PMS_CONFIG_KEY="policy-agent"                            # Key for consul conf
 A1PMS_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice"  # Java base package name
 A1PMS_ACTUATOR="/actuator/loggers/$A1PMS_PKG_NAME"           # Url for trace/debug
 A1PMS_ALIVE_URL="$A1PMS_API_PREFIX/v2/status"                # Base path for alive check
 A1PMS_PKG_NAME="org.onap.ccsdk.oran.a1policymanagementservice"  # Java base package name
 A1PMS_ACTUATOR="/actuator/loggers/$A1PMS_PKG_NAME"           # Url for trace/debug
 A1PMS_ALIVE_URL="$A1PMS_API_PREFIX/v2/status"                # Base path for alive check

+# A1PMS_ALIVE_URL_V3=/v1/status                            # To be used this property in further env releases

 A1PMS_COMPOSE_DIR="a1pms"                                    # Dir in simulator_group for docker-compose
 A1PMS_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config"     # Path in container for config file
 A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data"         # Path in container for data file
 A1PMS_COMPOSE_DIR="a1pms"                                    # Dir in simulator_group for docker-compose
 A1PMS_CONFIG_MOUNT_PATH="/opt/app/policy-agent/config"     # Path in container for config file
 A1PMS_DATA_MOUNT_PATH="/opt/app/policy-agent/data"         # Path in container for data file

diff --git a/test/common/testcase_common.sh b/test/common/testcase_common.sh
index 3f5970c..336bd8f 100755 (executable)
--- a/test/common/testcase_common.sh
+++ b/test/common/testcase_common.sh
@@ -2863,15 +2863,15 @@ clean_environment() {
        if [ $RUNMODE == "KUBE" ]; then
                __clean_kube
                if [ $PRE_CLEAN -eq 1 ]; then
        if [ $RUNMODE == "KUBE" ]; then
                __clean_kube
                if [ $PRE_CLEAN -eq 1 ]; then

-                       echo " Cleaning docker resouces to free up resources, may take time..."
-                       ../common/clean_docker.sh 2>&1 > /dev/null
+                       echo " Cleaning kubernetes resources to free up resources, may take time..."
+                       ../common/clean_kube.sh $KUBECONF 2>&1 > /dev/null

                        echo ""
                fi
        else
                __clean_containers
                if [ $PRE_CLEAN -eq 1 ]; then
                        echo ""
                fi
        else
                __clean_containers
                if [ $PRE_CLEAN -eq 1 ]; then

-                       echo " Cleaning kubernetes resouces to free up resources, may take time..."
-                       ../common/clean_kube.sh $KUBECONF 2>&1 > /dev/null
+                       echo " Cleaning docker resources to free up resources, may take time..."
+                       ../common/clean_docker.sh 2>&1 > /dev/null

                        echo ""
                fi
        fi
                        echo ""
                fi
        fi


@@ -3055,7 +3055,7 @@ __check_service_start() {
                                #If response is too long, truncate
                                result="...response text too long, omitted"
                        fi
                                #If response is too long, truncate
                                result="...response text too long, omitted"
                        fi

-                       echo -ne " Waiting for {ENTITY} $BOLD${appname}$EBOLD service status on ${3}, result: $result${SAMELINE}"
+                       echo -ne " Waiting for ${ENTITY} $BOLD${appname}$EBOLD service status on ${url}, result: $result${SAMELINE}"

                        echo -ne " The ${ENTITY} $BOLD${appname}$EBOLD$GREEN is alive$EGREEN, responds to service status:$GREEN $result $EGREEN on ${url} after $(($SECONDS-$TSTART)) seconds"
                        a1pmsst=true
                        break
                        echo -ne " The ${ENTITY} $BOLD${appname}$EBOLD$GREEN is alive$EGREEN, responds to service status:$GREEN $result $EGREEN on ${url} after $(($SECONDS-$TSTART)) seconds"
                        a1pmsst=true
                        break

diff --git a/test/common/testsuite_common.sh b/test/common/testsuite_common.sh
index 4117cdb..5728510 100644 (file)
--- a/test/common/testsuite_common.sh
+++ b/test/common/testsuite_common.sh
@@ -94,8 +94,8 @@ suite_complete() {
 
     total=$((TCSUITE_PASS_CTR+TCSUITE_FAIL_CTR))
     if [ $TCSUITE_CTR -eq 0 ]; then
 
     total=$((TCSUITE_PASS_CTR+TCSUITE_FAIL_CTR))
     if [ $TCSUITE_CTR -eq 0 ]; then

-               echo -e "\033[1mNo test cases seem to have executed. Check the script....\033[0m"
-       elif [ $total != $TCSUITE_CTR ]; then
+                   echo -e "\033[1mNo test cases seem to have executed. Check the script....\033[0m"
+         elif [ $total != $TCSUITE_CTR ]; then

         echo -e "\033[1mTotal number of test cases does not match the sum of passed and failed test cases. Check the script....\033[0m"
     fi
     echo "Number of test cases : " $TCSUITE_CTR
         echo -e "\033[1mTotal number of test cases does not match the sum of passed and failed test cases. Check the script....\033[0m"
     fi
     echo "Number of test cases : " $TCSUITE_CTR


@@ -108,7 +108,13 @@ suite_complete() {
     echo "FAIL test cases"
     cat .tmp_tcsuite_fail
     echo ""
     echo "FAIL test cases"
     cat .tmp_tcsuite_fail
     echo ""

+    if [ $TCSUITE_FAIL_CTR -ne 0 ]; then
+      echo "###################################      Test suite completed with Tests FAIL     ##############################"
+      echo "#################################################################################################"
+    else
+      echo "###################################      Test suite completed      ##############################"
+      echo "#################################################################################################"
+    fi

 
 

-    echo "###################################      Test suite completed      ##############################"
-    echo "#################################################################################################"
+    exit $TCSUITE_FAIL_CTR

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/test/common/update_policies_process.py b/test/common/update_policies_process.py
new file mode 100644 (file)
index 0000000..11767a8
--- /dev/null
+++ b/test/common/update_policies_process.py
@@ -0,0 +1,127 @@
+#  ============LICENSE_START===============================================
+#  Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved.
+#  ========================================================================
+#  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
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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.
+#  ============LICENSE_END=================================================
+#
+
+# This script create/update policies spread over a number rics
+# Intended for parallel processing
+# Returns a string with result, either "0" for ok, or "1<fault description>"
+
+import json
+import sys
+import requests
+import traceback
+from time import sleep
+
+# disable warning about unverified https requests
+from requests.packages import urllib3
+
+urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+
+#arg responsecode baseurl ric_base num_rics uuid startid service type transient notification-url templatepath count pids pid_id proxy policy-ids-file-path
+data_out=""
+url_out=""
+try:
+
+    if len(sys.argv) != 17:
+        print("1Expected 16 args, got "+str(len(sys.argv)-1)+ ". Args: responsecode baseurl ric_base num_rics uuid startid service type transient notification-url templatepath count pids pid_id proxy policy-ids-file-path")
+        print (sys.argv[1:])
+        sys.exit()
+    responsecode=int(sys.argv[1])
+    baseurl=str(sys.argv[2])
+    ric_base=str(sys.argv[3])
+    num_rics=int(sys.argv[4])
+    uuid=str(sys.argv[5])
+    start=int(sys.argv[6])
+    serv=str(sys.argv[7])
+    pt=str(sys.argv[8])
+    trans=str(sys.argv[9])
+    noti=str(sys.argv[10])
+    templatepath=str(sys.argv[11])
+    count=int(sys.argv[12])
+    pids=int(sys.argv[13])
+    pid_id=int(sys.argv[14])
+    httpproxy=str(sys.argv[15])
+    policy_ids_file_path=str(sys.argv[16])
+
+    proxydict=None
+    if httpproxy != "NOPROXY":
+        proxydict = {
+            "http" : httpproxy,
+            "https" : httpproxy
+        }
+    if uuid == "NOUUID":
+        uuid=""
+
+    with open(templatepath, 'r') as file:
+        template = file.read()
+
+        start=start
+        stop=count*num_rics+start
+
+        http_retry_count=0
+        connect_retry_count=0
+
+        with open(str(policy_ids_file_path)) as file:
+            for policyId in file:
+                if start%pids == (pid_id-1):
+                    payload=template.replace("XXX",str(start))
+                    connect_ok=False
+                    retry_cnt=5
+                    while(retry_cnt>0):
+                        try:
+                            headers = {'Content-type': 'application/json'}
+                            url=baseurl+"/"+str(policyId.strip())
+                            url_out=url
+                            if proxydict is None:
+                                resp=requests.put(url, payload, headers=headers, verify=False, timeout=90)
+                            else:
+                                resp=requests.put(url, payload, headers=headers, verify=False, timeout=90, proxies=proxydict)
+                            connect_ok=True
+                        except Exception as e1:
+                            if (retry_cnt > 1):
+                                sleep(0.1)
+                                retry_cnt -= 1
+                                connect_retry_count += 1
+                            else:
+                                print("1Put failed for id:"+policyId.strip()+ ", "+str(e1) + " "+traceback.format_exc())
+                                sys.exit()
+
+                        if (connect_ok == True):
+                            if (resp.status_code == None):
+                                print("1Put failed for id:"+policyId.strip()+ ", expected response code: "+str(responsecode)+", got: None")
+                                sys.exit()
+
+                            if (resp.status_code != responsecode):
+                                if (resp.status_code >= 500) and (http_retry_count < 600 ) and (retry_cnt > 1):
+                                    sleep(0.1)
+                                    retry_cnt -= 1
+                                    http_retry_count += 1
+                                else:
+                                    print("1Put failed for id:"+policyId.strip()+ ", expected response code: "+str(responsecode)+", got: "+str(resp.status_code))
+                                    print(url_out)
+                                    print(json.loads(payload))
+                                    sys.exit()
+                            else:
+                                retry_cnt=-1
+                start  += 1
+    print("0 http retries:"+str(http_retry_count) + ", connect retries: "+str(connect_retry_count))
+    sys.exit()
+
+except Exception as e:
+    print("1"+str(e))
+    traceback.print_exc()
+    print(str(data_out))
+sys.exit()
\ No newline at end of file