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

[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.

=== modified file 'bin/maas-enlist'
--- bin/maas-enlist	2015-09-13 07:29:24 +0000
+++ bin/maas-enlist	2015-09-13 07:29:24 +0000
@@ -37,13 +37,22 @@
 	echo "$mac"
 }
 
-get_mac_address_parms() {
+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}"
-		#mac_address="$mac_address""&mac_addresses=""${i}";
 	done
 	echo "${args# }"
 }
@@ -79,17 +88,41 @@
 	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")
+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"
@@ -134,8 +167,11 @@
 
 bad_Usage() { Usage 1>&2; [ $# -eq 0 ] || Error "$@"; exit 1; }
 
+CURL=$(which curl)
+WGET=$(which wget)
+
 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}" ||
@@ -152,6 +188,8 @@
 		--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;
@@ -160,6 +198,7 @@
 ## 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)
@@ -213,4 +252,10 @@
 	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