Skip to content

Commit 4807b42

Browse files
author
Joshua Reed
committed
Small lint fixup.
1 parent 9ec6d9c commit 4807b42

File tree

7 files changed

+19
-196
lines changed

7 files changed

+19
-196
lines changed

‎controllers/utils/base_reconciler.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,11 +234,11 @@ func (r *ReconciliationRunner) SetCSUser() (ctrl.Result, error) {
234234
r.CSCluster.Spec.Domain, r.CSCluster.Spec.Account)
235235
}
236236
cfg := cloud.Config{APIKey: user.APIKey, SecretKey: user.SecretKey}
237-
if client, err := r.CSClient.NewClientFromSpec(cfg); err != nil {
237+
client, err := r.CSClient.NewClientFromSpec(cfg)
238+
if err != nil {
238239
return ctrl.Result{}, err
239-
} else {
240-
r.CSUser = client
241240
}
241+
r.CSUser = client
242242
}
243243
return ctrl.Result{}, nil
244244
}

‎pkg/cloud/affinity_groups_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,6 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
8383
Ω(client.GetOrCreateAffinityGroup(dummies.AffinityGroup)).Should(Succeed())
8484
})
8585
It("Associates an affinity group.", func() {
86-
if err := client.GetOrCreateCluster(dummies.CSCluster); err != nil {
87-
Skip("Could not flesh out Cluster." + err.Error())
88-
}
8986
if err := client.GetOrCreateVMInstance(
9087
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "",
9188
); err != nil {

‎pkg/cloud/cluster.go‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎pkg/cloud/cluster_test.go‎

Lines changed: 0 additions & 127 deletions
This file was deleted.

‎pkg/cloud/instance.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,5 @@ func (c *client) DestroyVMInstance(csMachine *infrav1.CloudStackMachine) error {
235235
return err
236236
}
237237

238-
return nil
239238
return errors.New("VM deletion in progress")
240239
}

‎pkg/cloud/instance_test.go‎

Lines changed: 16 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@ import (
2525
"github.com/golang/mock/gomock"
2626
. "github.com/onsi/ginkgo"
2727

28-
. "github.com/onsi/ginkgo/extensions/table"
2928
. "github.com/onsi/gomega"
3029
"github.com/pkg/errors"
3130
"k8s.io/utils/pointer"
3231
)
3332

3433
var _ = Describe("Instance", func() {
34+
const (
35+
unknownErrorMessage = "unknown err"
36+
offeringFakeID = "123"
37+
templateFakeID = "456"
38+
executableFilter = "executable"
39+
)
40+
3541
notFoundError := errors.New("no match found")
36-
const unknownErrorMessage = "unknown err"
37-
const offeringFakeID = "123"
38-
const templateFakeID = "456"
3942
unknownError := errors.New(unknownErrorMessage)
4043

4144
var (
@@ -153,7 +156,7 @@ var _ = Describe("Instance", func() {
153156
expectVMNotFound()
154157
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).
155158
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
156-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).
159+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
157160
Return("", -1, unknownError)
158161
Ω(client.GetOrCreateVMInstance(
159162
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "")).
@@ -164,7 +167,7 @@ var _ = Describe("Instance", func() {
164167
expectVMNotFound()
165168
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).
166169
Return(dummies.CSMachine1.Spec.Offering.ID, 1, nil)
167-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).Return("", 2, nil)
170+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).Return("", 2, nil)
168171
Ω(client.GetOrCreateVMInstance(
169172
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "")).
170173
ShouldNot(Succeed())
@@ -174,7 +177,7 @@ var _ = Describe("Instance", func() {
174177
expectVMNotFound()
175178
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).
176179
Return(offeringFakeID, 1, nil)
177-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).
180+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
178181
Return(templateFakeID, 1, nil)
179182
vms.EXPECT().NewDeployVirtualMachineParams(offeringFakeID, templateFakeID, dummies.Zone1.ID).
180183
Return(&cloudstack.DeployVirtualMachineParams{})
@@ -186,37 +189,6 @@ var _ = Describe("Instance", func() {
186189
Should(MatchError(unknownErrorMessage))
187190
})
188191

189-
// The folloing test checks that DomainID and Account are set (or not) in the DeployVirtualMachineParams
190-
// interface passed to DeployVirtualMachine.
191-
describeDomainAccountTest := func(desc string) func(string, string) string {
192-
return func(account string, domainID string) string {
193-
return fmt.Sprintf(`"%s" and "%s", %s`, account, domainID, desc)
194-
}
195-
}
196-
DescribeTable("DomainID and Account test table.",
197-
func(account string, domainID string) {
198-
dummies.CSCluster.Spec.Account = account
199-
dummies.CSCluster.Status.DomainID = domainID
200-
vms.EXPECT().GetVirtualMachinesMetricByID(*dummies.CSMachine1.Spec.InstanceID).Return(nil, -1, notFoundError)
201-
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).Return(offeringFakeID, 1, nil)
202-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).
203-
Return(templateFakeID, 1, nil)
204-
vms.EXPECT().GetVirtualMachinesMetricByID(*dummies.CSMachine1.Spec.InstanceID).
205-
Return(&cloudstack.VirtualMachinesMetric{}, 1, nil)
206-
vms.EXPECT().NewDeployVirtualMachineParams(offeringFakeID, templateFakeID, dummies.Zone1.ID).
207-
Return(&cloudstack.DeployVirtualMachineParams{})
208-
vms.EXPECT().DeployVirtualMachine(ParamMatch(And(AccountEquals(account), DomainIDEquals(domainID)))).
209-
Return(&cloudstack.DeployVirtualMachineResponse{Id: *dummies.CSMachine1.Spec.InstanceID}, nil)
210-
vms.EXPECT().GetVirtualMachinesMetricByName(dummies.CSMachine1.Name).Return(nil, -1, notFoundError)
211-
212-
Ω(client.GetOrCreateVMInstance(
213-
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "")).
214-
Should(Succeed())
215-
},
216-
Entry(describeDomainAccountTest("all set case"), "FakeAccount", "FakeDomainID"),
217-
Entry(describeDomainAccountTest("empty case"), "", ""),
218-
)
219-
220192
Context("when using UUIDs and/or names to locate service offerings and templates", func() {
221193
BeforeEach(func() {
222194
gomock.InOrder(
@@ -247,7 +219,7 @@ var _ = Describe("Instance", func() {
247219
dummies.CSMachine1.Spec.Template.Name = "template"
248220

249221
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).Return(offeringFakeID, 1, nil)
250-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).
222+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
251223
Return(templateFakeID, 1, nil)
252224

253225
ActionAndAssert()
@@ -260,7 +232,7 @@ var _ = Describe("Instance", func() {
260232
dummies.CSMachine1.Spec.Template.Name = "template"
261233

262234
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: ""}, 1, nil)
263-
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, "", dummies.Zone1.ID).
235+
ts.EXPECT().GetTemplateID(dummies.CSMachine1.Spec.Template.Name, executableFilter, dummies.Zone1.ID).
264236
Return(templateFakeID, 1, nil)
265237

266238
ActionAndAssert()
@@ -273,7 +245,7 @@ var _ = Describe("Instance", func() {
273245
dummies.CSMachine1.Spec.Template.Name = ""
274246

275247
sos.EXPECT().GetServiceOfferingID(dummies.CSMachine1.Spec.Offering.Name).Return(offeringFakeID, 1, nil)
276-
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, "").Return(&cloudstack.Template{Name: ""}, 1, nil)
248+
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: ""}, 1, nil)
277249

278250
ActionAndAssert()
279251
})
@@ -285,7 +257,7 @@ var _ = Describe("Instance", func() {
285257
dummies.CSMachine1.Spec.Template.Name = ""
286258

287259
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: "offering"}, 1, nil)
288-
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, "").Return(&cloudstack.Template{Name: "template"}, 1, nil)
260+
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: "template"}, 1, nil)
289261

290262
ActionAndAssert()
291263
})
@@ -297,7 +269,7 @@ var _ = Describe("Instance", func() {
297269
dummies.CSMachine1.Spec.Template.Name = "template"
298270

299271
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: "offering"}, 1, nil)
300-
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, "").Return(&cloudstack.Template{Name: "template"}, 1, nil)
272+
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: "template"}, 1, nil)
301273

302274
ActionAndAssert()
303275
})
@@ -330,7 +302,7 @@ var _ = Describe("Instance", func() {
330302
dummies.CSMachine1.Spec.Template.Name = "template"
331303

332304
sos.EXPECT().GetServiceOfferingByID(dummies.CSMachine1.Spec.Offering.ID).Return(&cloudstack.ServiceOffering{Name: "offering"}, 1, nil)
333-
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, "").Return(&cloudstack.Template{Name: "template-not-match"}, 1, nil)
305+
ts.EXPECT().GetTemplateByID(dummies.CSMachine1.Spec.Template.ID, executableFilter).Return(&cloudstack.Template{Name: "template-not-match"}, 1, nil)
334306
requiredRegexp := "template name %s does not match name %s returned using UUID %s"
335307
Ω(client.GetOrCreateVMInstance(
336308
dummies.CSMachine1, dummies.CAPIMachine, dummies.CSCluster, dummies.CSZone1, dummies.CSAffinityGroup, "")).

‎pkg/cloud/isolated_network_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,6 @@ var _ = Describe("Network", func() {
229229
dummies.SetDummyIsoNetToNameOnly()
230230
dummies.SetClusterSpecToNet(&dummies.ISONet1)
231231
dummies.CSCluster.Spec.ControlPlaneEndpoint.Host = ""
232-
Ω(client.ResolveZones(dummies.CSCluster)).Should(Succeed())
233232
Ω(client.ResolveNetwork(&dummies.ISONet1)).Should(Succeed())
234233
})
235234
})

0 commit comments

Comments
 (0)