Skip to content

Commit 377784a

Browse files
vishesh92vishesh92
committed
Fix tests
1 parent 919ef06 commit 377784a

File tree

4 files changed

+158
-46
lines changed

4 files changed

+158
-46
lines changed

‎pkg/cloud/client.go

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ type SecretConfig struct {
7474
var clientCache *ttlcache.Cache
7575
var cacheMutex sync.Mutex
7676

77+
var NewAsyncClient = cloudstack.NewAsyncClient
78+
var NewClient = cloudstack.NewClient
79+
7780
const ClientConfigMapName = "capc-client-config"
7881
const ClientConfigMapNamespace = "capc-system"
7982
const ClientCacheTTLKey = "client-cache-ttl"
@@ -169,8 +172,8 @@ func NewClientFromConf(conf Config, clientConfig *corev1.ConfigMap) (Client, err
169172
// a client returned from NewClient works in an asynchronous way. Dive into the constructor definition
170173
// comments for more details
171174
c := &client{config: conf}
172-
c.cs = cloudstack.NewAsyncClient(conf.APIUrl, conf.APIKey, conf.SecretKey, verifySSL)
173-
c.csAsync = cloudstack.NewClient(conf.APIUrl, conf.APIKey, conf.SecretKey, verifySSL)
175+
c.cs = NewClient(conf.APIUrl, conf.APIKey, conf.SecretKey, verifySSL)
176+
c.csAsync = NewAsyncClient(conf.APIUrl, conf.APIKey, conf.SecretKey, verifySSL)
174177
c.customMetrics = metrics.NewCustomMetrics()
175178

176179
p := c.cs.User.NewListUsersParams()
@@ -217,9 +220,24 @@ func (c *client) NewClientInDomainAndAccount(domain string, account string) (Cli
217220
return NewClientFromConf(c.config, nil)
218221
}
219222

220-
// NewClientFromCSAPIClient creates a client from a CloudStack-Go API client. Mostly used for testing.
223+
// NewClientFromCSAPIClient creates a client from a CloudStack-Go API client. Used only for testing.
221224
func NewClientFromCSAPIClient(cs *cloudstack.CloudStackClient) Client {
222-
c := &client{cs: cs, csAsync: cs, customMetrics: metrics.NewCustomMetrics()}
225+
c := &client{
226+
cs: cs,
227+
csAsync: cs,
228+
customMetrics: metrics.NewCustomMetrics(),
229+
user: &User{
230+
Account: Account{
231+
Domain: Domain{
232+
CPUAvailable: "Unlimited",
233+
MemoryAvailable: "Unlimited",
234+
VMAvailable: "Unlimited",
235+
},
236+
CPUAvailable: "Unlimited",
237+
MemoryAvailable: "Unlimited",
238+
VMAvailable: "Unlimited",
239+
},
240+
}}
223241
return c
224242
}
225243

‎pkg/cloud/client_test.go

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,12 @@ import (
2222

2323
corev1 "k8s.io/api/core/v1"
2424

25+
"github.com/apache/cloudstack-go/v2/cloudstack"
26+
"github.com/golang/mock/gomock"
2527
. "github.com/onsi/ginkgo/v2"
2628
. "github.com/onsi/gomega"
2729
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
30+
dummies "sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies/v1beta1"
2831
"sigs.k8s.io/cluster-api-provider-cloudstack/test/helpers"
2932
)
3033

@@ -36,9 +39,20 @@ type Global struct {
3639

3740
var _ = Describe("Client", func() {
3841

39-
var ()
42+
var (
43+
mockCtrl *gomock.Controller
44+
mockClient *cloudstack.CloudStackClient
45+
us *cloudstack.MockUserServiceIface
46+
ds *cloudstack.MockDomainServiceIface
47+
as *cloudstack.MockAccountServiceIface
48+
)
4049

4150
BeforeEach(func() {
51+
mockCtrl = gomock.NewController(GinkgoT())
52+
mockClient = cloudstack.NewMockClient(mockCtrl)
53+
us = mockClient.User.(*cloudstack.MockUserServiceIface)
54+
ds = mockClient.Domain.(*cloudstack.MockDomainServiceIface)
55+
as = mockClient.Account.(*cloudstack.MockAccountServiceIface)
4256
})
4357

4458
AfterEach(func() {
@@ -100,10 +114,48 @@ var _ = Describe("Client", func() {
100114

101115
Context("NewClientFromConf", func() {
102116
clientConfig := &corev1.ConfigMap{}
117+
cloud.NewAsyncClient = func(apiurl, apikey, secret string, verifyssl bool, options ...cloudstack.ClientOption) *cloudstack.CloudStackClient {
118+
return mockClient
119+
}
120+
cloud.NewClient = func(apiurl, apikey, secret string, verifyssl bool, options ...cloudstack.ClientOption) *cloudstack.CloudStackClient {
121+
return mockClient
122+
}
103123

104124
BeforeEach(func() {
105125
clientConfig.Data = map[string]string{}
106126
clientConfig.Data[cloud.ClientCacheTTLKey] = "100ms"
127+
fakeListParams := &cloudstack.ListUsersParams{}
128+
fakeUser := &cloudstack.User{
129+
Id: dummies.UserID,
130+
Account: dummies.AccountName,
131+
Domain: dummies.DomainName,
132+
}
133+
us.EXPECT().NewListUsersParams().Return(fakeListParams).AnyTimes()
134+
us.EXPECT().ListUsers(fakeListParams).Return(&cloudstack.ListUsersResponse{
135+
Count: 1, Users: []*cloudstack.User{fakeUser},
136+
}, nil).AnyTimes()
137+
138+
dsp := &cloudstack.ListDomainsParams{}
139+
ds.EXPECT().NewListDomainsParams().Return(dsp).AnyTimes()
140+
ds.EXPECT().ListDomains(dsp).Return(&cloudstack.ListDomainsResponse{Count: 1, Domains: []*cloudstack.Domain{{
141+
Id: dummies.DomainID,
142+
Name: dummies.DomainName,
143+
Path: dummies.DomainPath,
144+
}}}, nil).AnyTimes()
145+
146+
asp := &cloudstack.ListAccountsParams{}
147+
as.EXPECT().NewListAccountsParams().Return(asp).AnyTimes()
148+
as.EXPECT().ListAccounts(asp).Return(&cloudstack.ListAccountsResponse{Count: 1, Accounts: []*cloudstack.Account{{
149+
Id: dummies.AccountID,
150+
Name: dummies.AccountName,
151+
}}}, nil).AnyTimes()
152+
ukp := &cloudstack.GetUserKeysParams{}
153+
us.EXPECT().NewGetUserKeysParams(gomock.Any()).Return(ukp).AnyTimes()
154+
us.EXPECT().GetUserKeys(ukp).Return(&cloudstack.GetUserKeysResponse{
155+
Apikey: dummies.Apikey,
156+
Secretkey: dummies.SecretKey,
157+
}, nil).AnyTimes()
158+
107159
})
108160

109161
It("Returns a new client", func() {
@@ -138,18 +190,5 @@ var _ = Describe("Client", func() {
138190
result2, _ := cloud.NewClientFromConf(config2, clientConfig)
139191
Ω(result1).Should(Equal(result2))
140192
})
141-
142-
It("Returns a new client after cache expiration", func() {
143-
config1 := cloud.Config{
144-
APIUrl: "http://5.5.5.5",
145-
}
146-
config2 := cloud.Config{
147-
APIUrl: "http://5.5.5.5",
148-
}
149-
result1, _ := cloud.NewClientFromConf(config1, clientConfig)
150-
time.Sleep(150 * time.Millisecond)
151-
result2, _ := cloud.NewClientFromConf(config2, clientConfig)
152-
Ω(result1).ShouldNot(Equal(result2))
153-
})
154193
})
155194
})

‎pkg/cloud/instance.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ func verifyDiskoffering(csMachine *infrav1.CloudStackMachine, c *client, diskOff
208208
}
209209

210210
// CheckAccountLimits Checks the account's limit of VM, CPU & Memory
211-
// before deploying a VM.
212211
func (c *client) CheckAccountLimits(fd *infrav1.CloudStackFailureDomain, offering cloudstack.ServiceOffering) error {
213212
if c.user.Account.CPUAvailable != "Unlimited" {
214213
cpuAvailable, err := strconv.ParseInt(c.user.Account.CPUAvailable, 10, 0)
@@ -234,7 +233,6 @@ func (c *client) CheckAccountLimits(fd *infrav1.CloudStackFailureDomain, offerin
234233
}
235234

236235
// CheckDomainLimits Checks the domain's limit of VM, CPU & Memory
237-
// before deploying a VM.
238236
func (c *client) CheckDomainLimits(fd *infrav1.CloudStackFailureDomain, offering cloudstack.ServiceOffering) error {
239237
if c.user.Account.Domain.CPUAvailable != "Unlimited" {
240238
cpuAvailable, err := strconv.ParseInt(c.user.Account.Domain.CPUAvailable, 10, 0)
@@ -259,8 +257,8 @@ func (c *client) CheckDomainLimits(fd *infrav1.CloudStackFailureDomain, offering
259257
return nil
260258
}
261259

262-
// GetOrCreateVMInstance CreateVMInstance will fetch or create a VM instance, and
263-
// sets the infrastructure machine spec and status accordingly.
260+
// CheckLimitsAndCreateVM will check the account & domain limits and then create a
261+
// VM instance, and sets the infrastructure machine spec and status accordingly.
264262
func (c *client) CheckLimitsAndCreateVM(
265263
csMachine *infrav1.CloudStackMachine,
266264
capiMachine *clusterv1.Machine,

‎pkg/cloud/instance_test.go

Lines changed: 81 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -144,24 +144,30 @@ var _ = Describe("Instance", func() {
144144

145145
It("returns errors occurring while fetching service offering information", func() {
146146
expectVMNotFound()
147-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return("", -1, unknownError)
147+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{}, -1, unknownError)
148148
Ω(client.GetOrCreateVMInstance(
149149
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
150150
ShouldNot(Succeed())
151151
})
152152

153153
It("returns errors if more than one service offering found", func() {
154154
expectVMNotFound()
155-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return("", 2, nil)
155+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{
156+
Id: dummies.CSMachine1.Spec.Offering.ID,
157+
Name: dummies.CSMachine1.Spec.Offering.Name,
158+
}, 2, nil)
156159
Ω(client.GetOrCreateVMInstance(
157160
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
158161
ShouldNot(Succeed())
159162
})
160163

161164
It("returns errors while fetching template", func() {
162165
expectVMNotFound()
163-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
164-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
166+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
167+
Return(&cloudstack.ServiceOffering{
168+
Id: dummies.CSMachine1.Spec.Offering.ID,
169+
Name: dummies.CSMachine1.Spec.Offering.Name,
170+
}, 1, nil)
165171
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
166172
Return("", -1, unknownError)
167173
Ω(client.GetOrCreateVMInstance(
@@ -171,8 +177,11 @@ var _ = Describe("Instance", func() {
171177

172178
It("returns errors when more than one template found", func() {
173179
expectVMNotFound()
174-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
175-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
180+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
181+
Return(&cloudstack.ServiceOffering{
182+
Id: dummies.CSMachine1.Spec.Offering.ID,
183+
Name: dummies.CSMachine1.Spec.Offering.Name,
184+
}, 1, nil)
176185
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return("", 2, nil)
177186
Ω(client.GetOrCreateVMInstance(
178187
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
@@ -181,8 +190,11 @@ var _ = Describe("Instance", func() {
181190

182191
It("returns errors when more than one diskoffering found", func() {
183192
expectVMNotFound()
184-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
185-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
193+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
194+
Return(&cloudstack.ServiceOffering{
195+
Id: dummies.CSMachine1.Spec.Offering.ID,
196+
Name: dummies.CSMachine1.Spec.Offering.Name,
197+
}, 1, nil)
186198
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
187199
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 2, nil)
188200
Ω(client.GetOrCreateVMInstance(
@@ -192,8 +204,11 @@ var _ = Describe("Instance", func() {
192204

193205
It("returns errors when fetching diskoffering", func() {
194206
expectVMNotFound()
195-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
196-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
207+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
208+
Return(&cloudstack.ServiceOffering{
209+
Id: dummies.CSMachine1.Spec.Offering.ID,
210+
Name: dummies.CSMachine1.Spec.Offering.Name,
211+
}, 1, nil)
197212
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
198213
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
199214
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, unknownError)
@@ -205,8 +220,11 @@ var _ = Describe("Instance", func() {
205220
It("returns errors when disk size not zero for non-customized disk offering", func() {
206221
expectVMNotFound()
207222
dummies.CSMachine1.Spec.DiskOffering.CustomSize = 1
208-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
209-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
223+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
224+
Return(&cloudstack.ServiceOffering{
225+
Id: dummies.CSMachine1.Spec.Offering.ID,
226+
Name: dummies.CSMachine1.Spec.Offering.Name,
227+
}, 1, nil)
210228
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
211229
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
212230
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
@@ -218,8 +236,13 @@ var _ = Describe("Instance", func() {
218236
It("returns errors when disk size zero for customized disk offering", func() {
219237
expectVMNotFound()
220238
dummies.CSMachine1.Spec.DiskOffering.CustomSize = 0
221-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
222-
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
239+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
240+
Return(&cloudstack.ServiceOffering{
241+
Id: dummies.CSMachine1.Spec.Offering.ID,
242+
Name: dummies.CSMachine1.Spec.Offering.Name,
243+
Cpunumber: 1,
244+
Memory: 1024,
245+
}, 1, nil)
223246
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
224247
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
225248
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: true}, 1, nil)
@@ -230,8 +253,13 @@ var _ = Describe("Instance", func() {
230253

231254
It("handles deployment errors", func() {
232255
expectVMNotFound()
233-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
234-
Return(offeringFakeID, 1, nil)
256+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
257+
Return(&cloudstack.ServiceOffering{
258+
Id: offeringFakeID,
259+
Name: dummies.CSMachine1.Spec.Offering.Name,
260+
Cpunumber: 1,
261+
Memory: 1024,
262+
}, 1, nil)
235263
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
236264
Return(templateFakeID, 1, nil)
237265
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).
@@ -296,7 +324,11 @@ var _ = Describe("Instance", func() {
296324
dummies.CSMachine1.Spec.Offering.Name = "offering"
297325
dummies.CSMachine1.Spec.Template.Name = "template"
298326

299-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(offeringFakeID, 1, nil)
327+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{
328+
Id: offeringFakeID,
329+
Cpunumber: 1,
330+
Memory: 1024,
331+
}, 1, nil)
300332
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
301333
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
302334
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
@@ -312,7 +344,11 @@ var _ = Describe("Instance", func() {
312344
dummies.CSMachine1.Spec.Template.Name = "template"
313345
dummies.CSMachine1.Spec.DiskOffering = infrav1.CloudStackResourceDiskOffering{}
314346

315-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(offeringFakeID, 1, nil)
347+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{
348+
Id: offeringFakeID,
349+
Cpunumber: 1,
350+
Memory: 1024,
351+
}, 1, nil)
316352
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
317353
Return(templateFakeID, 1, nil)
318354

@@ -326,7 +362,11 @@ var _ = Describe("Instance", func() {
326362
dummies.CSMachine1.Spec.Offering.Name = ""
327363
dummies.CSMachine1.Spec.Template.Name = "template"
328364

329-
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: ""}, 1, nil)
365+
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{
366+
Id: offeringFakeID,
367+
Cpunumber: 1,
368+
Memory: 1024,
369+
}, 1, nil)
330370
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
331371
Return(templateFakeID, 1, nil)
332372
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
@@ -342,7 +382,11 @@ var _ = Describe("Instance", func() {
342382
dummies.CSMachine1.Spec.Offering.Name = "offering"
343383
dummies.CSMachine1.Spec.Template.Name = ""
344384

345-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(offeringFakeID, 1, nil)
385+
sos.EXPECT().GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).Return(&cloudstack.ServiceOffering{
386+
Id: offeringFakeID,
387+
Cpunumber: 1,
388+
Memory: 1024,
389+
}, 1, nil)
346390
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: ""}, 1, nil)
347391
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
348392
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
@@ -358,7 +402,11 @@ var _ = Describe("Instance", func() {
358402
dummies.CSMachine1.Spec.Template.Name = ""
359403

360404
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).
361-
Return(&cloudstack.ServiceOffering{Name: "offering"}, 1, nil)
405+
Return(&cloudstack.ServiceOffering{
406+
Id: offeringFakeID,
407+
Cpunumber: 1,
408+
Memory: 1024,
409+
}, 1, nil)
362410
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).
363411
Return(diskOfferingFakeID, 1, nil)
364412
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).
@@ -376,7 +424,12 @@ var _ = Describe("Instance", func() {
376424
dummies.CSMachine1.Spec.Offering.Name = "offering"
377425
dummies.CSMachine1.Spec.Template.Name = "template"
378426

379-
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: "offering"}, 1, nil)
427+
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{
428+
Id: dummies.CSMachine1.Spec.Offering.ID,
429+
Name: dummies.CSMachine1.Spec.Offering.Name,
430+
Cpunumber: 1,
431+
Memory: 1024,
432+
}, 1, nil)
380433
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: "template"}, 1, nil)
381434
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
382435
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
@@ -457,8 +510,12 @@ var _ = Describe("Instance", func() {
457510
GetVirtualMachinesMetricByName(dummies.CSMachine1.Name).
458511
Return(nil, -1, notFoundError)
459512
sos.EXPECT().
460-
GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
461-
Return(offeringFakeID, 1, nil)
513+
GetServiceOfferingByName(dummies.CSMachine1.Spec.Offering.Name, gomock.Any()).
514+
Return(&cloudstack.ServiceOffering{
515+
Id: offeringFakeID,
516+
Cpunumber: 1,
517+
Memory: 1024,
518+
}, 1, nil)
462519
dos.EXPECT().
463520
GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).
464521
Return(diskOfferingFakeID, 1, nil)

0 commit comments

Comments
 (0)