Improve nonrtric CSIT

Use guilin release version SDNC image 2.0.4
Increase waiting time for containers to be up and running
Increase waiting time for synchronization between nonrtric and
near-rt-ric

Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Issue-ID: CCSDK-3090
Change-Id: I81c8a4fe0ffa243a23c602193e47f0794a31d6fa

diff --git a/plans/ccsdk-oran/polmansuite/data/preparePmsData.sh b/plans/ccsdk-oran/polmansuite/data/preparePmsData.sh
index fb1d03e..ecc98ae 100755 (executable)
--- a/plans/ccsdk-oran/polmansuite/data/preparePmsData.sh
+++ b/plans/ccsdk-oran/polmansuite/data/preparePmsData.sh
@@ -79,7 +79,7 @@ checkRes
 echo -e "\n"
 
 
-for i in {1..12}; do
+for i in {1..30}; do
        echo "policy types from policy agent:"
     curlString="curl -skw %{http_code} $httpx://localhost:$policy_agent_port/v2/policy-types"
     res=$($curlString)

diff --git a/plans/ccsdk-oran/polmansuite/sdnc/docker-compose.yml b/plans/ccsdk-oran/polmansuite/sdnc/docker-compose.yml
index ea06902..0dab19b 100644 (file)
--- a/plans/ccsdk-oran/polmansuite/sdnc/docker-compose.yml
+++ b/plans/ccsdk-oran/polmansuite/sdnc/docker-compose.yml
@@ -37,7 +37,7 @@ services:
         max-file: "5"
 
   a1-controller:
-    image: nexus3.onap.org:10003/onap/sdnc-image:2.0.5-STAGING-latest
+    image: onap/sdnc-image:2.0.4
     depends_on :
       - db
     container_name: a1-controller

diff --git a/plans/ccsdk-oran/polmansuite/test/pms_a1sim.sh b/plans/ccsdk-oran/polmansuite/test/pms_a1sim.sh
index f3344cf..105b1a3 100755 (executable)
--- a/plans/ccsdk-oran/polmansuite/test/pms_a1sim.sh
+++ b/plans/ccsdk-oran/polmansuite/test/pms_a1sim.sh
@@ -27,7 +27,7 @@ cd ${SHELL_FOLDER}/../
 docker-compose up -d
 
 checkStatus(){
-    for i in {1..20}; do
+    for i in {1..30}; do
         res=$($1)
         echo "$res"
         expect=$2

diff --git a/plans/ccsdk-oran/polmansuite/test/pms_a1sim_sdnc.sh b/plans/ccsdk-oran/polmansuite/test/pms_a1sim_sdnc.sh
index 5bf81b3..6154a55 100755 (executable)
--- a/plans/ccsdk-oran/polmansuite/test/pms_a1sim_sdnc.sh
+++ b/plans/ccsdk-oran/polmansuite/test/pms_a1sim_sdnc.sh
@@ -27,7 +27,7 @@ cd ${SHELL_FOLDER}/../
 docker-compose -f docker-compose.yml -f sdnc/docker-compose.yml up -d
 
 checkStatus(){
-    for i in {1..20}; do
+    for i in {1..30}; do
         res=$($1)
         echo "$res"
         expect=$2