From: YongchaoWu <yongchao.wu@est.tech>
Date: Mon, 10 Feb 2020 10:50:04 +0000 (+0100)
Subject: Prepare for csit
X-Git-Tag: 2.0.0~170
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=a3c3e36b7f8cfd13245c87640bda5630f31fda59;p=nonrtric.git

Prepare for csit

change remote tag to latest
modify consul configuration

Issue-ID: NONRTRIC-115
Signed-off-by: YongchaoWu <yongchao.wu@est.tech>
Change-Id: Id65809bb9e5c8ee1fcffa91c4ad8b2980d20d442
---

diff --git a/near-rt-ric-simulator/common/testcase_common.sh b/near-rt-ric-simulator/common/testcase_common.sh
index ae6563d0..dfca543c 100755
--- a/near-rt-ric-simulator/common/testcase_common.sh
+++ b/near-rt-ric-simulator/common/testcase_common.sh
@@ -10,7 +10,7 @@ echo "Test case started as: ${BASH_SOURCE[$i+1]} "$1
 STARTED_POLICY_AGENT="" #Policy agent app names added to this var to keep track of started container in the script
 START_ARG=$1
 IMAGE_TAG="1.0.0-SNAPSHOT"
-IMAGE_TAG_REMOTE="1.0.0"
+IMAGE_TAG_REMOTE="latest"
 
 if [ $# -lt 1 ] || [ $# -gt 2 ]; then
 	echo "Expected arg: local  | remote  "
diff --git a/near-rt-ric-simulator/simulator-group/consul_cbs/config.json b/near-rt-ric-simulator/simulator-group/consul_cbs/config.json
index 4dc0f6c5..16975ca0 100644
--- a/near-rt-ric-simulator/simulator-group/consul_cbs/config.json
+++ b/near-rt-ric-simulator/simulator-group/consul_cbs/config.json
@@ -1,13 +1,28 @@
 {
-  "//description": "Application configuration",
-  "ric": [
-    {
-      "name": "ric3",
-      "baseUrl": "http://ric3:8085/",
-      "managedElementIds": [
-        "kista_5",
-        "kista_6"
-      ]
-    }
-  ]
+      "ric":[
+         {
+            "name":"ric3",
+            "baseUrl":"http://ric3:8085/",
+            "managedElementIds":[
+               "kista_1",
+               "kista_2"
+            ]
+         }
+      ],
+      "streams_publishes":{
+         "dmaap_publisher":{
+            "type":"message_router",
+            "dmaap_info":{
+               "topic_url":"http://admin:admin@localhost:6845/events/A1-POLICY-AGENT-WRITE"
+            }
+         }
+      },
+      "streams_subscribes":{
+         "dmaap_subscriber":{
+            "type":"message_router",
+            "dmaap_info":{
+               "topic_url":"http://admin:admin@localhost:6845/events/A1-POLICY-AGENT-READ/users/policy-agent"
+            }
+         }
+      }
 }