diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-10-23 14:41:21 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-23 14:41:21 +0000 |
| commit | ab87f69a5dbcecea8b2b4793568a5623e4a714e3 (patch) | |
| tree | b7e63d6248400ff7019f6b1e9aad94d43eaa2aa5 /plans/vid/healthCheck | |
| parent | 37e3c0b51e55f84d4f9838c42b7433f2554632ee (diff) | |
| parent | 2ac270a8ee0ecf5357c541deb6e162b4cc26dd98 (diff) | |
Merge "Enhance vid CSIT tests, added for scaleout"
Diffstat (limited to 'plans/vid/healthCheck')
| -rw-r--r-- | plans/vid/healthCheck/setup.sh | 16 | ||||
| -rw-r--r-- | plans/vid/healthCheck/teardown.sh | 2 | ||||
| -rw-r--r-- | plans/vid/healthCheck/testplan.txt | 1 |
3 files changed, 13 insertions, 6 deletions
diff --git a/plans/vid/healthCheck/setup.sh b/plans/vid/healthCheck/setup.sh index 38dddf54..584a640a 100644 --- a/plans/vid/healthCheck/setup.sh +++ b/plans/vid/healthCheck/setup.sh @@ -14,24 +14,30 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Modifications copyright (c) 2017 AT&T Intellectual Property +# Modifications copyright (c) 2018 Nokia Intellectual Property # # Place the scripts in run order: /usr/bin/Xvfb :0 -screen 0 1024x768x24& export DISPLAY=:0 +source ${SCRIPTS}/common_functions.sh source ${WORKSPACE}/scripts/vid/clone_and_setup_vid_data.sh - source ${WORKSPACE}/scripts/vid/start_vid_containers.sh +echo `Obtaining ip of VID server...` +VID_IP=`get-instance-ip.sh vid-server` +SO_SIMULATOR_IP=`get-instance-ip.sh so-simulator` + +bypass_ip_address ${VID_IP} +bypass_ip_address ${SO_SIMULATOR_IP} -BE_IP=`get-instance-ip.sh vid-server` -echo BE_IP=${BE_IP} +echo VID_IP=${VID_IP} +echo SO_SIMULATOR_IP=${SO_SIMULATOR_IP} # Pass any variables required by Robot test suites in ROBOT_VARIABLES -ROBOT_VARIABLES="-v BE_IP:${BE_IP}" +ROBOT_VARIABLES="-v VID_IP:${VID_IP} -v SO_SIMULATOR_IP:${SO_SIMULATOR_IP}" pip install assertpy pip install requests
\ No newline at end of file diff --git a/plans/vid/healthCheck/teardown.sh b/plans/vid/healthCheck/teardown.sh index 14fd0522..8f168679 100644 --- a/plans/vid/healthCheck/teardown.sh +++ b/plans/vid/healthCheck/teardown.sh @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Modifications copyright (c) 2017 AT&T Intellectual Property +# Modifications copyright (c) 2018 Nokia Intellectual Property # source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh diff --git a/plans/vid/healthCheck/testplan.txt b/plans/vid/healthCheck/testplan.txt index 20add7af..61c39083 100644 --- a/plans/vid/healthCheck/testplan.txt +++ b/plans/vid/healthCheck/testplan.txt @@ -3,3 +3,4 @@ vid/healthCheck vid/login vid/https-connection +vid/scaleOut
\ No newline at end of file |