summaryrefslogtreecommitdiffstats
path: root/test/csit
diff options
context:
space:
mode:
Diffstat (limited to 'test/csit')
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/setup.sh (renamed from test/csit/plans/holmes/sanity-check/setup.sh)0
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/teardown.sh25
-rw-r--r--test/csit/plans/holmes-rule-management/sanity-check/testplan.txt (renamed from test/csit/plans/holmes/sanity-check/testplan.txt)0
-rw-r--r--test/csit/plans/msb/rest-service/setup.sh55
-rw-r--r--test/csit/plans/msb/rest-service/teardown.sh (renamed from test/csit/plans/holmes/sanity-check/teardown.sh)12
-rw-r--r--test/csit/plans/msb/rest-service/testplan.txt4
-rw-r--r--test/csit/plans/msb/sanity-check/setup.sh11
-rw-r--r--test/csit/plans/msb/tcp-service/setup.sh10
-rwxr-xr-xtest/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh46
-rw-r--r--test/csit/tests/holmes/testcase/RuleMgt/Rule-Keywords.robot5
-rw-r--r--test/csit/tests/msb/rest-service-api-gateway/__init__.robot2
-rw-r--r--test/csit/tests/msb/rest-service-api-gateway/test1.robot9
-rw-r--r--test/csit/tests/msb/rest-service-discovery/__init__.robot2
-rw-r--r--test/csit/tests/msb/rest-service-discovery/test1.robot14
-rw-r--r--test/csit/tests/vfc/nfvo-lcm/test.robot11
15 files changed, 168 insertions, 38 deletions
diff --git a/test/csit/plans/holmes/sanity-check/setup.sh b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
index cbe107c16..cbe107c16 100644
--- a/test/csit/plans/holmes/sanity-check/setup.sh
+++ b/test/csit/plans/holmes-rule-management/sanity-check/setup.sh
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/sanity-check/testplan.txt b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt
index e699512d7..e699512d7 100644
--- a/test/csit/plans/holmes/sanity-check/testplan.txt
+++ b/test/csit/plans/holmes-rule-management/sanity-check/testplan.txt
diff --git a/test/csit/plans/msb/rest-service/setup.sh b/test/csit/plans/msb/rest-service/setup.sh
new file mode 100644
index 000000000..18b17ff8f
--- /dev/null
+++ b/test/csit/plans/msb/rest-service/setup.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+#
+# Copyright 2017 ZTE, Inc. and others.
+#
+# 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.
+#
+
+source ${SCRIPTS}/common_functions.sh
+
+#start msb
+sudo docker run -d -p 8500:8500 --name msb_consul consul
+MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
+echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
+
+sudo docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
+echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
+
+sudo docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP -e "ROUTE_LABELS=visualRange:1" --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
+echo MSB_IAG_IP=${MSB_IAG_IP}
+
+# Start rest example service
+sudo docker run -d -p 9090:9090 --name i-rest-example zhaohuabing/rest-example
+REST_EXAMPLE_IP=`get-instance-ip.sh i-rest-example`
+echo REST_EXAMPLE_IP=${REST_EXAMPLE_IP}
+
+
+# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway)
+for i in {1..10}; do
+ curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break
+ echo sleep $i
+ sleep $i
+done
+
+#Need some time so service info can be synced from discovery to api gateway
+sleep 60
+
+curl -X POST \
+ -H "Content-Type: application/json" \
+ -d '{"serviceName": "test", "version": "v1", "url": "/","protocol": "REST", "lb_policy":"round-robin","nodes": [ {"ip": "'${REST_EXAMPLE_IP}'","port": "9090"}]}' \
+ "http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services"
+
+# Pass any variables required by Robot suites in ROBOT_VARIABLES
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}" \ No newline at end of file
diff --git a/test/csit/plans/holmes/sanity-check/teardown.sh b/test/csit/plans/msb/rest-service/teardown.sh
index 4c457dc01..b79456731 100644
--- a/test/csit/plans/holmes/sanity-check/teardown.sh
+++ b/test/csit/plans/msb/rest-service/teardown.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright 2016-2017 Huawei Technologies Co., Ltd.
+# Copyright 2017 ZTE, Inc. and others.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -15,11 +15,7 @@
# 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
-
-
+kill-instance.sh msb_discovery
+kill-instance.sh msb_internal_apigateway
+kill-instance.sh i-rest-example
diff --git a/test/csit/plans/msb/rest-service/testplan.txt b/test/csit/plans/msb/rest-service/testplan.txt
new file mode 100644
index 000000000..54bb307bf
--- /dev/null
+++ b/test/csit/plans/msb/rest-service/testplan.txt
@@ -0,0 +1,4 @@
+# Test suites are relative paths under [integration.git]/test/csit/tests/.
+# Place the suites in run order.
+msb/rest-service-discovery
+msb/rest-service-api-gateway \ No newline at end of file
diff --git a/test/csit/plans/msb/sanity-check/setup.sh b/test/csit/plans/msb/sanity-check/setup.sh
index a484160a0..21bb18f7d 100644
--- a/test/csit/plans/msb/sanity-check/setup.sh
+++ b/test/csit/plans/msb/sanity-check/setup.sh
@@ -18,15 +18,15 @@
source ${SCRIPTS}/common_functions.sh
#start msb
-sudo docker run -d -p 8500:8500 --name msb_consul consul
+docker run -d -p 8500:8500 --name msb_consul consul
MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
-sudo docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
-sudo docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
echo MSB_IAG_IP=${MSB_IAG_IP}
@@ -37,5 +37,8 @@ for i in {1..10}; do
sleep $i
done
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
+#wait for container initalization
+sleep 30
+
+#Pass any variables required by Robot test suites in ROBOT_VARIABLES
ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP}"
diff --git a/test/csit/plans/msb/tcp-service/setup.sh b/test/csit/plans/msb/tcp-service/setup.sh
index 18d70bde5..1a315e516 100644
--- a/test/csit/plans/msb/tcp-service/setup.sh
+++ b/test/csit/plans/msb/tcp-service/setup.sh
@@ -18,20 +18,20 @@
source ${SCRIPTS}/common_functions.sh
#start msb
-sudo docker run -d -p 8500:8500 --name msb_consul consul
+docker run -d -p 8500:8500 --name msb_consul consul
MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
-sudo docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
-sudo docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
echo MSB_IAG_IP=${MSB_IAG_IP}
# Start Message Broker
-sudo docker run -d -p 61616:61616 --name i-activemq webcenter/activemq
+docker run -d -p 61616:61616 --name i-activemq webcenter/activemq
ACTIVEMQ_IP=`get-instance-ip.sh i-activemq`
echo ACTIVEMQ_IP=${ACTIVEMQ_IP}
@@ -43,7 +43,7 @@ for i in {1..10}; do
sleep $i
done
-#wait for discovery initalization
+#wait for container initalization
sleep 30
curl -H "Content-Type: application/json" -X POST -d '{"serviceName": "ActiveMQ","protocol": "TCP","nodes": [{"ip": "'${ACTIVEMQ_IP}'","port": "61616"}]}' http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services
diff --git a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
index d17af9f9a..42a7f901e 100755
--- a/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
+++ b/test/csit/plans/vfc-nfvo-lcm/sanity-check/setup.sh
@@ -17,28 +17,42 @@
# Place the scripts in run order:
# Start all process required for executing test case
-#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}
+source ${SCRIPTS}/common_functions.sh
+
+#start msb
+docker run -d -p 8500:8500 --name msb_consul consul
+MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
+echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
+
+docker run -d -p 10081:10081 -e CONSUL_IP=$MSB_CONSUL_IP --name msb_discovery nexus3.onap.org:10001/onap/msb/msb_discovery
+MSB_DISCOVERY_IP=`get-instance-ip.sh msb_discovery`
+echo DISCOVERY_IP=${MSB_DISCOVERY_IP}
+
+docker run -d -p 80:80 -e CONSUL_IP=$MSB_CONSUL_IP -e SDCLIENT_IP=$MSB_DISCOVERY_IP --name msb_internal_apigateway nexus3.onap.org:10001/onap/msb/msb_apigateway
+MSB_IAG_IP=`get-instance-ip.sh msb_internal_apigateway`
+echo MSB_IAG_IP=${MSB_IAG_IP}
+
+# Wait for initialization(8500 Consul, 10081 Service Registration & Discovery, 80 api gateway)
+for i in {1..10}; do
+ curl -sS -m 1 ${MSB_CONSUL_IP}:8500 && curl -sS -m 1 ${MSB_DISCOVERY_IP}:10081 && curl -sS -m 1 ${MSB_IAG_IP}:80 && break
+ echo sleep $i
+ sleep $i
+done
+
+# wait for container initalization
+echo sleep 30
+sleep 30
# start vfc-nslcm
-docker run -d --name vfc-nslcm -e MSB_ADDR=${MSB_IP}:80 nexus3.onap.org:10001/onap/vfc/nslcm
+docker run -d --name vfc-nslcm -v /var/lib/mysql -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/nslcm
NSLCM_IP=`get-instance-ip.sh vfc-nslcm`
+
+# Wait for initialization
for i in {1..10}; do
- curl -sS ${NSLCM_IP}:8403 && break
+ curl -sS -m 1 ${NSLCM_IP}:8403 && 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 NSLCM_IP:${NSLCM_IP}"
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v NSLCM_IP:${NSLCM_IP}"
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
diff --git a/test/csit/tests/msb/rest-service-api-gateway/__init__.robot b/test/csit/tests/msb/rest-service-api-gateway/__init__.robot
new file mode 100644
index 000000000..efd2221f2
--- /dev/null
+++ b/test/csit/tests/msb/rest-service-api-gateway/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation Microservices Service Bus - Messag Broker
diff --git a/test/csit/tests/msb/rest-service-api-gateway/test1.robot b/test/csit/tests/msb/rest-service-api-gateway/test1.robot
new file mode 100644
index 000000000..8a15bf2be
--- /dev/null
+++ b/test/csit/tests/msb/rest-service-api-gateway/test1.robot
@@ -0,0 +1,9 @@
+*** Settings ***
+Library Collections
+Library requests
+
+*** Test Cases ***
+REST service Test1
+ [Documentation] Check if test rest service can be accessed via aip gateway
+ ${result} = get http://${MSB_IAG_IP}/api/test/v1/people
+ Should Be Equal ${result.status_code} ${200}
diff --git a/test/csit/tests/msb/rest-service-discovery/__init__.robot b/test/csit/tests/msb/rest-service-discovery/__init__.robot
new file mode 100644
index 000000000..efd2221f2
--- /dev/null
+++ b/test/csit/tests/msb/rest-service-discovery/__init__.robot
@@ -0,0 +1,2 @@
+*** Settings ***
+Documentation Microservices Service Bus - Messag Broker
diff --git a/test/csit/tests/msb/rest-service-discovery/test1.robot b/test/csit/tests/msb/rest-service-discovery/test1.robot
new file mode 100644
index 000000000..bb48d3fdc
--- /dev/null
+++ b/test/csit/tests/msb/rest-service-discovery/test1.robot
@@ -0,0 +1,14 @@
+*** Settings ***
+Library Collections
+Library requests
+
+*** Test Cases ***
+Messag Broker Test
+ [Documentation] Check if the test service enpoint can be get from MSB
+ ${result} = get http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services/test/version/v1
+ Should Be Equal ${result.status_code} ${200}
+ ${json} = Set Variable ${result.json()}
+ ${serviceName} = Get From Dictionary ${json} serviceName
+ ${protocol} = Get From Dictionary ${json} protocol
+ Should Be Equal ${serviceName} test
+ Should Be Equal ${protocol} REST \ No newline at end of file
diff --git a/test/csit/tests/vfc/nfvo-lcm/test.robot b/test/csit/tests/vfc/nfvo-lcm/test.robot
index 907558f0c..d0a5b7cd7 100644
--- a/test/csit/tests/vfc/nfvo-lcm/test.robot
+++ b/test/csit/tests/vfc/nfvo-lcm/test.robot
@@ -10,5 +10,12 @@ ${queryswagger_url} /api/nslcm/v1/swagger.json
*** Test Cases ***
NslcmSwaggerTest
- [Documentation] query nslcm swagger info rest test
- Should Be Equal 2.0 2.0
+ [Documentation] query swagger info nslcm
+ ${headers} Create Dictionary Content-Type=application/json Accept=application/json
+ Create Session web_session http://${MSB_IAG_IP}:80 headers=${headers}
+ ${resp}= Get Request web_session ${queryswagger_url}
+ ${responese_code}= Convert To String ${resp.status_code}
+ List Should Contain Value ${return_ok_list} ${responese_code}
+ ${response_json} json.loads ${resp.content}
+ ${swagger_version}= Convert To String ${response_json['swagger']}
+ Should Be Equal ${swagger_version} 2.0