Add support for more API calls

Peter Jönsson · Peter Jönsson · commit a28415df77a8 · 2014-01-15T01:03:52.000+01:00
* listDiskOfferings
 * detachIso

Added to be able to boot from ISO to kickstart installation from an
empty block device.
diff --git a/client.go b/client.go
@@ -123,6 +123,16 @@ func NewRequest(c CloudStackClient, request string, params url.Values) (interfac
 		json.Unmarshal(body, &decodedResponse)
 		return decodedResponse, nil
 
+	case "listDiskOfferings":
+		var decodedResponse ListDiskOfferingsResponse
+		json.Unmarshal(body, &decodedResponse)
+		return decodedResponse, nil
+
+	case "detachIso":
+		var decodedResponse DetachIsoResponse
+		json.Unmarshal(body, &decodedResponse)
+		return decodedResponse, nil
+
 	case "queryAsyncJobResult":
 		var decodedResponse QueryAsyncJobResultResponse
 		json.Unmarshal(body, &decodedResponse)
diff --git a/disk.go b/disk.go
@@ -0,0 +1,32 @@
+package gopherstack
+
+import (
+	"net/url"
+)
+
+func (c CloudStackClient) ListDiskOfferings(domainid string, id string, keyword string, name string, page string, pagesize string) (string, error) {
+	params := url.Values{}
+	//params.Set("domainid", domainid)
+	_, err := NewRequest(c, "listDiskOfferings", params)
+	if err != nil {
+		return "", err
+	}
+	return "", err
+}
+
+type DiskOffering struct {
+	Created      string  `json:"created"`
+	Disksize     float64 `json:"disksize"`
+	Displaytext  string  `json:"displaytext"`
+	ID           string  `json:"id"`
+	Iscustomized bool    `json:"iscustomized"`
+	Name         string  `json:"name"`
+	Storagetype  string  `json:"storagetype"`
+}
+
+type ListDiskOfferingsResponse struct {
+	Listdiskofferingsresponse struct {
+		Count        float64        `json:"count"`
+		Diskoffering []DiskOffering `json:"diskoffering"`
+	} `json:"listdiskofferingsresponse"`
+}
diff --git a/iso.go b/iso.go
@@ -21,12 +21,12 @@ func (c CloudStackClient) AttachIso(isoid string, vmid string) (string, error) {
 func (c CloudStackClient) DetachIso(vmid string) (string, error) {
 	params := url.Values{}
 	params.Set("virtualmachineid", vmid)
-	_, err := NewRequest(c, "detachIso", params)
+	response, err := NewRequest(c, "detachIso", params)
 	if err != nil {
 		return "", err
 	}
-	//jobid := response.(DetachIsoResponse).DetachIsoresponse.Jobid
-	return "", err
+	jobid := response.(DetachIsoResponse).Detachisoresponse.Jobid
+	return jobid, err
 }
 
 func (c CloudStackClient) ListIsos() (string, error) {
@@ -37,3 +37,9 @@ func (c CloudStackClient) ListIsos() (string, error) {
 	//jobid := response.(ListIsosResponse).Listisosresponse.Jobid
 	return "", err
 }
+
+type DetachIsoResponse struct {
+	Detachisoresponse struct {
+		Jobid string `json:"jobid"`
+	} `json:"detachisoresponse"`
+}
diff --git a/virtualmachine.go b/virtualmachine.go
@@ -7,21 +7,19 @@ import (
 )
 
 // Deploys a Virtual Machine and returns it's id
-func (c CloudStackClient) DeployVirtualMachine(serviceofferingid string, templateid string, zoneid string, networkids []string, keypair string, displayname string, diskoffering string, projectid string, userdata string) (string, string, error) {
+func (c CloudStackClient) DeployVirtualMachine(serviceofferingid string, templateid string, zoneid string, account string, diskofferingid string, displayname string, networkids []string, keypair string, projectid string, userdata string) (string, string, error) {
 	params := url.Values{}
 	params.Set("serviceofferingid", serviceofferingid)
 	params.Set("templateid", templateid)
 	params.Set("zoneid", zoneid)
+	//	params.Set("account", account)
+	params.Set("diskofferingid", diskofferingid)
+	params.Set("displayname", displayname)
+	params.Set("hypervisor", "xenserver")
 	params.Set("networkids", strings.Join(networkids, ","))
 	params.Set("keypair", keypair)
-	params.Set("displayname", displayname)
+	//	parsms.Set("projectid", projectid)
 	params.Set("userdata", base64.StdEncoding.EncodeToString([]byte(userdata)))
-	if projectid != "" {
-		params.Set("projectid", projectid)
-	}
-	if diskoffering != "" {
-		params.Set("diskoffering", diskoffering)
-	}
 	response, err := NewRequest(c, "deployVirtualMachine", params)
 	if err != nil {
 		return "", "", err
@@ -31,6 +29,21 @@ func (c CloudStackClient) DeployVirtualMachine(serviceofferingid string, templat
 	return vmid, jobid, nil
 }
 
+func (c CloudStackClient) UpdateVirtualMachine(id string, displayname string, group string, haenable string, ostypeid string, userdata string) (string, error) {
+	params := url.Values{}
+	params.Set("id", id)
+	params.Set("displayname", displayname)
+	//	params.Set("group", string)
+	//	params.Set("haenable", haenable)
+	//	params.Set("ostypeid", ostypeid)
+	params.Set("userdata", base64.StdEncoding.EncodeToString([]byte(userdata)))
+	_, err := NewRequest(c, "updateVirtualMachine", params)
+	if err != nil {
+		return "", err
+	}
+	return "", err
+}
+
 // Stops a Virtual Machine
 func (c CloudStackClient) StopVirtualMachine(id string) (string, error) {
 	params := url.Values{}
