@@ -48,7 +48,6 @@ var _ = Describe("Instance", func() {
48
48
var (
49
49
mockCtrl * gomock.Controller
50
50
mockClient * cloudstack.CloudStackClient
51
- as * cloudstack.MockAddressServiceIface
52
51
vms * cloudstack.MockVirtualMachineServiceIface
53
52
sos * cloudstack.MockServiceOfferingServiceIface
54
53
dos * cloudstack.MockDiskOfferingServiceIface
@@ -65,7 +64,6 @@ var _ = Describe("Instance", func() {
65
64
dos = mockClient .DiskOffering .(* cloudstack.MockDiskOfferingServiceIface )
66
65
ts = mockClient .Template .(* cloudstack.MockTemplateServiceIface )
67
66
vs = mockClient .Volume .(* cloudstack.MockVolumeServiceIface )
68
- as = mockClient .Address .(* cloudstack.MockAddressServiceIface )
69
67
client = cloud .NewClientFromCSAPIClient (mockClient , nil )
70
68
71
69
dummies .SetDummyVars ()
@@ -129,13 +127,6 @@ var _ = Describe("Instance", func() {
129
127
vms .EXPECT ().GetVirtualMachinesMetricByID (* dummies .CSMachine1 .Spec .InstanceID ).Return (nil , - 1 , notFoundError )
130
128
vms .EXPECT ().GetVirtualMachinesMetricByName (dummies .CSMachine1 .Name ).Return (nil , - 1 , notFoundError )
131
129
}
132
- expectPublicIPAddress := func () {
133
- aslp := & cloudstack.ListPublicIpAddressesParams {}
134
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
135
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
136
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
137
- }, nil )
138
- }
139
130
140
131
It ("doesn't re-create if one already exists." , func () {
141
132
vms .EXPECT ().GetVirtualMachinesMetricByID (* dummies .CSMachine1 .Spec .InstanceID ).Return (vmMetricResp , - 1 , nil )
@@ -153,29 +144,14 @@ var _ = Describe("Instance", func() {
153
144
154
145
It ("returns errors occurring while fetching service offering information" , func () {
155
146
expectVMNotFound ()
156
- expectPublicIPAddress ()
157
147
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).Return (& cloudstack.ServiceOffering {}, - 1 , unknownError )
158
148
Ω (client .GetOrCreateVMInstance (
159
149
dummies .CSMachine1 , dummies .CAPIMachine , dummies .CSCluster , dummies .CSFailureDomain1 , dummies .CSAffinityGroup , "" )).
160
150
ShouldNot (Succeed ())
161
151
})
162
152
163
- It ("returns errors occurring if not enough public IPs available" , func () {
164
- expectVMNotFound ()
165
-
166
- aslp := & cloudstack.ListPublicIpAddressesParams {}
167
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
168
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
169
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Allocated" }},
170
- }, nil )
171
- Ω (client .GetOrCreateVMInstance (
172
- dummies .CSMachine1 , dummies .CAPIMachine , dummies .CSCluster , dummies .CSFailureDomain1 , dummies .CSAffinityGroup , "" )).
173
- ShouldNot (Succeed ())
174
- })
175
-
176
153
It ("returns errors if more than one service offering found" , func () {
177
154
expectVMNotFound ()
178
- expectPublicIPAddress ()
179
155
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).Return (& cloudstack.ServiceOffering {
180
156
Id : dummies .CSMachine1 .Spec .Offering .ID ,
181
157
Name : dummies .CSMachine1 .Spec .Offering .Name ,
@@ -187,7 +163,7 @@ var _ = Describe("Instance", func() {
187
163
188
164
It ("returns errors while fetching template" , func () {
189
165
expectVMNotFound ()
190
- expectPublicIPAddress ()
166
+
191
167
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
192
168
Return (& cloudstack.ServiceOffering {
193
169
Id : dummies .CSMachine1 .Spec .Offering .ID ,
@@ -202,7 +178,7 @@ var _ = Describe("Instance", func() {
202
178
203
179
It ("returns errors when more than one template found" , func () {
204
180
expectVMNotFound ()
205
- expectPublicIPAddress ()
181
+
206
182
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
207
183
Return (& cloudstack.ServiceOffering {
208
184
Id : dummies .CSMachine1 .Spec .Offering .ID ,
@@ -216,7 +192,7 @@ var _ = Describe("Instance", func() {
216
192
217
193
It ("returns errors when more than one diskoffering found" , func () {
218
194
expectVMNotFound ()
219
- expectPublicIPAddress ()
195
+
220
196
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
221
197
Return (& cloudstack.ServiceOffering {
222
198
Id : dummies .CSMachine1 .Spec .Offering .ID ,
@@ -231,7 +207,6 @@ var _ = Describe("Instance", func() {
231
207
232
208
It ("returns errors when fetching diskoffering" , func () {
233
209
expectVMNotFound ()
234
- expectPublicIPAddress ()
235
210
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
236
211
Return (& cloudstack.ServiceOffering {
237
212
Id : dummies .CSMachine1 .Spec .Offering .ID ,
@@ -247,7 +222,6 @@ var _ = Describe("Instance", func() {
247
222
248
223
It ("returns errors when disk size not zero for non-customized disk offering" , func () {
249
224
expectVMNotFound ()
250
- expectPublicIPAddress ()
251
225
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 1
252
226
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
253
227
Return (& cloudstack.ServiceOffering {
@@ -264,7 +238,6 @@ var _ = Describe("Instance", func() {
264
238
265
239
It ("returns errors when disk size zero for customized disk offering" , func () {
266
240
expectVMNotFound ()
267
- expectPublicIPAddress ()
268
241
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
269
242
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
270
243
Return (& cloudstack.ServiceOffering {
@@ -284,7 +257,6 @@ var _ = Describe("Instance", func() {
284
257
Context ("when account & domains have limits" , func () {
285
258
It ("returns errors when there are not enough available CPU in account" , func () {
286
259
expectVMNotFound ()
287
- expectPublicIPAddress ()
288
260
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
289
261
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
290
262
Return (& cloudstack.ServiceOffering {
@@ -313,7 +285,6 @@ var _ = Describe("Instance", func() {
313
285
314
286
It ("returns errors when there are not enough available CPU in domain" , func () {
315
287
expectVMNotFound ()
316
- expectPublicIPAddress ()
317
288
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
318
289
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
319
290
Return (& cloudstack.ServiceOffering {
@@ -342,7 +313,6 @@ var _ = Describe("Instance", func() {
342
313
343
314
It ("returns errors when there is not enough available memory in account" , func () {
344
315
expectVMNotFound ()
345
- expectPublicIPAddress ()
346
316
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
347
317
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
348
318
Return (& cloudstack.ServiceOffering {
@@ -371,7 +341,6 @@ var _ = Describe("Instance", func() {
371
341
372
342
It ("returns errors when there is not enough available memory in domain" , func () {
373
343
expectVMNotFound ()
374
- expectPublicIPAddress ()
375
344
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
376
345
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
377
346
Return (& cloudstack.ServiceOffering {
@@ -400,7 +369,6 @@ var _ = Describe("Instance", func() {
400
369
401
370
It ("returns errors when there is not enough available VM limit in account" , func () {
402
371
expectVMNotFound ()
403
- expectPublicIPAddress ()
404
372
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
405
373
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
406
374
Return (& cloudstack.ServiceOffering {
@@ -429,7 +397,6 @@ var _ = Describe("Instance", func() {
429
397
430
398
It ("returns errors when there is not enough available VM limit in domain" , func () {
431
399
expectVMNotFound ()
432
- expectPublicIPAddress ()
433
400
dummies .CSMachine1 .Spec .DiskOffering .CustomSize = 0
434
401
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
435
402
Return (& cloudstack.ServiceOffering {
@@ -459,7 +426,6 @@ var _ = Describe("Instance", func() {
459
426
460
427
It ("handles deployment errors" , func () {
461
428
expectVMNotFound ()
462
- expectPublicIPAddress ()
463
429
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
464
430
Return (& cloudstack.ServiceOffering {
465
431
Id : offeringFakeID ,
@@ -531,11 +497,6 @@ var _ = Describe("Instance", func() {
531
497
dummies .CSMachine1 .Spec .Offering .Name = "offering"
532
498
dummies .CSMachine1 .Spec .Template .Name = "template"
533
499
534
- aslp := & cloudstack.ListPublicIpAddressesParams {}
535
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
536
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
537
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
538
- }, nil )
539
500
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).Return (& cloudstack.ServiceOffering {
540
501
Id : offeringFakeID ,
541
502
Cpunumber : 1 ,
@@ -556,11 +517,6 @@ var _ = Describe("Instance", func() {
556
517
dummies .CSMachine1 .Spec .Template .Name = "template"
557
518
dummies .CSMachine1 .Spec .DiskOffering = infrav1.CloudStackResourceDiskOffering {}
558
519
559
- aslp := & cloudstack.ListPublicIpAddressesParams {}
560
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
561
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
562
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
563
- }, nil )
564
520
sos .EXPECT ().GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).Return (& cloudstack.ServiceOffering {
565
521
Id : offeringFakeID ,
566
522
Cpunumber : 1 ,
@@ -579,11 +535,6 @@ var _ = Describe("Instance", func() {
579
535
dummies .CSMachine1 .Spec .Offering .Name = ""
580
536
dummies .CSMachine1 .Spec .Template .Name = "template"
581
537
582
- aslp := & cloudstack.ListPublicIpAddressesParams {}
583
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
584
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
585
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
586
- }, nil )
587
538
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).Return (& cloudstack.ServiceOffering {
588
539
Id : offeringFakeID ,
589
540
Cpunumber : 1 ,
@@ -609,11 +560,7 @@ var _ = Describe("Instance", func() {
609
560
Cpunumber : 1 ,
610
561
Memory : 1024 ,
611
562
}, 1 , nil )
612
- aslp := & cloudstack.ListPublicIpAddressesParams {}
613
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
614
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
615
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
616
- }, nil )
563
+
617
564
ts .EXPECT ().GetTemplateByID (dummies .CSMachine1 .Spec .Template .ID , executableFilter ).Return (& cloudstack.Template {Name : "" }, 1 , nil )
618
565
dos .EXPECT ().GetDiskOfferingID (dummies .CSMachine1 .Spec .DiskOffering .Name , gomock .Any ()).Return (diskOfferingFakeID , 1 , nil )
619
566
dos .EXPECT ().GetDiskOfferingByID (dummies .CSMachine1 .Spec .DiskOffering .ID ).Return (& cloudstack.DiskOffering {Iscustomized : false }, 1 , nil )
@@ -628,11 +575,6 @@ var _ = Describe("Instance", func() {
628
575
dummies .CSMachine1 .Spec .Offering .Name = ""
629
576
dummies .CSMachine1 .Spec .Template .Name = ""
630
577
631
- aslp := & cloudstack.ListPublicIpAddressesParams {}
632
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
633
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
634
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
635
- }, nil )
636
578
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).
637
579
Return (& cloudstack.ServiceOffering {
638
580
Id : offeringFakeID ,
@@ -656,11 +598,6 @@ var _ = Describe("Instance", func() {
656
598
dummies .CSMachine1 .Spec .Offering .Name = "offering"
657
599
dummies .CSMachine1 .Spec .Template .Name = "template"
658
600
659
- aslp := & cloudstack.ListPublicIpAddressesParams {}
660
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
661
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
662
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
663
- }, nil )
664
601
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).Return (& cloudstack.ServiceOffering {
665
602
Id : dummies .CSMachine1 .Spec .Offering .ID ,
666
603
Name : dummies .CSMachine1 .Spec .Offering .Name ,
@@ -688,11 +625,6 @@ var _ = Describe("Instance", func() {
688
625
dummies .CSMachine1 .Spec .Offering .Name = "offering"
689
626
dummies .CSMachine1 .Spec .Template .Name = "template"
690
627
691
- aslp := & cloudstack.ListPublicIpAddressesParams {}
692
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
693
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
694
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
695
- }, nil )
696
628
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).Return (& cloudstack.ServiceOffering {Name : "offering-not-match" }, 1 , nil )
697
629
requiredRegexp := "offering name %s does not match name %s returned using UUID %s"
698
630
Ω (client .GetOrCreateVMInstance (
@@ -706,18 +638,12 @@ var _ = Describe("Instance", func() {
706
638
dummies .CSMachine1 .Spec .Offering .Name = "offering"
707
639
dummies .CSMachine1 .Spec .Template .Name = "template"
708
640
709
- aslp := & cloudstack.ListPublicIpAddressesParams {}
710
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
711
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
712
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
713
- }, nil )
714
641
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).Return (& cloudstack.ServiceOffering {Name : "offering" }, 1 , nil )
715
642
ts .EXPECT ().GetTemplateByID (dummies .CSMachine1 .Spec .Template .ID , executableFilter ).Return (& cloudstack.Template {Name : "template-not-match" }, 1 , nil )
716
643
requiredRegexp := "template name %s does not match name %s returned using UUID %s"
717
644
Ω (client .GetOrCreateVMInstance (
718
645
dummies .CSMachine1 , dummies .CAPIMachine , dummies .CSCluster , dummies .CSFailureDomain1 , dummies .CSAffinityGroup , "" )).
719
646
Should (MatchError (MatchRegexp (requiredRegexp , dummies .CSMachine1 .Spec .Template .Name , "template-not-match" , templateFakeID )))
720
-
721
647
})
722
648
723
649
It ("works with Id and name both provided, disk offering id/name mismatch" , func () {
@@ -728,19 +654,13 @@ var _ = Describe("Instance", func() {
728
654
dummies .CSMachine1 .Spec .Template .Name = "template"
729
655
dummies .CSMachine1 .Spec .DiskOffering .Name = "diskoffering"
730
656
731
- aslp := & cloudstack.ListPublicIpAddressesParams {}
732
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
733
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
734
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
735
- }, nil )
736
657
sos .EXPECT ().GetServiceOfferingByID (dummies .CSMachine1 .Spec .Offering .ID ).Return (& cloudstack.ServiceOffering {Name : "offering" }, 1 , nil )
737
658
ts .EXPECT ().GetTemplateByID (dummies .CSMachine1 .Spec .Template .ID , executableFilter ).Return (& cloudstack.Template {Name : "template" }, 1 , nil )
738
659
dos .EXPECT ().GetDiskOfferingID (dummies .CSMachine1 .Spec .DiskOffering .Name , gomock .Any ()).Return (diskOfferingFakeID + "-not-match" , 1 , nil )
739
660
requiredRegexp := "diskOffering ID %s does not match ID %s returned using name %s"
740
661
Ω (client .GetOrCreateVMInstance (
741
662
dummies .CSMachine1 , dummies .CAPIMachine , dummies .CSCluster , dummies .CSFailureDomain1 , dummies .CSAffinityGroup , "" )).
742
663
Should (MatchError (MatchRegexp (requiredRegexp , dummies .CSMachine1 .Spec .DiskOffering .ID , diskOfferingFakeID + "-not-match" , dummies .CSMachine1 .Spec .DiskOffering .Name )))
743
-
744
664
})
745
665
})
746
666
@@ -762,11 +682,6 @@ var _ = Describe("Instance", func() {
762
682
GetVirtualMachinesMetricByName (dummies .CSMachine1 .Name ).
763
683
Return (nil , - 1 , notFoundError )
764
684
765
- aslp := & cloudstack.ListPublicIpAddressesParams {}
766
- as .EXPECT ().NewListPublicIpAddressesParams ().Return (aslp )
767
- as .EXPECT ().ListPublicIpAddresses (aslp ).Return (& cloudstack.ListPublicIpAddressesResponse {
768
- Count : 2 , PublicIpAddresses : []* cloudstack.PublicIpAddress {{State : "Allocated" }, {State : "Free" }},
769
- }, nil )
770
685
sos .EXPECT ().
771
686
GetServiceOfferingByName (dummies .CSMachine1 .Spec .Offering .Name , gomock .Any ()).
772
687
Return (& cloudstack.ServiceOffering {
0 commit comments