Skip to content

Commit 6ccb8df

Browse files
author
Joshua Reed
committed
Go vet passes now. Moved to use dummies module for dummy vars in tests.
1 parent cb94a32 commit 6ccb8df

File tree

7 files changed

+375
-160
lines changed

7 files changed

+375
-160
lines changed

‎controllers/cloudstackcluster_controller_test.go

Lines changed: 14 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -20,50 +20,18 @@ import (
2020
"context"
2121
"time"
2222

23-
infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
23+
dummies "github.com/aws/cluster-api-provider-cloudstack/pkg/cloud/test_dummies"
2424
"github.com/golang/mock/gomock"
2525
. "github.com/onsi/ginkgo"
2626
. "github.com/onsi/gomega"
27-
corev1 "k8s.io/api/core/v1"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
3029
"sigs.k8s.io/cluster-api/util/patch"
3130
"sigs.k8s.io/controller-runtime/pkg/client"
3231
)
3332

34-
func getCloudStackCluster() *infrav1.CloudStackCluster {
35-
return &infrav1.CloudStackCluster{
36-
TypeMeta: metav1.TypeMeta{
37-
APIVersion: "infrastructure.cluster.x-k8s.io/v1beta1",
38-
Kind: "CloudStackCluster",
39-
},
40-
ObjectMeta: metav1.ObjectMeta{
41-
GenerateName: "cs-cluster-test1-",
42-
Namespace: "default",
43-
UID: "0",
44-
},
45-
Spec: infrav1.CloudStackClusterSpec{
46-
Zone: "zone",
47-
Network: "network",
48-
},
49-
}
50-
}
51-
5233
func getCapiCluster() *clusterv1.Cluster {
53-
return &clusterv1.Cluster{
54-
ObjectMeta: metav1.ObjectMeta{
55-
GenerateName: "capi-cluster-test-",
56-
Namespace: "default",
57-
},
58-
Spec: clusterv1.ClusterSpec{
59-
InfrastructureRef: &corev1.ObjectReference{
60-
APIVersion: infrav1.GroupVersion.String(),
61-
Kind: "CloudStackCluster",
62-
Name: "somename",
63-
},
64-
},
65-
}
66-
34+
return dummies.CAPICluster
6735
}
6836

6937
const (
@@ -74,47 +42,46 @@ var _ = Describe("CloudStackClusterReconciler", func() {
7442
ctx := context.Background()
7543

7644
BeforeEach(func() {
45+
dummies.SetDummyVars()
7746
})
7847

7948
It("Should create a cluster", func() {
8049
By("Fetching a CS Cluster Object")
8150
CS.EXPECT().GetOrCreateCluster(gomock.Any()).MinTimes(1)
8251

8352
// Create the CS Cluster object for the reconciler to fetch.
84-
csCluster := getCloudStackCluster()
85-
Ω(k8sClient.Create(ctx, csCluster)).Should(Succeed())
53+
Ω(k8sClient.Create(ctx, dummies.CSCluster)).Should(Succeed())
8654
// TODO: add deletion defer here.
8755

8856
By("Fetching the CAPI cluster object that owns this CS cluster object")
8957
// Create the CAPI cluster (owner) object.
90-
capiCluster := getCapiCluster()
91-
capiCluster.Spec.InfrastructureRef.Name = csCluster.Name
92-
Ω(k8sClient.Create(ctx, capiCluster)).Should(Succeed())
58+
dummies.CAPICluster.Spec.InfrastructureRef.Name = dummies.CSCluster.Name
59+
Ω(k8sClient.Create(ctx, dummies.CAPICluster)).Should(Succeed())
9360
// TODO: add deletion defer here.
9461

95-
key := client.ObjectKey{Namespace: csCluster.Namespace, Name: csCluster.Name}
62+
key := client.ObjectKey{Namespace: dummies.CSCluster.Namespace, Name: dummies.CSCluster.Name}
9663
Eventually(func() error {
97-
return k8sClient.Get(ctx, key, csCluster)
64+
return k8sClient.Get(ctx, key, dummies.CSCluster)
9865
}, timeout).Should(BeNil())
9966

10067
By("Setting the OwnerRef on the CloudStack cluster")
10168
Eventually(func() error {
102-
ph, err := patch.NewHelper(csCluster, k8sClient)
69+
ph, err := patch.NewHelper(dummies.CSCluster, k8sClient)
10370
Ω(err).ShouldNot(HaveOccurred())
104-
csCluster.OwnerReferences = append(csCluster.OwnerReferences, metav1.OwnerReference{
71+
dummies.CSCluster.OwnerReferences = append(dummies.CSCluster.OwnerReferences, metav1.OwnerReference{
10572
Kind: "Cluster",
10673
APIVersion: clusterv1.GroupVersion.String(),
107-
Name: capiCluster.Name,
74+
Name: dummies.CAPICluster.Name,
10875
UID: "uniqueness",
10976
})
110-
return ph.Patch(ctx, csCluster, patch.WithStatusObservedGeneration{})
77+
return ph.Patch(ctx, dummies.CSCluster, patch.WithStatusObservedGeneration{})
11178
}, timeout).Should(Succeed())
11279

11380
Eventually(func() bool {
114-
if err := k8sClient.Get(ctx, key, csCluster); err != nil {
81+
if err := k8sClient.Get(ctx, key, dummies.CSCluster); err != nil {
11582
return false
11683
}
117-
return len(csCluster.Finalizers) > 0
84+
return len(dummies.CSCluster.Finalizers) > 0
11885
}, timeout).Should(BeTrue())
11986

12087
})

‎pkg/cloud/affinity_groups_test.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
4141
mockClient = cloudstack.NewMockClient(mockCtrl)
4242
ags = mockClient.AffinityGroup.(*cloudstack.MockAffinityGroupServiceIface)
4343
client = cloud.NewClientFromCSAPIClient(mockClient)
44-
dummies.SetDummyClusterSpecVars()
44+
dummies.SetDummyVars()
4545
})
4646

4747
AfterEach(func() {
@@ -51,7 +51,7 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
5151
It("fetches an affinity group", func() {
5252
ags.EXPECT().GetAffinityGroupByName(dummies.AffinityGroup.Name).Return(&cloudstack.AffinityGroup{}, 1, nil)
5353

54-
Ω(client.GetOrCreateAffinityGroup(dummies.Cluster, dummies.AffinityGroup)).Should(Succeed())
54+
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, dummies.AffinityGroup)).Should(Succeed())
5555
})
5656
It("creates an affinity group", func() {
5757
<<<<<<< HEAD
@@ -62,16 +62,16 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
6262
ags.EXPECT().NewCreateAffinityGroupParams(fakeAG.Name, fakeAG.Type).
6363
=======
6464
dummies.AffinityGroup.Id = "FakeID"
65-
dummies.Cluster.Spec.Account = "FakeAccount"
66-
dummies.Cluster.Status.DomainID = "FakeDomainId"
65+
dummies.CSCluster.Spec.Account = "FakeAccount"
66+
dummies.CSCluster.Status.DomainID = "FakeDomainId"
6767
ags.EXPECT().GetAffinityGroupByID(dummies.AffinityGroup.Id).Return(nil, -1, errors.New("FakeError"))
6868
ags.EXPECT().NewCreateAffinityGroupParams(dummies.AffinityGroup.Name, dummies.AffinityGroup.Type).
6969
>>>>>>> 36c0963 (Major moves toward multizone, but still broken.)
7070
Return(&cloudstack.CreateAffinityGroupParams{})
7171
ags.EXPECT().CreateAffinityGroup(ParamMatch(And(AccountEquals("FakeAccount"), DomainIDEquals("FakeDomainId")))).
7272
Return(&cloudstack.CreateAffinityGroupResponse{}, nil)
7373

74-
Ω(client.GetOrCreateAffinityGroup(dummies.Cluster, dummies.AffinityGroup)).Should(Succeed())
74+
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, dummies.AffinityGroup)).Should(Succeed())
7575
})
7676

7777
Context("AffinityGroup Integ Tests", func() {
@@ -91,20 +91,20 @@ var _ = Describe("AffinityGroup Unit Tests", func() {
9191
})
9292

9393
It("Creates an affinity group.", func() {
94-
Ω(client.GetOrCreateAffinityGroup(dummies.Cluster, arbitraryAG)).Should(Succeed())
94+
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, arbitraryAG)).Should(Succeed())
9595
arbitraryAG2 := &cloud.AffinityGroup{Name: arbitraryAG.Name}
96-
Ω(client.GetOrCreateAffinityGroup(dummies.Cluster, arbitraryAG2)).Should(Succeed())
96+
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, arbitraryAG2)).Should(Succeed())
9797
Ω(arbitraryAG2).Should(Equal(arbitraryAG))
9898
})
9999
It("Associates an affinity group.", func() {
100-
if err := client.GetOrCreateCluster(dummies.Cluster); err != nil {
100+
if err := client.GetOrCreateCluster(dummies.CSCluster); err != nil {
101101
Skip("Could not flesh out Cluster." + err.Error())
102102
}
103-
if err := client.GetOrCreateVMInstance(dummies.Machine, dummies.CapiMachine, dummies.Cluster, ""); err != nil {
103+
if err := client.GetOrCreateVMInstance(dummies.CSMachine, dummies.CAPIMachine, dummies.CSCluster, ""); err != nil {
104104
Skip("Could not create VM." + err.Error())
105105
}
106-
Ω(client.GetOrCreateAffinityGroup(dummies.Cluster, arbitraryAG)).Should(Succeed())
107-
Ω(client.AssociateAffinityGroup(dummies.Machine, *arbitraryAG)).Should(Succeed())
106+
Ω(client.GetOrCreateAffinityGroup(dummies.CSCluster, arbitraryAG)).Should(Succeed())
107+
Ω(client.AssociateAffinityGroup(dummies.CSMachine, *arbitraryAG)).Should(Succeed())
108108
})
109109
It("Deletes an affinity group.", func() {
110110
Ω(client.DeleteAffinityGroup(arbitraryAG)).Should(Succeed())

‎pkg/cloud/cluster_test.go

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ package cloud_test
1717

1818
import (
1919
"fmt"
20-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2120

2221
"github.com/apache/cloudstack-go/v2/cloudstack"
23-
infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
2422
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
23+
dummies "github.com/aws/cluster-api-provider-cloudstack/pkg/cloud/test_dummies"
2524
"github.com/golang/mock/gomock"
2625
. "github.com/onsi/ginkgo"
2726
. "github.com/onsi/gomega"
@@ -45,60 +44,45 @@ var _ = Describe("Cluster", func() {
4544
ds = mockClient.Domain.(*cloudstack.MockDomainServiceIface)
4645
ns = mockClient.Network.(*cloudstack.MockNetworkServiceIface)
4746
client = cloud.NewClientFromCSAPIClient(mockClient)
47+
dummies.SetDummyVars()
4848
})
4949

5050
AfterEach(func() {
5151
mockCtrl.Finish()
5252
})
5353

54-
Context("an existing abstract cluster", func() {
55-
zoneName := "zoneName"
56-
zoneID := "zoneID"
57-
netName := "netName"
58-
59-
cluster := &infrav1.CloudStackCluster{
60-
Spec: infrav1.CloudStackClusterSpec{
61-
Zone: zoneName,
62-
Network: netName},
63-
ObjectMeta: metav1.ObjectMeta{
64-
UID: "0",
65-
},
66-
}
67-
54+
Context("an existing abstract dummies.CSCluster", func() {
6855
It("handles zone not found.", func() {
6956
expectedErr := fmt.Errorf("Not found")
70-
zs.EXPECT().GetZoneID(zoneName).Return("", -1, expectedErr)
71-
zs.EXPECT().GetZoneByID(zoneName).Return(nil, -1, expectedErr)
57+
zs.EXPECT().GetZoneID(dummies.Zone1.Name).Return("", -1, expectedErr)
58+
zs.EXPECT().GetZoneByID(dummies.Zone1.Id).Return(nil, -1, expectedErr)
7259

73-
err := client.GetOrCreateCluster(cluster)
60+
err := client.GetOrCreateCluster(dummies.CSCluster)
7461
Expect(errors.Cause(err)).To(MatchError(expectedErr))
7562
})
7663

7764
It("handles multiple zone IDs returned", func() {
78-
zs.EXPECT().GetZoneID(zoneName).Return(zoneID, 2, nil)
79-
zs.EXPECT().GetZoneByID(zoneName).Return(nil, -1, fmt.Errorf("Not found"))
65+
zs.EXPECT().GetZoneID(dummies.Zone1.Name).Return(dummies.Zone1.Id, 2, nil)
66+
zs.EXPECT().GetZoneByID(dummies.Zone1.Id).Return(nil, -1, fmt.Errorf("Not found"))
8067

81-
err := client.GetOrCreateCluster(cluster)
68+
err := client.GetOrCreateCluster(dummies.CSCluster)
8269
Expect(err.Error()).To(ContainSubstring("Expected 1 Zone with name zoneName, but got 2."))
8370
Expect(err.Error()).To(ContainSubstring("Could not get Zone by ID zoneName.: Not found"))
8471
})
8572

8673
It("translates Domain to DomainID when Domain is set", func() {
87-
cluster.Spec.Domain = "FakeDomain"
88-
cluster.Spec.Network = "FakeNetwork"
89-
domainID := "FakeDomainID"
90-
zs.EXPECT().GetZoneID(zoneName).Return(zoneID, 1, nil)
91-
ds.EXPECT().GetDomainID(cluster.Spec.Domain).Return(domainID, 1, nil)
74+
zs.EXPECT().GetZoneID(dummies.Zone1.Name).Return(dummies.Zone1.Id, 1, nil)
75+
ds.EXPECT().GetDomainID(dummies.CSCluster.Spec.Domain).Return(dummies.DomainId, 1, nil)
9276

9377
// End the fetching with a fake network error here.
9478
// Only trying to test domain functions.
9579
// TODO: turn the pkg/cloud/client.go client into a composition of interfaces such that the
9680
// individual services can be mocked.
97-
ns.EXPECT().GetNetworkID(cluster.Spec.Network).Return("", -1, fmt.Errorf("FakeError"))
98-
ns.EXPECT().GetNetworkByID(cluster.Spec.Network).Return(&cloudstack.Network{}, -1, fmt.Errorf("FakeError"))
81+
ns.EXPECT().GetNetworkID(dummies.Net1.Name).Return("", -1, fmt.Errorf("FakeError"))
82+
ns.EXPECT().GetNetworkByID(dummies.Net1.Id).Return(&cloudstack.Network{}, -1, fmt.Errorf("FakeError"))
9983

100-
Ω(client.GetOrCreateCluster(cluster)).ShouldNot(Succeed())
101-
Ω(cluster.Status.DomainID).Should(Equal(domainID))
84+
Ω(client.GetOrCreateCluster(dummies.CSCluster)).ShouldNot(Succeed())
85+
Ω(dummies.CSCluster.Status.DomainID).Should(Equal(dummies.DomainId))
10286
})
10387
})
10488
})

‎pkg/cloud/instance_test.go

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ package cloud_test
1818

1919
import (
2020
"fmt"
21-
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2221

2322
capiv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2423

2524
"github.com/apache/cloudstack-go/v2/cloudstack"
2625
infrav1 "github.com/aws/cluster-api-provider-cloudstack/api/v1beta1"
2726
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
27+
dummies "github.com/aws/cluster-api-provider-cloudstack/pkg/cloud/test_dummies"
2828
"github.com/golang/mock/gomock"
2929
. "github.com/onsi/ginkgo"
3030
. "github.com/onsi/ginkgo/extensions/table"
@@ -58,17 +58,7 @@ var _ = Describe("Instance", func() {
5858
ts = mockClient.Template.(*cloudstack.MockTemplateServiceIface)
5959
client = cloud.NewClientFromCSAPIClient(mockClient)
6060

61-
csMachine = &infrav1.CloudStackMachine{
62-
Spec: infrav1.CloudStackMachineSpec{
63-
InstanceID: pointer.StringPtr("instance-id"),
64-
Offering: "service-offering-name",
65-
Template: "template-name"}}
66-
csMachine.Name = "instance-name"
67-
csCluster = &infrav1.CloudStackCluster{
68-
Spec: infrav1.CloudStackClusterSpec{},
69-
Status: infrav1.CloudStackClusterStatus{ZoneID: "zone-id"},
70-
ObjectMeta: metav1.ObjectMeta{UID: "0"}}
71-
machine = &capiv1.Machine{}
61+
dummies.SetDummyVars()
7262
})
7363

7464
AfterEach(func() {
@@ -158,7 +148,7 @@ var _ = Describe("Instance", func() {
158148
vms.EXPECT().GetVirtualMachinesMetricByID(*csMachine.Spec.InstanceID).Return(nil, -1, notFoundError)
159149
vms.EXPECT().GetVirtualMachinesMetricByName(csMachine.Name).Return(nil, -1, notFoundError)
160150
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
161-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
151+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
162152
Return("", -1, unknownError)
163153
ts.EXPECT().GetTemplateByID(csMachine.Spec.Template, allFilter).Return(nil, -1, unknownError)
164154
Ω(client.GetOrCreateVMInstance(csMachine, machine, csCluster, "")).ShouldNot(Succeed())
@@ -168,7 +158,7 @@ var _ = Describe("Instance", func() {
168158
vms.EXPECT().GetVirtualMachinesMetricByID(*csMachine.Spec.InstanceID).Return(nil, -1, notFoundError)
169159
vms.EXPECT().GetVirtualMachinesMetricByName(csMachine.Name).Return(nil, -1, notFoundError)
170160
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
171-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).Return("", 2, nil)
161+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).Return("", 2, nil)
172162
ts.EXPECT().GetTemplateByID(csMachine.Spec.Template, allFilter).Return(nil, -1, unknownError)
173163
Ω(client.GetOrCreateVMInstance(csMachine, machine, csCluster, "")).ShouldNot(Succeed())
174164
})
@@ -177,9 +167,9 @@ var _ = Describe("Instance", func() {
177167
vms.EXPECT().GetVirtualMachinesMetricByID(*csMachine.Spec.InstanceID).Return(nil, -1, notFoundError)
178168
vms.EXPECT().GetVirtualMachinesMetricByName(csMachine.Name).Return(nil, -1, notFoundError)
179169
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
180-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
170+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
181171
Return(templateID, 1, nil)
182-
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, csCluster.Status.ZoneID).
172+
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, dummies.Zone1).
183173
Return(&cloudstack.DeployVirtualMachineParams{})
184174
vms.EXPECT().DeployVirtualMachine(gomock.Any()).Return(nil, unknownError)
185175

@@ -199,11 +189,11 @@ var _ = Describe("Instance", func() {
199189
csCluster.Status.DomainID = domainID
200190
vms.EXPECT().GetVirtualMachinesMetricByID(*csMachine.Spec.InstanceID).Return(nil, -1, notFoundError)
201191
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
202-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
192+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
203193
Return(templateID, 1, nil)
204194
vms.EXPECT().GetVirtualMachinesMetricByID(*csMachine.Spec.InstanceID).
205195
Return(&cloudstack.VirtualMachinesMetric{}, 1, nil)
206-
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, csCluster.Status.ZoneID).
196+
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, dummies.Zone1).
207197
Return(&cloudstack.DeployVirtualMachineParams{})
208198
vms.EXPECT().DeployVirtualMachine(ParamMatch(And(AccountEquals(account), DomainIDEquals(domainID)))).
209199
Return(&cloudstack.DeployVirtualMachineResponse{Id: *csMachine.Spec.InstanceID}, nil)
@@ -227,7 +217,7 @@ var _ = Describe("Instance", func() {
227217
})
228218

229219
ActionAndAssert := func() {
230-
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, csCluster.Status.ZoneID).
220+
vms.EXPECT().NewDeployVirtualMachineParams(serviceOfferingID, templateID, dummies.Zone1).
231221
Return(&cloudstack.DeployVirtualMachineParams{})
232222

233223
deploymentResp := &cloudstack.DeployVirtualMachineResponse{Id: *csMachine.Spec.InstanceID}
@@ -238,7 +228,7 @@ var _ = Describe("Instance", func() {
238228

239229
It("works with service offering name and template name", func() {
240230
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
241-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
231+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
242232
Return(templateID, 1, nil)
243233

244234
ActionAndAssert()
@@ -248,7 +238,7 @@ var _ = Describe("Instance", func() {
248238
csMachine.Spec.Offering = serviceOfferingID
249239
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return("", -1, notFoundError)
250240
sos.EXPECT().GetServiceOfferingByID(csMachine.Spec.Offering).Return(&cloudstack.ServiceOffering{}, 1, nil)
251-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
241+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
252242
Return(templateID, 1, nil)
253243

254244
ActionAndAssert()
@@ -257,7 +247,7 @@ var _ = Describe("Instance", func() {
257247
It("works with service offering name and template ID", func() {
258248
csMachine.Spec.Template = templateID
259249
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return(serviceOfferingID, 1, nil)
260-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
250+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
261251
Return("", -1, notFoundError)
262252
ts.EXPECT().GetTemplateByID(csMachine.Spec.Template, allFilter).
263253
Return(&cloudstack.Template{}, 1, nil)
@@ -270,7 +260,7 @@ var _ = Describe("Instance", func() {
270260
csMachine.Spec.Template = templateID
271261
sos.EXPECT().GetServiceOfferingID(csMachine.Spec.Offering).Return("", -1, notFoundError)
272262
sos.EXPECT().GetServiceOfferingByID(csMachine.Spec.Offering).Return(&cloudstack.ServiceOffering{}, 1, nil)
273-
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, csCluster.Status.ZoneID).
263+
ts.EXPECT().GetTemplateID(csMachine.Spec.Template, allFilter, dummies.Zone1).
274264
Return("", -1, notFoundError)
275265
ts.EXPECT().GetTemplateByID(csMachine.Spec.Template, allFilter).
276266
Return(&cloudstack.Template{}, 1, nil)

0 commit comments

Comments
 (0)