From c8f9157b57a1b73280fe8a56e1f148c41ba35938 Mon Sep 17 00:00:00 2001 From: Guangrong Fu Date: Fri, 8 Sep 2017 08:01:26 +0800 Subject: Change the directory name Change the name of the directory to make it match with that defined in the CSIT job. Change-Id: I82f412de042232c4e1c53e68bca90c7a9ccbd0d3 Issue-ID: HOLMES-39 Signed-off-by: Guangrong Fu --- .../holmes-rule-management/sanity-check/setup.sh | 66 ++++++++++++++++++++++ .../sanity-check/teardown.sh | 25 ++++++++ .../sanity-check/testplan.txt | 5 ++ test/csit/plans/holmes/sanity-check/setup.sh | 66 ---------------------- test/csit/plans/holmes/sanity-check/teardown.sh | 25 -------- test/csit/plans/holmes/sanity-check/testplan.txt | 5 -- .../holmes/testcase/RuleMgt/Rule-Keywords.robot | 5 +- 7 files changed, 98 insertions(+), 99 deletions(-) create mode 100644 test/csit/plans/holmes-rule-management/sanity-check/setup.sh create mode 100644 test/csit/plans/holmes-rule-management/sanity-check/teardown.sh create mode 100644 test/csit/plans/holmes-rule-management/sanity-check/testplan.txt delete mode 100644 test/csit/plans/holmes/sanity-check/setup.sh delete mode 100644 test/csit/plans/holmes/sanity-check/teardown.sh delete mode 100644 test/csit/plans/holmes/sanity-check/testplan.txt diff --git a/test/csit/plans/holmes-rule-management/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh new file mode 100644 index 000000000..cbe107c16 --- /dev/null +++ b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh @@ -0,0 +1,66 @@ +#!/bin/bash +# +# Copyright 2017 ZTE Corporation. +# +# 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. +# +# Place the scripts in run order: + +# Download and start MySQL +docker pull postgresql:9.5 +docker run --name postgres-holmes -p 5432:5432 -e POSTGRES_USER=holmes -e POSTGRES_PASSWORD=holmespwd -d postgres:9.5 +DB_IP=`get-instance-ip.sh postgres-holmes` +echo DB_IP=${DB_IP} + +#login to the onap nexus docker repo +docker login -u docker -p docker nexus3.onap.org:10001 + +# Start MSB +docker run -d -p 8500:8500 --name msb_consul nexus3.onap.org:10001/onap/msb/msb_base +CONSUL_IP=`get-instance-ip.sh msb_consul` +echo CONSUL_IP=${CONSUL_IP} +docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery +DISCOVERY_IP=`get-instance-ip.sh msb_discovery` +echo DISCOVERY_IP=${DISCOVERY_IP} +docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway +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 +RULEMGT_IP=`get-instance-ip.sh i-rulemgt` +echo RULEMGT_IP=${RULEMGT_IP} + +# Wait for initialization +for i in {1..20}; do + curl -sS -m 1 ${RULEMGT_IP}:9101 && curl -sS -m 1 ${MSB_IP}:80 && break + echo sleep $i + sleep $i +done + +# Start engine-d +source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${DB_IP} ${MSB_IP} 80 +ENGINE_D_IP=`get-instance-ip.sh i-engine-d` +echo ENGINE_D_IP=${ENGINE_D_IP} + + +# Wait for initialization +for i in {1..10}; do + curl -sS -m 1 ${ENGINE_D_IP}:9102 && break + echo sleep $i + sleep $i +done + +#Pass any variables required by Robot test suites in ROBOT_VARIABLES +ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v RULEMGT_IP:${RULEMGT_IP} -v ENGINE_D_IP:${ENGINE_D_IP}" + diff --git a/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh new file mode 100644 index 000000000..776522719 --- /dev/null +++ b/test/csit/plans/holmes-rule-management/sanity-check/teardown.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# +# Copyright 2016-2017 Huawei Technologies Co., Ltd. +# +# 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. +# + +#kill-instance.sh i-rulemgt +#kill-instance.sh i-engine-d +#kill-instance.sh msb_internal_apigateway +#kill-instance.sh msb_discovery +#kill-instance.sh msb_consul +#kill-instance.sh mysql-holmes + + diff --git a/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt new file mode 100644 index 000000000..e699512d7 --- /dev/null +++ b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt @@ -0,0 +1,5 @@ +# Test suites are relative paths under [integration.git]/test/csit/tests/. +# Place the suites in run order. + +holmes/testcase/EngineMgt +holmes/testcase/RuleMgt diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes/sanity-check/setup.sh deleted file mode 100644 index cbe107c16..000000000 --- a/test/csit/plans/holmes/sanity-check/setup.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash -# -# Copyright 2017 ZTE Corporation. -# -# 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. -# -# Place the scripts in run order: - -# Download and start MySQL -docker pull postgresql:9.5 -docker run --name postgres-holmes -p 5432:5432 -e POSTGRES_USER=holmes -e POSTGRES_PASSWORD=holmespwd -d postgres:9.5 -DB_IP=`get-instance-ip.sh postgres-holmes` -echo DB_IP=${DB_IP} - -#login to the onap nexus docker repo -docker login -u docker -p docker nexus3.onap.org:10001 - -# Start MSB -docker run -d -p 8500:8500 --name msb_consul nexus3.onap.org:10001/onap/msb/msb_base -CONSUL_IP=`get-instance-ip.sh msb_consul` -echo CONSUL_IP=${CONSUL_IP} -docker run -d -p 10081:10081 -e CONSUL_IP=$CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery -DISCOVERY_IP=`get-instance-ip.sh msb_discovery` -echo DISCOVERY_IP=${DISCOVERY_IP} -docker run -d -p 80:80 -e CONSUL_IP=$CONSUL_IP -e SDCLIENT_IP=$DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway -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 -RULEMGT_IP=`get-instance-ip.sh i-rulemgt` -echo RULEMGT_IP=${RULEMGT_IP} - -# Wait for initialization -for i in {1..20}; do - curl -sS -m 1 ${RULEMGT_IP}:9101 && curl -sS -m 1 ${MSB_IP}:80 && break - echo sleep $i - sleep $i -done - -# Start engine-d -source ${SCRIPTS}/holmes/engine-management/startup.sh i-engine-d ${DB_IP} ${MSB_IP} 80 -ENGINE_D_IP=`get-instance-ip.sh i-engine-d` -echo ENGINE_D_IP=${ENGINE_D_IP} - - -# Wait for initialization -for i in {1..10}; do - curl -sS -m 1 ${ENGINE_D_IP}:9102 && break - echo sleep $i - sleep $i -done - -#Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IP:${MSB_IP} -v RULEMGT_IP:${RULEMGT_IP} -v ENGINE_D_IP:${ENGINE_D_IP}" - diff --git a/test/csit/plans/holmes/sanity-check/teardown.sh b/test/csit/plans/holmes/sanity-check/teardown.sh deleted file mode 100644 index 4c457dc01..000000000 --- a/test/csit/plans/holmes/sanity-check/teardown.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -# -# Copyright 2016-2017 Huawei Technologies Co., Ltd. -# -# 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. -# - -kill-instance.sh i-rulemgt -kill-instance.sh i-engine-d -kill-instance.sh msb_internal_apigateway -kill-instance.sh msb_discovery -kill-instance.sh msb_consul -kill-instance.sh mysql-holmes - - diff --git a/test/csit/plans/holmes/sanity-check/testplan.txt b/test/csit/plans/holmes/sanity-check/testplan.txt deleted file mode 100644 index e699512d7..000000000 --- a/test/csit/plans/holmes/sanity-check/testplan.txt +++ /dev/null @@ -1,5 +0,0 @@ -# Test suites are relative paths under [integration.git]/test/csit/tests/. -# Place the suites in run order. - -holmes/testcase/EngineMgt -holmes/testcase/RuleMgt diff --git a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot index b2039174d..03f840904 100644 --- a/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot +++ b/test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot @@ -23,9 +23,8 @@ queryConditionRule [Arguments] ${queryParam} ${codeFlag}=1 [Documentation] ${queryParam} : The data type is Json . create session microservices ${ruleMgtHost} - ${param} set variable queryrequest\=${queryParam} - ${headers} set variable - ${getResponse} get request microservices ${ruleMgtUrl} ${headers} ${param} + Comment ${param} set variable queryrequest\=${queryParam} + ${getResponse} get request microservices ${ruleMgtUrl}?queryrequest\=${queryParam} log ${getResponse.content} run keyword if ${codeFlag}==1 Should be equal as strings ${getResponse.status_code} 200 run keyword if ${codeFlag}!=1 Should be equal as strings ${getResponse.status_code} 499 -- cgit 1.2.3-korg