From: bryan <bryan.sullivan@att.com>
Date: Wed, 1 Mar 2017 23:54:15 +0000 (-0800)
Subject: Use $FLOATING_NETWORK_NAME instead of "public"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=23c5d5b0f5d52c8eefb69129bc1bf878eb40f679;p=models.git

Use $FLOATING_NETWORK_NAME instead of "public"

JIRA: MODELS-23
Fix config drive test
Verified on apex virtual deployment.

Change-Id: Ic719af13cf2edb1cb2183dbeeaec298887e89bf2
Signed-off-by: bryan <bryan.sullivan@att.com>
---

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() {