Skip to content

Commit f4bbefd

Browse files
committed
fixing domainids value error
1 parent 7e343ea commit f4bbefd

File tree

4 files changed

+18
-21
lines changed

4 files changed

+18
-21
lines changed

cloudstack/service_offering_constrained_resource.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ func (r *serviceOfferingConstrainedResource) Create(ctx context.Context, req res
9292

9393
// common params
9494
params := r.client.ServiceOffering.NewCreateServiceOfferingParams(plan.DisplayText.ValueString(), plan.Name.ValueString())
95-
plan.commonCreateParams(params)
96-
planDiskQosHypervisor.commonCreateParams(params)
97-
planDiskOffering.commonCreateParams(params)
98-
planDiskQosStorage.commonCreateParams(params)
95+
plan.commonCreateParams(ctx, params)
96+
planDiskQosHypervisor.commonCreateParams(ctx, params)
97+
planDiskOffering.commonCreateParams(ctx, params)
98+
planDiskQosStorage.commonCreateParams(ctx, params)
9999

100100
// resource specific params
101101
if !plan.CpuSpeed.IsNull() {

cloudstack/service_offering_fixed_resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func (r *serviceOfferingFixedResource) Create(ctx context.Context, req resource.
7878

7979
// cloudstack params
8080
params := r.client.ServiceOffering.NewCreateServiceOfferingParams(plan.DisplayText.ValueString(), plan.Name.ValueString())
81-
plan.commonCreateParams(params)
81+
plan.commonCreateParams(ctx, params)
8282

8383
// resource specific params
8484
if !plan.CpuNumber.IsNull() {

cloudstack/service_offering_unconstrained_resource.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ func (r *serviceOfferingUnconstrainedResource) Create(ctx context.Context, req r
5555

5656
// cloudstack params
5757
params := r.client.ServiceOffering.NewCreateServiceOfferingParams(plan.DisplayText.ValueString(), plan.Name.ValueString())
58-
plan.commonCreateParams(params)
59-
planDiskQosHypervisor.commonCreateParams(params)
60-
planDiskOffering.commonCreateParams(params)
61-
planDiskQosStorage.commonCreateParams(params)
58+
plan.commonCreateParams(ctx, params)
59+
planDiskQosHypervisor.commonCreateParams(ctx, params)
60+
planDiskOffering.commonCreateParams(ctx, params)
61+
planDiskQosStorage.commonCreateParams(ctx, params)
6262

6363
// create offering
6464
cs, err := r.client.ServiceOffering.CreateServiceOffering(params)

cloudstack/service_offering_util.go

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ func (plan *serviceOfferingCommonResourceModel) commonUpdateParams(ctx context.C
6161
// -
6262
func (state *serviceOfferingCommonResourceModel) commonRead(ctx context.Context, cs *cloudstack.ServiceOffering) {
6363
state.Id = types.StringValue(cs.Id)
64+
6465
if cs.Deploymentplanner != "" {
6566
state.DeploymentPlanner = types.StringValue(cs.Deploymentplanner)
6667
}
@@ -156,7 +157,7 @@ func (state *ServiceOfferingDiskQosStorage) commonRead(ctx context.Context, cs *
156157
// ------------------------------------------------------------------------------------------------------------------------------
157158
// common Create methods
158159
// -
159-
func (plan *serviceOfferingCommonResourceModel) commonCreateParams(p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
160+
func (plan *serviceOfferingCommonResourceModel) commonCreateParams(ctx context.Context, p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
160161
if !plan.DeploymentPlanner.IsNull() && !plan.DeploymentPlanner.IsUnknown() {
161162
p.SetDeploymentplanner(plan.DeploymentPlanner.ValueString())
162163
} else {
@@ -167,9 +168,7 @@ func (plan *serviceOfferingCommonResourceModel) commonCreateParams(p *cloudstack
167168
}
168169
if !plan.DomainIds.IsNull() {
169170
domainids := make([]string, len(plan.DomainIds.Elements()))
170-
for i, v := range plan.DomainIds.Elements() {
171-
domainids[i] = v.String()
172-
}
171+
plan.DomainIds.ElementsAs(ctx, &domainids, false)
173172
p.SetDomainid(domainids)
174173
}
175174
if !plan.DynamicScalingEnabled.IsNull() {
@@ -194,17 +193,15 @@ func (plan *serviceOfferingCommonResourceModel) commonCreateParams(p *cloudstack
194193
p.SetTags(plan.StorageTags.ValueString())
195194
}
196195
if !plan.ZoneIds.IsNull() {
197-
zids := make([]string, len(plan.ZoneIds.Elements()))
198-
for i, v := range plan.ZoneIds.Elements() {
199-
zids[i] = v.String()
200-
}
201-
p.SetZoneid(zids)
196+
zoneIds := make([]string, len(plan.ZoneIds.Elements()))
197+
plan.ZoneIds.ElementsAs(ctx, &zoneIds, false)
198+
p.SetZoneid(zoneIds)
202199
}
203200

204201
return p
205202

206203
}
207-
func (plan *ServiceOfferingDiskQosHypervisor) commonCreateParams(p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
204+
func (plan *ServiceOfferingDiskQosHypervisor) commonCreateParams(ctx context.Context, p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
208205
if !plan.DiskBytesReadRate.IsNull() {
209206
p.SetBytesreadrate(plan.DiskBytesReadRate.ValueInt64())
210207
}
@@ -227,7 +224,7 @@ func (plan *ServiceOfferingDiskQosHypervisor) commonCreateParams(p *cloudstack.C
227224
return p
228225
}
229226

230-
func (plan *ServiceOfferingDiskOffering) commonCreateParams(p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
227+
func (plan *ServiceOfferingDiskOffering) commonCreateParams(ctx context.Context, p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
231228

232229
if !plan.CacheMode.IsNull() {
233230
p.SetCachemode(plan.CacheMode.ValueString())
@@ -249,7 +246,7 @@ func (plan *ServiceOfferingDiskOffering) commonCreateParams(p *cloudstack.Create
249246

250247
}
251248

252-
func (plan *ServiceOfferingDiskQosStorage) commonCreateParams(p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
249+
func (plan *ServiceOfferingDiskQosStorage) commonCreateParams(ctx context.Context, p *cloudstack.CreateServiceOfferingParams) *cloudstack.CreateServiceOfferingParams {
253250
if !plan.CustomizedIops.IsNull() {
254251
p.SetCustomizediops(plan.CustomizedIops.ValueBool())
255252
}

0 commit comments

Comments
 (0)