summaryrefslogtreecommitdiffstats
path: root/tests/lib
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2017-02-02 11:28:43 +0000
committerRyota MIBU <r-mibu@cq.jp.nec.com>2017-02-02 11:28:43 +0000
commit06406611160b83a2ec90400db3b9e6b08d60ff95 (patch)
tree07d03d4688f8fe916dbe16f47c1e664b8ab6c6f8 /tests/lib
parent89cd27c623e929e837a02eef0622c4ef33772ade (diff)
correct usage of common functions
Change-Id: I5c486c5f08880f6b3b6b4b393360752fb6077bed Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib/inspector2
-rw-r--r--tests/lib/installer2
-rw-r--r--tests/lib/installers/apex2
-rw-r--r--tests/lib/installers/fuel7
4 files changed, 7 insertions, 6 deletions
diff --git a/tests/lib/inspector b/tests/lib/inspector
index 963e9519..24221642 100644
--- a/tests/lib/inspector
+++ b/tests/lib/inspector
@@ -26,7 +26,7 @@ function cleanup_inspector {
if ! is_inspector_supported $INSPECTOR_TYPE; then
- die $LINENO"INSPECTOR_TYPE=$INSPECTOR_TYPE is not supported."
+ die $LINENO "INSPECTOR_TYPE=$INSPECTOR_TYPE is not supported."
fi
source $TOP_DIR/lib/inspectors/$INSPECTOR_TYPE
diff --git a/tests/lib/installer b/tests/lib/installer
index 807023f3..bdee9149 100644
--- a/tests/lib/installer
+++ b/tests/lib/installer
@@ -29,7 +29,7 @@ function cleanup_installer {
if ! is_installer_supported $INSTALLER_TYPE; then
- die $LINENO"INSTALLER_TYPE=$INSTALLER_TYPE is not supported."
+ die $LINENO "INSTALLER_TYPE=$INSTALLER_TYPE is not supported."
fi
source $TOP_DIR/lib/installers/$INSTALLER_TYPE
diff --git a/tests/lib/installers/apex b/tests/lib/installers/apex
index 54b3dce2..45a5dcdc 100644
--- a/tests/lib/installers/apex
+++ b/tests/lib/installers/apex
@@ -3,7 +3,7 @@
function get_installer_ip {
local instack_mac=$(sudo virsh domiflist instack | awk '/default/{print $5}')
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
- die_if_not_set $LINENO $INSTALLER_IP "No installer IP"
+ die_if_not_set $LINENO INSTALLER_IP "No installer IP"
}
function installer_get_ssh_keys {
diff --git a/tests/lib/installers/fuel b/tests/lib/installers/fuel
index 31fe1fb6..9ff9e724 100644
--- a/tests/lib/installers/fuel
+++ b/tests/lib/installers/fuel
@@ -7,9 +7,10 @@ fi
function get_installer_ip {
ssh_opts_cpu="$ssh_opts -i instack_key"
is_set INSTALLER_IP && return
- local instack_mac=$(sudo virsh domiflist fuel-master | awk '/fuel1/{print $5}')
+ local instack_mac
+ instack_mac=$(sudo virsh domiflist fuel-master | awk '/fuel1/{print $5}')
INSTALLER_IP=$(/usr/sbin/arp -e | grep ${instack_mac} | awk '{print $1}')
- die_if_not_set $LINENO $INSTALLER_IP "No installer IP"
+ die_if_not_set $LINENO INSTALLER_IP "No installer IP"
}
function get_controller_ips {
@@ -17,7 +18,7 @@ function get_controller_ips {
get_installer_ip
CONTROLLER_IPS=$(ssh $ssh_opts_cpu root@$INSTALLER_IP \
"fuel node | grep controller | cut -d '|' -f 5|xargs")
- die_if_not_set $LINENO $CONTROLLER_IPS "No controller IPs"
+ die_if_not_set $LINENO CONTROLLER_IPS "No controller IPs"
}
function installer_get_ssh_keys {