Skip to content

Commit 23e49f6

Browse files
hrakhrak
committed
fix(tests): Fix the tests after GetTemplateID args changed
1 parent 74f1355 commit 23e49f6

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

‎pkg/cloud/instance_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ var _ = Describe("Instance", func() {
169169
Id: dummies.CSMachine1.Spec.Offering.ID,
170170
Name: dummies.CSMachine1.Spec.Offering.Name,
171171
}, 1, nil)
172-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
172+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
173173
Return("", -1, unknownError)
174174
Ω(client.GetOrCreateVMInstance(
175175
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
@@ -184,7 +184,7 @@ var _ = Describe("Instance", func() {
184184
Id: dummies.CSMachine1.Spec.Offering.ID,
185185
Name: dummies.CSMachine1.Spec.Offering.Name,
186186
}, 1, nil)
187-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return("", 2, nil)
187+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).Return("", 2, nil)
188188
Ω(client.GetOrCreateVMInstance(
189189
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
190190
ShouldNot(Succeed())
@@ -198,7 +198,7 @@ var _ = Describe("Instance", func() {
198198
Id: dummies.CSMachine1.Spec.Offering.ID,
199199
Name: dummies.CSMachine1.Spec.Offering.Name,
200200
}, 1, nil)
201-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
201+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
202202
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 2, nil)
203203
Ω(client.GetOrCreateVMInstance(
204204
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSFailureDomain1, dummies.CSAffinityGroup, "")).
@@ -212,7 +212,7 @@ var _ = Describe("Instance", func() {
212212
Id: dummies.CSMachine1.Spec.Offering.ID,
213213
Name: dummies.CSMachine1.Spec.Offering.Name,
214214
}, 1, nil)
215-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
215+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
216216
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
217217
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, unknownError)
218218
Ω(client.GetOrCreateVMInstance(
@@ -228,7 +228,7 @@ var _ = Describe("Instance", func() {
228228
Id: dummies.CSMachine1.Spec.Offering.ID,
229229
Name: dummies.CSMachine1.Spec.Offering.Name,
230230
}, 1, nil)
231-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
231+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
232232
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
233233
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
234234
Ω(client.GetOrCreateVMInstance(
@@ -246,7 +246,7 @@ var _ = Describe("Instance", func() {
246246
Cpunumber: 1,
247247
Memory: 1024,
248248
}, 1, nil)
249-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
249+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).Return(dummies.CSMachine1.Spec.Template.ID, 1, nil)
250250
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
251251
dos.EXPECT().GetDiskOfferingByID(diskOfferingFakeID).Return(&cloudstack.DiskOffering{Iscustomized: true}, 1, nil)
252252
Ω(client.GetOrCreateVMInstance(
@@ -433,7 +433,7 @@ var _ = Describe("Instance", func() {
433433
Cpunumber: 1,
434434
Memory: 1024,
435435
}, 1, nil)
436-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
436+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
437437
Return(templateFakeID, 1, nil)
438438
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).
439439
Return(diskOfferingFakeID, 1, nil)
@@ -504,7 +504,7 @@ var _ = Describe("Instance", func() {
504504
}, 1, nil)
505505
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
506506
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
507-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
507+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
508508
Return(templateFakeID, 1, nil)
509509

510510
ActionAndAssert()
@@ -522,7 +522,7 @@ var _ = Describe("Instance", func() {
522522
Cpunumber: 1,
523523
Memory: 1024,
524524
}, 1, nil)
525-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
525+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
526526
Return(templateFakeID, 1, nil)
527527

528528
ActionAndAssert()
@@ -540,7 +540,7 @@ var _ = Describe("Instance", func() {
540540
Cpunumber: 1,
541541
Memory: 1024,
542542
}, 1, nil)
543-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
543+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
544544
Return(templateFakeID, 1, nil)
545545
dos.EXPECT().GetDiskOfferingID(dummies.CSMachine1.Spec.DiskOffering.Name, gomock.Any()).Return(diskOfferingFakeID, 1, nil)
546546
dos.EXPECT().GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
@@ -696,7 +696,7 @@ var _ = Describe("Instance", func() {
696696
GetDiskOfferingByID(dummies.CSMachine1.Spec.DiskOffering.ID).
697697
Return(&cloudstack.DiskOffering{Iscustomized: false}, 1, nil)
698698
ts.EXPECT().
699-
GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
699+
GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID, gomock.Any()).
700700
Return(templateFakeID, 1, nil)
701701
vms.EXPECT().
702702
NewDeployVirtualMachineParams(offeringFakeID, templateFakeID, dummies.Zone1.ID).

0 commit comments

Comments
 (0)