Skip to content

Commit 9245114

Browse files
SunithaGudisagarIBM1SunithaGudisagarIBM1
committed
Acceptance testing changes
1 parent 71d7ea9 commit 9245114

8 files changed

+61
-64
lines changed

‎ibm/service/vpc/data_source_ibm_is_snapshot_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
4242
resource.TestCheckResourceAttrSet(snpName, "crn"),
4343
resource.TestCheckResourceAttrSet(snpName, "lifecycle_state"),
4444
resource.TestCheckResourceAttrSet(snpName, "encryption"),
45+
resource.TestCheckResourceAttrSet(snpName, "allowed_use.#"),
46+
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.bare_metal_server"),
47+
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.instance"),
48+
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.api_version"),
4549
// resource.TestCheckResourceAttrSet(snpName, "captured_at"), // Commented as the attribute is optional.
4650
),
4751
},
@@ -162,10 +166,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
162166
resource.TestCheckResourceAttrSet(snpName, "catalog_offering.#"),
163167
resource.TestCheckResourceAttrSet(snpName, "catalog_offering.0.version_crn"),
164168
resource.TestCheckResourceAttrSet(snpName, "catalog_offering.0.plan_crn"),
165-
resource.TestCheckResourceAttrSet(snpName, "allowed_use.#"),
166-
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.bare_metal_server"),
167-
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.instance"),
168-
resource.TestCheckResourceAttrSet(snpName, "allowed_use.0.api_version"),
169169
),
170170
},
171171
},

‎ibm/service/vpc/data_source_ibm_is_snapshots_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
4949
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.lifecycle_state"),
5050
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.encryption"),
5151
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.captured_at"),
52+
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.#"),
53+
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.bare_metal_server"),
54+
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.instance"),
55+
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.api_version"),
5256
),
5357
},
5458
},
@@ -119,10 +123,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
119123
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.catalog_offering.#"),
120124
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.catalog_offering.0.plan_crn"),
121125
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.catalog_offering.0.version_crn"),
122-
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.#"),
123-
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.bare_metal_server"),
124-
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.instance"),
125-
resource.TestCheckResourceAttrSet(snpName, "snapshots.0.allowed_use.0.api_version"),
126126
),
127127
},
128128
},

‎ibm/service/vpc/data_source_ibm_is_volume_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,14 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
193193
resName, "operating_system.0.vendor"),
194194
resource.TestCheckResourceAttrSet(
195195
resName, "operating_system.0.version"),
196+
resource.TestCheckResourceAttrSet(
197+
resName, "allowed_use.#"),
198+
resource.TestCheckResourceAttrSet(
199+
resName, "allowed_use.0.bare_metal_server"),
200+
resource.TestCheckResourceAttrSet(
201+
resName, "allowed_use.0.instance"),
202+
resource.TestCheckResourceAttrSet(
203+
resName, "allowed_use.0.api_version"),
196204
),
197205
},
198206
},
@@ -223,14 +231,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
223231
resName, "catalog_offering.0.plan_crn"),
224232
resource.TestCheckResourceAttrSet(
225233
resName, "catalog_offering.0.version_crn"),
226-
resource.TestCheckResourceAttrSet(
227-
resName, "allowed_use.#"),
228-
resource.TestCheckResourceAttrSet(
229-
resName, "allowed_use.0.bare_metal_server"),
230-
resource.TestCheckResourceAttrSet(
231-
resName, "allowed_use.0.instance"),
232-
resource.TestCheckResourceAttrSet(
233-
resName, "allowed_use.0.api_version"),
234234
),
235235
},
236236
},

‎ibm/service/vpc/data_source_ibm_is_volumes_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,14 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
110110
resName, "volumes.0.operating_system.0.vendor"),
111111
resource.TestCheckResourceAttrSet(
112112
resName, "volumes.0.operating_system.0.version"),
113+
resource.TestCheckResourceAttrSet(
114+
resName, "volumes.0.allowed_use.#"),
115+
resource.TestCheckResourceAttrSet(
116+
resName, "volumes.0.allowed_use.0.bare_metal_server"),
117+
resource.TestCheckResourceAttrSet(
118+
resName, "volumes.0.allowed_use.0.instance"),
119+
resource.TestCheckResourceAttrSet(
120+
resName, "volumes.0.allowed_use.0.api_version"),
113121
),
114122
},
115123
},
@@ -142,14 +150,6 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
142150
resName, "volumes.0.catalog_offering.0.plan_crn"),
143151
resource.TestCheckResourceAttrSet(
144152
resName, "volumes.0.catalog_offering.0.version_crn"),
145-
resource.TestCheckResourceAttrSet(
146-
resName, "volumes.0.allowed_use.#"),
147-
resource.TestCheckResourceAttrSet(
148-
resName, "volumes.0.allowed_use.0.bare_metal_server"),
149-
resource.TestCheckResourceAttrSet(
150-
resName, "volumes.0.allowed_use.0.instance"),
151-
resource.TestCheckResourceAttrSet(
152-
resName, "volumes.0.allowed_use.0.api_version"),
153153
),
154154
},
155155
},

‎ibm/service/vpc/resource_ibm_is_image_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ func TestAccIBMISImage_accessTags(t *testing.T) {
7171
func TestAccIBMISImage_allowedUse(t *testing.T) {
7272
var image string
7373
name := fmt.Sprintf("tfimg-name-%d", acctest.RandIntRange(10, 100))
74-
apiVersion := "2024-10-02"
74+
apiVersion := "2025-07-02"
7575
bareMetalServer := "enable_secure_boot==true"
7676
instance := "enable_secure_boot==true"
77-
apiVersionUpdate := "2024-10-05"
78-
bareMetalServerUpdate := "gpu.count > 0 && enable_secure_boot == true"
79-
instanceUpdate := "gpu.count > 0 && enable_secure_boot == true"
77+
apiVersionUpdate := "2025-07-02"
78+
bareMetalServerUpdate := "true"
79+
instanceUpdate := "true"
8080
resource.Test(t, resource.TestCase{
8181
PreCheck: func() { acc.TestAccPreCheckImage(t) },
8282
Providers: acc.TestAccProviders,
@@ -97,9 +97,9 @@ func TestAccIBMISImage_allowedUse(t *testing.T) {
9797
"ibm_is_image.isExampleImage", "allowed_use.0.instance"),
9898
resource.TestCheckResourceAttrSet(
9999
"ibm_is_image.isExampleImage", "allowed_use.0.api_version"),
100-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "bare_metal_server", bareMetalServer),
101-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "instance", instance),
102-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "api_version", apiVersion),
100+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.bare_metal_server", bareMetalServer),
101+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.instance", instance),
102+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.api_version", apiVersion),
103103
),
104104
},
105105
{
@@ -117,9 +117,9 @@ func TestAccIBMISImage_allowedUse(t *testing.T) {
117117
"ibm_is_image.isExampleImage", "allowed_use.0.instance"),
118118
resource.TestCheckResourceAttrSet(
119119
"ibm_is_image.isExampleImage", "allowed_use.0.api_version"),
120-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "bare_metal_server", bareMetalServerUpdate),
121-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "instance", instanceUpdate),
122-
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "api_version", apiVersionUpdate),
120+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.bare_metal_server", bareMetalServerUpdate),
121+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.instance", instanceUpdate),
122+
resource.TestCheckResourceAttr("ibm_is_image.isExampleImage", "allowed_use.0.api_version", apiVersionUpdate),
123123
),
124124
},
125125
},

‎ibm/service/vpc/resource_ibm_is_snapshot_test.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,12 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
6868
volname := fmt.Sprintf("tf-vol-%d", acctest.RandIntRange(10, 100))
6969
name1 := fmt.Sprintf("tfsnapshotuat-%d", acctest.RandIntRange(10, 100))
7070
name2 := fmt.Sprintf("tfsnapshotuat-%d", acctest.RandIntRange(10, 100))
71-
apiVersion := "2024-10-02"
72-
bareMetalServer := "enable_secure_boot==true"
73-
instance := "enable_secure_boot==true"
74-
apiVersionUpdate := "2024-10-05"
75-
bareMetalServerUpdate := "gpu.count > 0 && enable_secure_boot == true"
76-
instanceUpdate := "gpu.count > 0 && enable_secure_boot == true"
71+
apiVersion := "2025-07-01"
72+
bareMetalServer := "true"
73+
instance := "true"
74+
apiVersionUpdate := "2025-07-02"
75+
bareMetalServerUpdate := "true"
76+
instanceUpdate := "true"
7777
resource.Test(t, resource.TestCase{
7878
PreCheck: func() { acc.TestAccPreCheck(t) },
7979
Providers: acc.TestAccProviders,
@@ -93,9 +93,9 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
9393
"ibm_is_snapshot.testacc_snapshot", "allowed_use.0.instance"),
9494
resource.TestCheckResourceAttrSet(
9595
"ibm_is_snapshot.testacc_snapshot", "allowed_use.0.api_version"),
96-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "bare_metal_server", bareMetalServer),
97-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "instance", instance),
98-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "api_version", apiVersion),
96+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.bare_metal_server", bareMetalServer),
97+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.instance", instance),
98+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.api_version", apiVersion),
9999
),
100100
},
101101
{
@@ -112,9 +112,9 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
112112
"ibm_is_snapshot.testacc_snapshot", "allowed_use.0.instance"),
113113
resource.TestCheckResourceAttrSet(
114114
"ibm_is_snapshot.testacc_snapshot", "allowed_use.0.api_version"),
115-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "bare_metal_server", bareMetalServerUpdate),
116-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "instance", instanceUpdate),
117-
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "api_version", apiVersionUpdate),
115+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.bare_metal_server", bareMetalServerUpdate),
116+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.instance", instanceUpdate),
117+
resource.TestCheckResourceAttr("ibm_is_snapshot.testacc_snapshot", "allowed_use.0.api_version", apiVersionUpdate),
118118
),
119119
},
120120
},

‎ibm/service/vpc/resource_ibm_is_volume.go‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -550,10 +550,6 @@ func volCreate(context context.Context, d *schema.ResourceData, meta interface{}
550550
volTemplate.Capacity = &volCapacity
551551
}
552552
}
553-
if allowedUse, ok := d.GetOk("allowed_use"); ok {
554-
allowedUseModel, _ := ResourceIBMIsVolumeAllowedUseMapToVolumeAllowedUsePrototype(allowedUse.([]interface{})[0].(map[string]interface{}))
555-
volTemplate.AllowedUse = allowedUseModel
556-
}
557553
} else if sourceSnapshtCrn, ok := d.GetOk(isVolumeSourceSnapshotCrn); ok {
558554
sourceSnapshot := sourceSnapshtCrn.(string)
559555

@@ -567,10 +563,6 @@ func volCreate(context context.Context, d *schema.ResourceData, meta interface{}
567563
volTemplate.Capacity = &volCapacity
568564
}
569565
}
570-
if allowedUse, ok := d.GetOk("allowed_use"); ok {
571-
allowedUseModel, _ := ResourceIBMIsVolumeAllowedUseMapToVolumeAllowedUsePrototype(allowedUse.([]interface{})[0].(map[string]interface{}))
572-
volTemplate.AllowedUse = allowedUseModel
573-
}
574566
} else if capacity, ok := d.GetOk(isVolumeCapacity); ok {
575567
if int64(capacity.(int)) > 0 {
576568
volCapacity := int64(capacity.(int))
@@ -623,6 +615,11 @@ func volCreate(context context.Context, d *schema.ResourceData, meta interface{}
623615
volTemplate.UserTags = userTagsArray
624616
}
625617
}
618+
if allowedUse, ok := d.GetOk("allowed_use"); ok {
619+
allowedUseModel, _ := ResourceIBMIsVolumeAllowedUseMapToVolumeAllowedUsePrototype(allowedUse.([]interface{})[0].(map[string]interface{}))
620+
volTemplate.AllowedUse = allowedUseModel
621+
}
622+
626623
options.VolumePrototype = volTemplate
627624
vol, _, err := sess.CreateVolumeWithContext(context, options)
628625
if err != nil {

‎ibm/service/vpc/resource_ibm_is_volume_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -232,12 +232,12 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
232232
sshname := fmt.Sprintf("tf-ssh-%d", acctest.RandIntRange(10, 100))
233233
volname := fmt.Sprintf("tf-vol-%d", acctest.RandIntRange(10, 100))
234234
name1 := fmt.Sprintf("tfsnapshotuat-%d", acctest.RandIntRange(10, 100))
235-
apiVersion := "2024-10-02"
235+
apiVersion := "2025-07-02"
236236
bareMetalServer := "enable_secure_boot==true"
237237
instance := "enable_secure_boot==true"
238-
apiVersionUpdate := "2024-10-05"
239-
bareMetalServerUpdate := "gpu.count > 0 && enable_secure_boot == true"
240-
instanceUpdate := "gpu.count > 0 && enable_secure_boot == true"
238+
apiVersionUpdate := "2025-07-05"
239+
bareMetalServerUpdate := "true"
240+
instanceUpdate := "true"
241241
resource.Test(t, resource.TestCase{
242242
PreCheck: func() { acc.TestAccPreCheck(t) },
243243
Providers: acc.TestAccProviders,
@@ -259,9 +259,9 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
259259
"ibm_is_volume.storage", "allowed_use.0.instance"),
260260
resource.TestCheckResourceAttrSet(
261261
"ibm_is_volume.storage", "allowed_use.0.api_version"),
262-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "bare_metal_server", bareMetalServer),
263-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "instance", instance),
264-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "api_version", apiVersion),
262+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.bare_metal_server", bareMetalServer),
263+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.instance", instance),
264+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.api_version", apiVersion),
265265
),
266266
},
267267
{
@@ -280,9 +280,9 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
280280
"ibm_is_volume.storage", "allowed_use.0.instance"),
281281
resource.TestCheckResourceAttrSet(
282282
"ibm_is_volume.storage", "allowed_use.0.api_version"),
283-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "bare_metal_server", bareMetalServerUpdate),
284-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "instance", instanceUpdate),
285-
resource.TestCheckResourceAttr("ibm_is_volume.storage", "api_version", apiVersionUpdate),
283+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.bare_metal_server", bareMetalServerUpdate),
284+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.instance", instanceUpdate),
285+
resource.TestCheckResourceAttr("ibm_is_volume.storage", "allowed_use.0.api_version", apiVersionUpdate),
286286
),
287287
},
288288
},

0 commit comments

Comments
 (0)