Integrate Holmes with DCAE

Get service information via DCAE CBS

Change-Id: I1436e109452a8231a7d89493f2c12ce905deda6d
Issue-ID: HOLMES-45
Signed-off-by: Guangrong Fu <fu.guangrong@zte.com.cn>

diff --git a/test/csit/plans/holmes-rule-management/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
index ee010a0..681a9e7 100644 (file)
--- a/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
+++ b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
@@ -37,7 +37,7 @@ MSB_IP=`get-instance-ip.sh msb_internal_apigateway`
 echo MSB_IP=${MSB_IP}
 
 # Start rulemgt
-source ${SCRIPTS}/holmes/rule-management/startup.sh i-rulemgt ${DB_IP} ${MSB_IP} 80
+source ${SCRIPTS}/holmes/rule-management/startup.sh i-rulemgt ${DB_IP} ${MSB_IP} 1
 RULEMGT_IP=`get-instance-ip.sh i-rulemgt`
 echo RULEMGT_IP=${RULEMGT_IP}
 
@@ -49,7 +49,7 @@ for i in {1..20}; do
 done
 
 # Start engine-d
-source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${DB_IP} ${MSB_IP} 80
+source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${DB_IP} ${MSB_IP} 1
 ENGINE_D_IP=`get-instance-ip.sh i-engine-d`
 echo ENGINE_D_IP=${ENGINE_D_IP}
 

diff --git a/test/csit/scripts/holmes/engine-management/startup.sh b/test/csit/scripts/holmes/engine-management/startup.sh
index 59af9ca..27a4df4 100644 (file)
--- a/test/csit/scripts/holmes/engine-management/startup.sh
+++ b/test/csit/scripts/holmes/engine-management/startup.sh
@@ -20,4 +20,4 @@
 
 docker login -u docker -p docker nexus3.onap.org:10001
 
-run-instance.sh nexus3.onap.org:10001/onap/holmes/engine-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3 -e MSB_PORT=$4 -p 9102:9102"
+run-instance.sh nexus3.onap.org:10001/onap/holmes/engine-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3:80 -e TESTING=$4 -p 9102:9102"

diff --git a/test/csit/scripts/holmes/rule-management/startup.sh b/test/csit/scripts/holmes/rule-management/startup.sh
index e3bcdaa..ab3f931 100644 (file)
--- a/test/csit/scripts/holmes/rule-management/startup.sh
+++ b/test/csit/scripts/holmes/rule-management/startup.sh
@@ -19,4 +19,4 @@
 
 docker login -u docker -p docker nexus3.onap.org:10001
 
-run-instance.sh nexus3.onap.org:10001/onap/holmes/rule-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3 -e MSB_PORT=$4 -p 9101:9101"
\ No newline at end of file
+run-instance.sh nexus3.onap.org:10001/onap/holmes/rule-management:latest $1 "-e URL_JDBC=$2:5432 -e MSB_ADDR=$3:80 -e TESTING=$4 -p 9101:9101"
\ No newline at end of file