Update to work with new version of github.com/kolo/xmlrpc

Author: sudorandom

helpers.go

@@ -1,20 +1,19 @@
 package xapi
 
 import (
-	"github.com/kolo/xmlrpc"
 	"log"
 	"reflect"
 	"strconv"
 	"unicode"
 	"unicode/utf8"
 )
 
-func unMarshallXmlRPC(in xmlrpc.Struct, out interface{}) {
+func unMarshallXmlRPC(in Struct, out interface{}) {
 	ov := reflect.Indirect(reflect.ValueOf(out))
 	iv := reflect.ValueOf(in["Value"])
 
 	if ov.Kind() == reflect.Struct {
-		setStruct(in["Value"].(xmlrpc.Struct), ov)
+		setStruct(in["Value"].(Struct), ov)
 		return
 	}
 
@@ -31,19 +30,19 @@ func unMarshallXmlRPC(in xmlrpc.Struct, out interface{}) {
 			}
 
 			if ov.Index(i).Kind() == reflect.Struct {
-				setStruct(a.(xmlrpc.Struct), ov.Index(i))
+				setStruct(a.(Struct), ov.Index(i))
 			} else {
 				ov.Index(i).Set(reflect.ValueOf(a))
 			}
 
 		}
 		return
-	case xmlrpc.Struct:
+	case Struct:
 		setStruct(in, ov)
 	}
 }
 
-func setStruct(in xmlrpc.Struct, str reflect.Value) {
+func setStruct(in Struct, str reflect.Value) {
 	for k, v := range in {
 		field := str.FieldByName(UF(k))
 		if !field.CanSet() || !field.IsValid() || v == nil {
@@ -61,7 +60,7 @@ func setStruct(in xmlrpc.Struct, str reflect.Value) {
 			setString(v, field)
 		case reflect.Map:
 			field.Set(reflect.MakeMap(field.Type()))
-			for a, b := range v.(xmlrpc.Struct) {
+			for a, b := range v.(Struct) {
 				if a == "" || b == nil {
 					continue
 				}

xapi.go

@@ -18,6 +18,8 @@ type XapiClient struct {
 	rpc      *xmlrpc.Client
 }
 
+type Struct map[string]interface{}
+
 // Stand up a new XapiClient.  Version should probably be "1.2" unless you know what you are doing.
 func NewXapiClient(uri, username, password, version string) (client XapiClient) {
 	client.Uri = uri
@@ -134,7 +136,7 @@ func TimeoutDialer() func(net, addr string) (c net.Conn, err error) {
 	}
 }
 
-// Make a generic RPC call passing in a pointer to a struct (or xmlrpc.Struct). The call parameter
+// Make a generic RPC call passing in a pointer to a struct (or f). The call parameter
 // is a combination of class.message.  For example: VIF.get_record, host.evacuate, pool.eject.
 // Any time the XAPI specifies a `type ref` it's really an OpaqueReference, which is a UUID, and
 // as far as xmlrpc and like library are concerned, a string.
@@ -145,14 +147,9 @@ func TimeoutDialer() func(net, addr string) (c net.Conn, err error) {
 //			fmt.Printf("%v", host)
 //		}
 func (client *XapiClient) RpcCall(result interface{}, call string, params ...interface{}) (err error) {
-	response := xmlrpc.Struct{}
-	p := xmlrpc.Params{}
-	p.Params = make([]interface{}, len(params))
-	for i, d := range params {
-		p.Params[i] = d
-	}
+	response := Struct{}
 
-	err = client.rpc.Call(call, p, &response)
+	err = client.rpc.Call(call, params, &response)
 
 	if err != nil {
 		return
@@ -171,7 +168,7 @@ func (client *XapiClient) RpcCall(result interface{}, call string, params ...int
 
 // checkResponse is a way to handle and return meaning status codes based on the payload since the body
 // of the response changes depending on if it's an error or a success.  This handled for you in RpcCall
-func checkResponse(res xmlrpc.Struct) error {
+func checkResponse(res Struct) error {
 	var success interface{}
 	var ok bool
 	var error_string interface{}