Merge lp:~mpontillo/maas/maas-enlist-wget-and-curl into lp:~maas-maintainers/maas/maas-enlist

[Mike Pontillo]

Support wget and curl in maas-enlist.

Support both wget and curl in maas-enlist.

Based on a branch proposed by Mathieu Trudel-Lapierre on 2015-09-03.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks fine to me as long as 'which' is available. It might not be the case in d-i (but it likely is there).

review: Needs Information

[Mathieu Trudel-Lapierre (cyphermox)]

review: Approve

[Mike Pontillo (mpontillo)]

Since $(which) wasn't there, I updated it to use $(ls) instead.

Thanks for taking a look! Self-approving.

review: Approve

=== modified file 'bin/maas-enlist'
--- bin/maas-enlist	2015-09-15 20:09:15 +0000
+++ bin/maas-enlist	2015-09-15 20:09:15 +0000
@@ -19,99 +19,132 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 get_mac_addresses() {
-	macs=`ip addr | egrep 'link/ether' | cut -d' ' -f6`
-	for i in $macs;
-	do
-		if [ -z "$mac_address" ]; then
-			mac_address="$i";
-		else
-			mac_address="$mac_address,$i"
-		fi
-	done
-	echo "$mac_address"
+    macs=`ip addr | egrep 'link/ether' | cut -d' ' -f6`
+    for i in $macs;
+    do
+        if [ -z "$mac_address" ]; then
+            mac_address="$i";
+        else
+            mac_address="$mac_address,$i"
+        fi
+    done
+    echo "$mac_address"
 }
 
 get_mac_address_by_interface() {
-	iface="$1"
-	mac=`ip addr sh "$iface" | egrep -m1 'link/ether' | cut -d' ' -f6`
-	echo "$mac"
-}
-
-get_mac_address_parms() {
-	local args="" input_string="$1"
-	OIFS=$IFS; IFS=","; set -- $input_string; IFS=$OIFS
-	for i in "$@";
-	do
-		args="${args}&mac_addresses=${i}"
-		#mac_address="$mac_address""&mac_addresses=""${i}";
-	done
-	echo "${args# }"
+    iface="$1"
+    mac=`ip addr sh "$iface" | egrep -m1 'link/ether' | cut -d' ' -f6`
+    echo "$mac"
+}
+
+get_mac_address_curl_parms() {
+    local args="" input_string="$1"
+    OIFS=$IFS; IFS=","; set -- $input_string; IFS=$OIFS
+    for i in "$@";
+    do
+        args="${args} --data-urlencode mac_addresses=${i}"
+    done
+    echo "${args# }"
+}
+
+get_mac_address_wget_parms() {
+    local args="" input_string="$1"
+    OIFS=$IFS; IFS=","; set -- $input_string; IFS=$OIFS
+    for i in "$@";
+    do
+        args="${args}&mac_addresses=${i}"
+    done
+    echo "${args# }"
 }
 
 get_host_architecture() {
-	if grep "flags" /proc/cpuinfo | grep -qs "\ lm\ "; then
-		# if /proc/cpuinfo Flags has 'lm', it is x86_64
-		arch="amd64"
-	else
-		arch=`archdetect | cut -d'/' -f1`
-	fi
-	echo "$arch"
+    if grep "flags" /proc/cpuinfo | grep -qs "\ lm\ "; then
+        # if /proc/cpuinfo Flags has 'lm', it is x86_64
+        arch="amd64"
+    else
+        arch=`archdetect | cut -d'/' -f1`
+    fi
+    echo "$arch"
 }
 
 get_host_subarchitecture() {
-	local arch=$1
-	case $arch in
-	    i386|amd64)
-		# Skip the call to archdetect as that's what
-		# get_host_architecture does
-		echo generic
-		;;
-	    *)
-		archdetect | cut -d'/' -f2
-		;;
-	esac
+    local arch=$1
+    case $arch in
+        i386|amd64)
+        # Skip the call to archdetect as that's what
+        # get_host_architecture does
+        echo generic
+        ;;
+        *)
+        archdetect | cut -d'/' -f2
+        ;;
+    esac
 }
 
 get_server_name() {
-	local servername="$1";
-	_RET=${servername#*://};
-	_RET=${_RET%%/*};
-	echo "$_RET";
-}
-
-enlist_node() {
-	serverurl="${1}"
-	mac="${2}"
-	arch="${3}"
-	subarch="${4}"
-	hostname="${5}"
-	power_type="${6}"
-	power_params="${7}"
-
-	local macparms=""
-	macparms=$(get_mac_address_parms "$mac")
+    local servername="$1";
+    _RET=${servername#*://};
+    _RET=${_RET%%/*};
+    echo "$_RET";
+}
+
+enlist_node_curl() {
+    serverurl="${1}"
+    mac="${2}"
+    arch="${3}"
+    subarch="${4}"
+    hostname="${5}"
+    power_type="${6}"
+    power_params="${7}"
+
+    local macparms=""
+    macparms=$(get_mac_address_curl_parms "$mac")
+
+    curl \
+        --data-urlencode "op=new" \
+        --data-urlencode "autodetect_nodegroup=1" \
+        --data-urlencode "hostname=${hostname}" \
+        --data-urlencode "architecture=${arch}" \
+        --data-urlencode "subarchitecture=${subarch}" \
+        --data-urlencode "power_type=${power_type}" \
+        --data-urlencode "power_parameters=${power_params}" \
+        ${macparms} \
+        "${serverurl}"
+}
+
+enlist_node_wget() {
+    serverurl="${1}"
+    mac="${2}"
+    arch="${3}"
+    subarch="${4}"
+    hostname="${5}"
+    power_type="${6}"
+    power_params="${7}"
+
+    local macparms=""
+    macparms=$(get_mac_address_wget_parms "$mac")
  
-	local params="op=new"
-	params="${params}&autodetect_nodegroup=1"
-	params="${params}&hostname=${hostname}"
-	params="${params}&architecture=${arch}"
-	params="${params}&subarchitecture=${subarch}"
-	params="${params}&power_type=${power_type}"
-	params="${params}&power_parameters=${power_params}"
-	params="${params}${macparms}"
+    local params="op=new"
+    params="${params}&autodetect_nodegroup=1"
+    params="${params}&hostname=${hostname}"
+    params="${params}&architecture=${arch}"
+    params="${params}&subarchitecture=${subarch}"
+    params="${params}&power_type=${power_type}"
+    params="${params}&power_parameters=${power_params}"
+    params="${params}${macparms}"
 
-	wget -q -O/dev/null \
-	    "${serverurl}" \
-	    --post-data="$params"
+    wget -q -O/dev/null \
+        "${serverurl}" \
+        --post-data="$params"
 }
 
 Error () {
-	echo "ERROR: $1"
-	exit 1
+    echo "ERROR: $1"
+    exit 1
 }
 
 Usage() {
-	cat <<EOF
+    cat <<EOF
 Usage: ${0##*/} [ options ]
 
    node enlistment into the MAAS server
@@ -134,83 +167,95 @@
 
 bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || Error "$@"; exit 1; }
 
+CURL=$(ls -1 /usr/bin/curl 2> /dev/null)
+WGET=$(ls -1 /usr/bin/wget 2> /dev/null)
+
 short_opts="hs:n:i:a:t:p:"
-long_opts="help,serverurl:,hostname:,interface:,arch:,subarch:,power-type:,power-params:"
+long_opts="help,serverurl:,hostname:,interface:,arch:,subarch:,power-type:,power-params:,wget,curl"
 getopt_out=$(getopt --name "${0##*/}" \
-	--options "${short_opts}" --long "${long_opts}" -- "$@") &&
-	eval set -- "${getopt_out}" ||
-	bad_Usage
+    --options "${short_opts}" --long "${long_opts}" -- "$@") &&
+    eval set -- "${getopt_out}" ||
+    bad_Usage
 
 while [ $# -ne 0 ]; do
-	cur=${1}; next=${2};
-	case "$cur" in
-		-h|--help) Usage ; exit 0;;
-		-s|--serverurl) serverurl=${2}; shift;;
-		-n|--hostname) hostname=${2}; shift;;
-		-i|--interface) iface=${2}; shift;;
-		-a|--arch) arch=${2}; shift;;
-		--subarch) subarch=${2}; shift;;
-		-t|--power-type) power_type=${2}; shift;;
-		-p|--power-params) power_parameters=${2}; shift;;
-		--) shift; break;;
-	esac
-	shift;
+    cur=${1}; next=${2};
+    case "$cur" in
+        -h|--help) Usage ; exit 0;;
+        -s|--serverurl) serverurl=${2}; shift;;
+        -n|--hostname) hostname=${2}; shift;;
+        -i|--interface) iface=${2}; shift;;
+        -a|--arch) arch=${2}; shift;;
+        --subarch) subarch=${2}; shift;;
+        -t|--power-type) power_type=${2}; shift;;
+        -p|--power-params) power_parameters=${2}; shift;;
+        --wget) CURL=""; shift;;
+        --curl) WGET=""; shift;;
+        --) shift; break;;
+    esac
+    shift;
 done
 
 ## check arguments here
 #[ $# -eq 0 ] && bad_Usage
 
+
 # If no interface is specified. obtain the MAC from all interfaces
 if [ -z "$iface" ]; then
-	mac_addrs=$(get_mac_addresses)
+    mac_addrs=$(get_mac_addresses)
 else
-	mac_addrs=$(get_mac_address_by_interface "$iface")
+    mac_addrs=$(get_mac_address_by_interface "$iface")
 fi
 
 protocol=
 servername=$(get_server_name "$serverurl")
 if echo "$serverurl" | egrep -q '^[a-z]+://' ; then
-	protocol=`echo "$serverurl" | sed 's#^\([a-z]\+\)://.*#\\1#'`
+    protocol=`echo "$serverurl" | sed 's#^\([a-z]\+\)://.*#\\1#'`
 else
-	protocol="http"
+    protocol="http"
 fi
 
 if [ "$protocol" != "http" ] && [ "$protocol" != "https" ]; then
-	Error "Invalid protocol '$protocol'"
+    Error "Invalid protocol '$protocol'"
 fi
 
 if [ -z "$servername" ]; then
-	serverurl="maas.local"
-	servername="$serverurl"
+    serverurl="maas.local"
+    servername="$serverurl"
 fi
 if echo "$serverurl" | egrep -q '(^[a-z]+://|^)[a-z0-9\.]+($|/$)'; then
-	api_url="MAAS/api/1.0/nodes/"
+    api_url="MAAS/api/1.0/nodes/"
 else
-	api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)[a-zA-Z0-9\.]\+\(\|\:[0-9]\+\)/##'`
+    api_url=`echo $serverurl | sed 's#^\(\|[a-z]\+://\)[a-zA-Z0-9\.]\+\(\|\:[0-9]\+\)/##'`
 fi
 
 #TODO: Auto-detect hostname?
 if [ -z "$hostname" ]; then
-	continue
-	#Error "No hostname has been provided"
+    continue
+    #Error "No hostname has been provided"
 fi
 
 if [ -z "$arch" ]; then
-	arch=$(get_host_architecture)
+    arch=$(get_host_architecture)
 fi
 
 if [ -z "$subarch" ]; then
-	subarch=$(get_host_subarchitecture $arch)
+    subarch=$(get_host_subarchitecture $arch)
 fi
 
 if [ -n "$power_type" ]; then
-	case $power_type in
-		ipmi) continue ;;
-		virsh) continue ;;
-		etherwake) continue ;;
-		moonshot) continue ;;
-		*) Error "Invalid power type: [$power_type]"
-	esac
+    case $power_type in
+        ipmi) continue ;;
+        virsh) continue ;;
+        etherwake) continue ;;
+        moonshot) continue ;;
+        *) Error "Invalid power type: [$power_type]"
+    esac
 fi
 
-enlist_node "$protocol://$servername/$api_url" "${mac_addrs}" "$arch" "$subarch" "$hostname" "$power_type" "$power_parameters"
+if [ "$CURL" != "" ]; then
+    enlist_node_curl "$protocol://$servername/$api_url" "${mac_addrs}" "$arch" "$subarch" "$hostname" "$power_type" "$power_parameters"
+elif [ "$WGET" != "" ]; then
+    enlist_node_wget "$protocol://$servername/$api_url" "${mac_addrs}" "$arch" "$subarch" "$hostname" "$power_type" "$power_parameters"
+else
+    echo "Must install 'curl' or 'wget' to use this script."
+fi