summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangguirong <wangguirong@boco.com.cn>2017-10-23 15:22:17 +0800
committerwangguirong <wangguirong@boco.com.cn>2017-10-23 15:24:36 +0800
commit2b8910da098521f16edf751f6f792be32b1e10be (patch)
treec9fd12bea0ea82ce65b4e0587e45e2fa269565f9
parentb3de48e61f0613bfa4860363405e495b70873860 (diff)
Modify conf/config.properties
Change-Id: I6b7dc5574a1a8f417b9b2dfd21e970d33e50c218 Issue-Id: VFC-548 Signed-off-by: wangguirong <wangguirong@boco.com.cn>
-rw-r--r--ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java3
-rw-r--r--ems/microservice-standalone/src/main/assembly/conf/config.properties6
-rwxr-xr-xems/microservice-standalone/src/main/assembly/docker/instance_config.sh9
3 files changed, 12 insertions, 6 deletions
diff --git a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
index b2bba0c..c752a29 100644
--- a/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
+++ b/ems/boco/src/main/java/org/onap/vfc/nfvo/emsdriver/northbound/client/NorthMessageMgr.java
@@ -64,7 +64,8 @@ public class NorthMessageMgr extends DriverThread{
level = Level.INFO;
}
- //login north
+ //login north
+ event_api_url = "http://"+event_api_url;
try{
AgentMain.evel_initialize(event_api_url, Integer.parseInt(port),
path,topic,
diff --git a/ems/microservice-standalone/src/main/assembly/conf/config.properties b/ems/microservice-standalone/src/main/assembly/conf/config.properties
index 2a8bd42..70bd090 100644
--- a/ems/microservice-standalone/src/main/assembly/conf/config.properties
+++ b/ems/microservice-standalone/src/main/assembly/conf/config.properties
@@ -29,8 +29,8 @@ esr_emsUrl=/aai/v11/external-system/esr-ems-list/esr-ems/%s?depth=all
#north
-event_api_url=http://127.0.0.1
+event_api_url=
port=30000
-username=pill
-password=will
+username=
+password=
level=debug
diff --git a/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh b/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
index 4968343..476c856 100755
--- a/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
+++ b/ems/microservice-standalone/src/main/assembly/docker/instance_config.sh
@@ -2,12 +2,17 @@
MSB_IP=`echo $MSB_ADDR | cut -d: -f 1`
MSB_PORT=`echo $MSB_ADDR | cut -d: -f 2`
+VES_IP=`echo $VES_ADDR | cut -d: -f 1`
+VES_PORT=`echo $VES_ADDR | cut -d: -f 2`
+USER_NAME=`echo $VES_AUTHINFO | cut -d: -f 1`
+PASSWORD=`echo $VES_AUTHINFO | cut -d: -f 2`
+
sed -i "s|msbAddress.*|msbAddress: $MSB_IP:$MSB_PORT|" emsdriver/conf/emsdriver.yml
sed -i "s|\"ip\": \".*\"|\"ip\": \"$SERVICE_IP\"|" emsdriver/conf/emsdriver.yml
sed -i "s|msbAddress=.*|msbAddress=$MSB_IP:$MSB_PORT|" emsdriver/conf/config.properties
-sed -i "s|event_api_url=.*|event_api_url=$EVENT_API_URL|" emsdriver/conf/config.properties
-sed -i "s|port=.*|port=$PORT|" emsdriver/conf/config.properties
+sed -i "s|event_api_url=.*|event_api_url=$VES_IP|" emsdriver/conf/config.properties
+sed -i "s|port=.*|port=$VES_PORT|" emsdriver/conf/config.properties
sed -i "s|username=.*|username=$USER_NAME|" emsdriver/conf/config.properties
sed -i "s|password=.*|password=$PASSWORD|" emsdriver/conf/config.properties