Skip to content

Commit 09d0034

Browse files
tintoytintoy
committed
Expose SCSI controllers on OS / customer images.
1 parent 66c07bf commit 09d0034

File tree

3 files changed

+45
-44
lines changed

3 files changed

+45
-44
lines changed

‎compute/customer_images.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@ type CustomerImages struct {
2727

2828
// CustomerImage represents a custom virtual machine image.
2929
type CustomerImage struct {
30-
ID string `json:"id"`
31-
Name string `json:"name"`
32-
Description string `json:"description"`
33-
DataCenterID string `json:"datacenterId"`
34-
OperatingSystem OperatingSystem `json:"operatingSystem"`
35-
CPU VirtualMachineCPU `json:"cpu"`
36-
MemoryGB int `json:"memoryGb"`
37-
Disks []VirtualMachineDisk `json:"disk"`
38-
CreateTime string `json:"createTime"`
39-
State string `json:"state"`
30+
ID string `json:"id"`
31+
Name string `json:"name"`
32+
Description string `json:"description"`
33+
DataCenterID string `json:"datacenterId"`
34+
OperatingSystem OperatingSystem `json:"operatingSystem"`
35+
CPU VirtualMachineCPU `json:"cpu"`
36+
MemoryGB int `json:"memoryGb"`
37+
SCSIControllers VirtualMachineSCSIControllers `json:"scsiControllers"`
38+
CreateTime string `json:"createTime"`
39+
State string `json:"state"`
4040
}
4141

4242
// GetID retrieves the image ID.
@@ -96,9 +96,9 @@ func (image *CustomerImage) ApplyTo(config *ServerDeploymentConfiguration) {
9696
config.ImageID = image.ID
9797
config.CPU = image.CPU
9898
config.MemoryGB = image.MemoryGB
99-
config.Disks = make([]VirtualMachineDisk, len(image.Disks))
100-
for index, disk := range image.Disks {
101-
config.Disks[index] = disk
99+
config.SCSIControllers = make(VirtualMachineSCSIControllers, len(image.SCSIControllers))
100+
for index, scsiController := range image.SCSIControllers {
101+
config.SCSIControllers[index] = scsiController
102102
}
103103
}
104104

@@ -130,7 +130,7 @@ func (client *Client) GetCustomerImage(id string) (image *CustomerImage, err err
130130
url.QueryEscape(organizationID),
131131
url.QueryEscape(id),
132132
)
133-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
133+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
134134
if err != nil {
135135
return nil, err
136136
}
@@ -175,7 +175,7 @@ func (client *Client) FindCustomerImage(name string, dataCenterID string) (image
175175
url.QueryEscape(name),
176176
url.QueryEscape(dataCenterID),
177177
)
178-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
178+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
179179
if err != nil {
180180
return nil, err
181181
}
@@ -225,7 +225,7 @@ func (client *Client) ListCustomerImagesInDatacenter(dataCenterID string, paging
225225
url.QueryEscape(dataCenterID),
226226
paging.EnsurePaging().toQueryParameters(),
227227
)
228-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
228+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
229229
if err != nil {
230230
return nil, err
231231
}

‎compute/os_images.go

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ import (
99

1010
// OSImage represents a DD-provided virtual machine image.
1111
type OSImage struct {
12-
ID string `json:"id"`
13-
Name string `json:"name"`
14-
Description string `json:"description"`
15-
DataCenterID string `json:"datacenterId"`
16-
OperatingSystem OperatingSystem `json:"operatingSystem"`
17-
CPU VirtualMachineCPU `json:"cpu"`
18-
MemoryGB int `json:"memoryGb"`
19-
Disks []VirtualMachineDisk `json:"disk"`
20-
State string `json:"state"`
21-
CreateTime string `json:"createTime"`
22-
OSImageKey string `json:"osImageKey"`
12+
ID string `json:"id"`
13+
Name string `json:"name"`
14+
Description string `json:"description"`
15+
DataCenterID string `json:"datacenterId"`
16+
OperatingSystem OperatingSystem `json:"operatingSystem"`
17+
CPU VirtualMachineCPU `json:"cpu"`
18+
MemoryGB int `json:"memoryGb"`
19+
SCSIControllers VirtualMachineSCSIControllers `json:"scsiController"`
20+
State string `json:"state"`
21+
CreateTime string `json:"createTime"`
22+
OSImageKey string `json:"osImageKey"`
2323
}
2424

2525
// GetID retrieves the image ID.
@@ -79,10 +79,11 @@ func (image *OSImage) ApplyTo(config *ServerDeploymentConfiguration) {
7979
config.ImageID = image.ID
8080
config.CPU = image.CPU
8181
config.MemoryGB = image.MemoryGB
82-
config.Disks = make([]VirtualMachineDisk, len(image.Disks))
83-
for index, disk := range image.Disks {
84-
config.Disks[index] = disk
82+
config.SCSIControllers = make(VirtualMachineSCSIControllers, len(image.SCSIControllers))
83+
for index, scsiController := range image.SCSIControllers {
84+
config.SCSIControllers[index] = scsiController
8585
}
86+
8687
}
8788

8889
var _ Image = &OSImage{}
@@ -116,7 +117,7 @@ func (client *Client) GetOSImage(id string) (image *OSImage, err error) {
116117
url.QueryEscape(organizationID),
117118
url.QueryEscape(id),
118119
)
119-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
120+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
120121
if err != nil {
121122
return nil, err
122123
}
@@ -161,7 +162,7 @@ func (client *Client) FindOSImage(name string, dataCenterID string) (image *OSIm
161162
url.QueryEscape(name),
162163
url.QueryEscape(dataCenterID),
163164
)
164-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
165+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
165166
if err != nil {
166167
return nil, err
167168
}
@@ -211,7 +212,7 @@ func (client *Client) ListOSImagesInDatacenter(dataCenterID string, paging *Pagi
211212
url.QueryEscape(dataCenterID),
212213
paging.EnsurePaging().toQueryParameters(),
213214
)
214-
request, err := client.newRequestV22(requestURI, http.MethodGet, nil)
215+
request, err := client.newRequestV25(requestURI, http.MethodGet, nil)
215216
if err != nil {
216217
return nil, err
217218
}

‎compute/servers.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,17 +115,17 @@ func (serverSummary *ServerSummary) ToEntityReference() EntityReference {
115115

116116
// ServerDeploymentConfiguration represents the configuration for deploying a virtual machine.
117117
type ServerDeploymentConfiguration struct {
118-
Name string `json:"name"`
119-
Description string `json:"description"`
120-
ImageID string `json:"imageId"`
121-
AdministratorPassword string `json:"administratorPassword"`
122-
CPU VirtualMachineCPU `json:"cpu"`
123-
MemoryGB int `json:"memoryGb,omitempty"`
124-
Disks []VirtualMachineDisk `json:"disk"`
125-
Network VirtualMachineNetwork `json:"networkInfo"`
126-
PrimaryDNS string `json:"primaryDns,omitempty"`
127-
SecondaryDNS string `json:"secondaryDns,omitempty"`
128-
Start bool `json:"start"`
118+
Name string `json:"name"`
119+
Description string `json:"description"`
120+
ImageID string `json:"imageId"`
121+
AdministratorPassword string `json:"administratorPassword"`
122+
CPU VirtualMachineCPU `json:"cpu"`
123+
MemoryGB int `json:"memoryGb,omitempty"`
124+
SCSIControllers VirtualMachineSCSIControllers `json:"scsiController"`
125+
Network VirtualMachineNetwork `json:"networkInfo"`
126+
PrimaryDNS string `json:"primaryDns,omitempty"`
127+
SecondaryDNS string `json:"secondaryDns,omitempty"`
128+
Start bool `json:"start"`
129129
}
130130

131131
// editServerMetadata represents the request body when modifying server metadata.

0 commit comments

Comments
 (0)