diff options
| author |   Bryan Sullivan <bryan.sullivan@att.com> | 2017-03-02 00:22:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-02 00:22:06 +0000 |
| commit | d556dbff5dfef7cb7d1da1fa8ef0ad44144dc6b3 (patch) | |
| tree | 6b49fac0084779b4c0b10c3f7e53675285323b5f | |
| parent | 4a4f500de50d0af78aecea081678377c2bb09d70 (diff) | |
| parent | 23c5d5b0f5d52c8eefb69129bc1bf878eb40f679 (diff) | |
Merge "Use $FLOATING_NETWORK_NAME instead of "public""
| -rw-r--r-- | tests/vHello_Tacker.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/vHello_Tacker.sh b/tests/vHello_Tacker.sh index 4374f7a..aee8442 100644 --- a/tests/vHello_Tacker.sh +++ b/tests/vHello_Tacker.sh @@ -262,7 +262,7 @@ start() { echo "$0: $(date) associate floating IP" get_floating_net - FIP=$(nova floating-ip-create $FLOATING_NETWORK_NAME | awk "/public/ { print \$4 }") + FIP=$(nova floating-ip-create $FLOATING_NETWORK_NAME | awk "/$FLOATING_NETWORK_NAME/ { print \$4 }") nova floating-ip-associate $SERVER_ID $FIP # End setup for workarounds @@ -289,7 +289,11 @@ start() { echo "$0: $(date) verify contents of config drive are included in web page" id=$(curl $SERVER_URL | awk "/uuid/ { print \$2 }") - assert "models-tacker-vnfd-001 (config_drive creation)" [[ ! -z "$id" ]] + if [[ ! -z $id ]]; then + assert "models-tacker-vnfd-001 (config_drive creation)" true + else + assert "models-tacker-vnfd-001 (config_drive creation)" false + fi } stop() { |