diff options
-rwxr-xr-x | plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh | 67 | ||||
-rwxr-xr-x | plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh | 23 | ||||
-rw-r--r-- | plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt | 3 | ||||
-rw-r--r-- | plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh | 13 | ||||
-rw-r--r-- | plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh | 4 | ||||
-rw-r--r-- | plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt | 2 | ||||
-rw-r--r-- | scripts/multicloud-ocata/generic_sim/Dockerfile | 2 | ||||
-rw-r--r-- | scripts/multicloud-pike/generic_sim/Dockerfile | 2 | ||||
-rw-r--r-- | tests/policy/suite1/Policy-CSIT.robot | 14 | ||||
-rw-r--r-- | tests/policy/suite1/listpolicy.template | 3 | ||||
-rw-r--r-- | tests/policy/suite1/policy_interface.robot | 14 |
11 files changed, 33 insertions, 114 deletions
diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh deleted file mode 100755 index 3c985aaf..00000000 --- a/plans/vfc-gvnfm-vnfmgr/sanity-check/setup.sh +++ /dev/null @@ -1,67 +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: -# Start all process required for executing test case - -source ${SCRIPTS}/common_functions.sh - -#start msb -docker run -d -p 8500:8500 --name msb_consul consul:0.9.3 -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} - -docker run -d -p 3306:3306 --name vfc-db nexus3.onap.org:10001/onap/vfc/db -VFC_DB_IP=`get-instance-ip.sh vfc-db` -echo VFC_DB_IP=${VFC_DB_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 initialization(3306 DB) -for i in {1..3}; do - curl -sS -m 1 ${VFC_DB_IP}:3306 && break - echo sleep $i - sleep $i -done - -# wait for container initalization -echo sleep 30 -sleep 30 - -# start vfc-vnfmgr -docker run -d --name vfc-vnfmgr -e MSB_ADDR=${MSB_IAG_IP}:80 -e MYSQL_ADDR=${VFC_DB_IP}:3306 nexus3.onap.org:10001/onap/vfc/vnfmgr -VNFMGR_IP=`get-instance-ip.sh vfc-vnfmgr` -for i in {1..10}; do - curl -sS -m 1 ${VNFMGR_IP}:8803 && break - echo sleep $i - sleep $i -done - -# Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v VNFMGR_IP:${VNFMGR_IP} -v SCRIPTS:${SCRIPTS}" diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh b/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh deleted file mode 100755 index cfabe42d..00000000 --- a/plans/vfc-gvnfm-vnfmgr/sanity-check/teardown.sh +++ /dev/null @@ -1,23 +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. -# - -# This script is sourced by run-csit.sh after Robot test completion. -kill-instance.sh msb_internal_apigateway -kill-instance.sh msb_discovery -kill-instance.sh msb_consul -kill-instance.sh vfc-db -kill-instance.sh vfc-vnfmgr diff --git a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt b/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt deleted file mode 100644 index c90cc935..00000000 --- a/plans/vfc-gvnfm-vnfmgr/sanity-check/testplan.txt +++ /dev/null @@ -1,3 +0,0 @@ -# Test suites are relative paths under [integration/csit.git]/tests/. -# Place the suites in run order. -vfc/gvnfm-vnfmgr/test.robot diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh index bdc66d0e..e7ac1f36 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/setup.sh @@ -52,16 +52,5 @@ for i in {1..10}; do sleep $i done -# start vfc-jujudriver -docker run -d --name vfc-jujudriver -e MSB_ADDR=${MSB_IAG_IP}:80 nexus3.onap.org:10001/onap/vfc/jujudriver -JUJUDRIVER_IP=`get-instance-ip.sh vfc-jujudriver` - -# Wait for initialization -for i in {1..10}; do - curl -sS ${JUJUDRIVER_IP}:8483 && break - echo sleep $i - sleep $i -done - # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP} -v JUJUDRIVER_IP:${JUJUDRIVER_IP}" +ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v GVNFMDRIVER_IP:${GVNFMDRIVER_IP}" diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh index 78d7c5ad..d90aad27 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/teardown.sh @@ -19,6 +19,4 @@ kill-instance.sh msb_internal_apigateway kill-instance.sh msb_discovery kill-instance.sh msb_consul -kill-instance.sh vfc-gvnfmdriver - -kill-instance.sh vfc-jujudriver +kill-instance.sh vfc-gvnfmdriver diff --git a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt index a54f095c..1295b2f8 100644 --- a/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt +++ b/plans/vfc-nfvo-driver-vnfm-gvnfm/sanity-check/testplan.txt @@ -2,5 +2,3 @@ # Place the suites in run order. vfc/nfvo-driver-gvnfm/gvnfmdriver.robot - -vfc/nfvo-driver-gvnfm/jujudriver.robot diff --git a/scripts/multicloud-ocata/generic_sim/Dockerfile b/scripts/multicloud-ocata/generic_sim/Dockerfile index 688b58af..724b9d7c 100644 --- a/scripts/multicloud-ocata/generic_sim/Dockerfile +++ b/scripts/multicloud-ocata/generic_sim/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7-alpine EXPOSE 8080 diff --git a/scripts/multicloud-pike/generic_sim/Dockerfile b/scripts/multicloud-pike/generic_sim/Dockerfile index 688b58af..724b9d7c 100644 --- a/scripts/multicloud-pike/generic_sim/Dockerfile +++ b/scripts/multicloud-pike/generic_sim/Dockerfile @@ -1,4 +1,4 @@ -FROM python:2.7 +FROM python:2.7-alpine EXPOSE 8080 diff --git a/tests/policy/suite1/Policy-CSIT.robot b/tests/policy/suite1/Policy-CSIT.robot index 785619f9..7855b76b 100644 --- a/tests/policy/suite1/Policy-CSIT.robot +++ b/tests/policy/suite1/Policy-CSIT.robot @@ -12,6 +12,7 @@ ${RESOURCE_PATH_CREATE} /pdp/api/createPolicy ${RESOURCE_PATH_CREATE_PUSH} /pdp/api/pushPolicy ${RESOURCE_PATH_CREATE_DELETE} /pdp/api/deletePolicy ${RESOURCE_PATH_GET_CONFIG} /pdp/api/getConfig +${RESOURCE_PATH_LISTPOLICY} /pdp/api/listPolicy ${CREATE_CONFIG_VFW_TEMPLATE} ${CURDIR}/configpolicy_vFW_R1.template ${CREATE_CONFIG_VDNS_TEMPLATE} ${CURDIR}/configpolicy_vDNS_R1.template ${CREATE_CONFIG_VCPE_TEMPLATE} ${CURDIR}/configpolicy_vCPE_R1.template @@ -24,6 +25,7 @@ ${CREATE_OPS_VDNS_TEMPLATE} ${CURDIR}/opspolicy_VDNS_R1.template ${DEL_POLICY_TEMPLATE} ${CURDIR}/deletepolicy.template ${GETCONFIG_TEMPLATE} ${CURDIR}/getconfigpolicy.template ${GETOOF_TEMPLATE} ${CURDIR}/getoofpolicy.template +${LISTPOLICY_TEMPLATE} ${CURDIR}/listpolicy.template ${CONFIG_POLICY_VFW_NAME} vFirewall ${CONFIG_POLICY_VFW_TYPE} MicroService ${CONFIG_POLICY_VDNS_NAME} vLoadBalancer @@ -115,6 +117,9 @@ HPA Get OOF Policy Sleep 5s Get OOF HPA Policy +ListPolicy + ListPolicy test com.Config_Sample.1.xml + *** Keywords *** VFW Policy Tests @@ -358,3 +363,12 @@ Upload DRL file # ${files}= Create Dictionary file ${file_data} ${put_resp} = Run Policy Post form Request ${RESOURCE_PATH_UPLOAD} ${files} Should Be Equal As Strings ${put_resp.status_code} 200 + +ListPolicy test + [Documentation] Listing Config Policies + [Arguments] ${policy_name} + ${dict}= Create Dictionary policy_name=${policy_name} + ${output} = Fill JSON Template File ${LISTPOLICY_TEMPLATE} ${dict} + ${put_resp} = policy_interface.Run Policy Post Request ${RESOURCE_PATH_LISTPOLICY} ${output} + Should Be Equal As Strings ${put_resp.status_code} 200 + diff --git a/tests/policy/suite1/listpolicy.template b/tests/policy/suite1/listpolicy.template new file mode 100644 index 00000000..aef17a23 --- /dev/null +++ b/tests/policy/suite1/listpolicy.template @@ -0,0 +1,3 @@ +{ + "policyName": "${policy_name}" +} diff --git a/tests/policy/suite1/policy_interface.robot b/tests/policy/suite1/policy_interface.robot index 79178708..745f7817 100644 --- a/tests/policy/suite1/policy_interface.robot +++ b/tests/policy/suite1/policy_interface.robot @@ -38,7 +38,17 @@ Run Policy Put Request ${resp}= Put Request policy ${data_path} data=${data} headers=${headers} Log Received response from policy ${resp.text} [Return] ${resp} - + +Run Policy Post Request + [Documentation] Runs Policy Post request + [Arguments] ${data_path} ${data} + Log Creating session ${GLOBAL_POLICY_SERVER_URL} + ${session}= Create Session policy ${GLOBAL_POLICY_SERVER_URL} + ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} Environment=TEST + ${resp}= Post Request policy ${data_path} data=${data} headers=${headers} + Log Received response from policy ${resp.text} + [Return] ${resp} + Run Policy Delete Request [Documentation] Runs Policy Delete request [Arguments] ${data_path} ${data} @@ -57,4 +67,4 @@ Run Policy Get Configs Request ${headers}= Create Dictionary Accept=application/json Content-Type=application/json Authorization=Basic ${GLOBAL_POLICY_AUTH} ClientAuth=${GLOBAL_POLICY_CLIENTAUTH} ${resp}= Post Request policy ${data_path} data=${data} headers=${headers} Log Received response from policy ${resp.text} - [Return] ${resp}
\ No newline at end of file + [Return] ${resp} |