Merge "Rename Bash scripts"

labs/lib/functions.guest

@@ -2,7 +2,7 @@
 
 # Sourcing this file calls functions fix_path_env and source_deploy.
 
-source "$LIB_DIR/functions"
+source "$LIB_DIR/functions.sh"
 source "$LIB_DIR/functions-common-devstack"
 
 # Make devstack's operating system identification work with nounset

labs/lib/osbash/functions-host.sh

@@ -1,6 +1,6 @@
 # This file contains bash functions that are used by osbash on the host.
 
-source "$LIB_DIR/functions"
+source "$LIB_DIR/functions.sh"
 
 #-------------------------------------------------------------------------------
 # Conditional execution

labs/lib/osbash/virtualbox-functions.sh

@@ -682,7 +682,7 @@ function vbox_sleep {
 # Booting a VM and passing boot parameters
 #-------------------------------------------------------------------------------
 
-source "$OSBASH_LIB_DIR/scanlib"
+source "$OSBASH_LIB_DIR/scanlib.sh"
 
 function _vbox_push_scancode {
     local vm_name=$1

labs/osbash.sh

@@ -16,10 +16,10 @@ source "$CONFIG_DIR/openstack"
 source "$CONFIG_DIR/deploy.osbash"
 source "$CONFIG_DIR/provider.virtualbox"
 source "$OSBASH_LIB_DIR/lib.$DISTRO"
-source "$OSBASH_LIB_DIR/functions.host"
-source "$OSBASH_LIB_DIR/virtualbox.functions"
-source "$OSBASH_LIB_DIR/virtualbox.install_base"
-source "$LIB_DIR/osbash/lib.color"
+source "$OSBASH_LIB_DIR/functions-host.sh"
+source "$OSBASH_LIB_DIR/virtualbox-functions.sh"
+source "$OSBASH_LIB_DIR/virtualbox-install_base.sh"
+source "$LIB_DIR/osbash/lib-color.sh"
 
 function usage {
     echo "Usage: $0 {-b|-w} [-g GUI] [--no-color] [-n] {TARGET}"
@@ -220,7 +220,7 @@ MGMT_NET_IF=$(create_network "$MGMT_NET")
 DATA_NET_IF=$(create_network "$DATA_NET")
 API_NET_IF=$(create_network "$API_NET")
 #-------------------------------------------------------------------------------
-source "$OSBASH_LIB_DIR/virtualbox.install_nodes"
+source "$OSBASH_LIB_DIR/virtualbox-install_nodes.sh"
 vm_build_nodes "$CMD"
 #-------------------------------------------------------------------------------
 ENDTIME=$(date +%s)

labs/tools/get_upstart_logs.sh

@@ -3,7 +3,7 @@ set -o errexit -o nounset
 TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$OSBASH_LIB_DIR/functions.host"
+source "$OSBASH_LIB_DIR/functions-host.sh"
 
 CONTROLLER_PORT=2230
 NETWORK_PORT=2231

labs/tools/repeat-test.sh

@@ -3,7 +3,7 @@ set -o errexit -o nounset
 TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$OSBASH_LIB_DIR/functions.host"
+source "$OSBASH_LIB_DIR/functions-host.sh"
 
 LOG_NAME=test.log
 RESULTS_ROOT=$LOG_DIR/test-results

labs/tools/restore-cluster.sh

@@ -3,7 +3,7 @@ set -o errexit -o nounset
 TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$OSBASH_LIB_DIR/functions.host"
+source "$OSBASH_LIB_DIR/functions-host.sh"
 
 CONTROLLER_VM=controller
 NETWORK_VM=network

labs/tools/test-once.sh

@@ -3,7 +3,7 @@ set -o errexit -o nounset
 TOP_DIR=$(cd "$(dirname "$0")/.." && pwd)
 source "$TOP_DIR/config/paths"
 source "$CONFIG_DIR/deploy.osbash"
-source "$OSBASH_LIB_DIR/functions.host"
+source "$OSBASH_LIB_DIR/functions-host.sh"
 
 # Get remote ssh port of target node (VM_SSH_PORT)
 source "$CONFIG_DIR/config.controller"