Skip to content

Commit e854962

Browse files
sahil-mahajan-googlesahil-mahajan-google
authored
Make flex autotiering fields GA (#15189)
1 parent b705a26 commit e854962

File tree

4 files changed

+27
-24
lines changed

4 files changed

+27
-24
lines changed

‎mmv1/products/netapp/StoragePool.yaml‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -200,15 +200,13 @@ properties:
200200
description: |
201201
Total hot tier capacity for the Storage Pool. It is applicable only to Flex service level.
202202
It should be less than the minimum storage pool size and cannot be more than the current storage pool size. It cannot be decreased once set.
203-
min_version: 'beta'
204203
- name: 'enableHotTierAutoResize'
205204
type: Boolean
206205
send_empty_value: true
207206
ignore_read: true
208207
description: |
209208
Flag indicating that the hot-tier threshold will be auto-increased by 10% of the hot-tier when it hits 100%. Default is true.
210209
The increment will kick in only if the new size after increment is still less than or equal to storage pool size.
211-
min_version: 'beta'
212210
- name: 'qosType'
213211
type: Enum
214212
description: |
@@ -224,3 +222,13 @@ properties:
224222
description: |
225223
Available throughput of the storage pool (in MiB/s).
226224
output: true
225+
- name: 'coldTierSizeUsedGib'
226+
type: String
227+
description: |
228+
Total cold tier data rounded down to the nearest GiB used by the storage pool.
229+
output: true
230+
- name: 'hotTierSizeUsedGib'
231+
type: String
232+
description: |
233+
Total hot tier data rounded down to the nearest GiB used by the storage pool.
234+
output: true

‎mmv1/products/netapp/Volume.yaml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,11 @@ properties:
368368
description: |
369369
Protocol to mount with.
370370
output: true
371+
- name: 'ipAddress'
372+
type: String
373+
description: |
374+
IP Address.
375+
output: true
371376
- name: 'snapshotPolicy'
372377
type: NestedObject
373378
description: |-
@@ -542,7 +547,6 @@ properties:
542547
description: |
543548
Optional. Flag indicating that the hot tier bypass mode is enabled. Default is false.
544549
Only applicable to Flex service level.
545-
min_version: 'beta'
546550
- name: 'hybridReplicationParameters'
547551
type: NestedObject
548552
description: |-
@@ -588,3 +592,8 @@ properties:
588592
description: |
589593
Optional. Custom Performance Total Throughput of the pool (in MiB/s).
590594
default_from_api: true
595+
- name: 'hotTierSizeUsedGib'
596+
type: String
597+
description: |
598+
Total hot tier data rounded down to the nearest GiB used by the volume. This field is only used for flex Service Level
599+
output: true

mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.tmpl renamed to mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ resource "google_netapp_storage_pool" "test_pool" {
181181
`, context)
182182
}
183183

184-
{{ if ne $.TargetVersionName `ga` -}}
185184
func TestAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_update(t *testing.T) {
186185
context := map[string]interface{}{
187186
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-2", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
@@ -190,7 +189,7 @@ func TestAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_update(t *tes
190189

191190
acctest.VcrTest(t, resource.TestCase{
192191
PreCheck: func() { acctest.AccTestPreCheck(t) },
193-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
192+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
194193
CheckDestroy: testAccCheckNetappStoragePoolDestroyProducer(t),
195194
ExternalProviders: map[string]resource.ExternalProvider{
196195
"time": {},
@@ -229,14 +228,12 @@ func TestAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_update(t *tes
229228
}
230229

231230
func testAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_full(context map[string]interface{}) string {
232-
return acctest.Nprintf(`
231+
return acctest.Nprintf(`
233232
data "google_compute_network" "default" {
234-
provider = google-beta
235233
name = "%{network_name}"
236234
}
237235
238236
resource "google_netapp_storage_pool" "test_pool" {
239-
provider = google-beta
240237
name = "tf-test-pool%{random_suffix}"
241238
location = "us-south1-a"
242239
service_level = "FLEX"
@@ -261,14 +258,12 @@ resource "google_netapp_storage_pool" "test_pool" {
261258
}
262259

263260
func testAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_update(context map[string]interface{}) string {
264-
return acctest.Nprintf(`
261+
return acctest.Nprintf(`
265262
data "google_compute_network" "default" {
266-
provider = google-beta
267263
name = "%{network_name}"
268264
}
269265
270266
resource "google_netapp_storage_pool" "test_pool" {
271-
provider = google-beta
272267
name = "tf-test-pool%{random_suffix}"
273268
location = "us-south1-a"
274269
service_level = "FLEX"
@@ -293,14 +288,12 @@ resource "google_netapp_storage_pool" "test_pool" {
293288
}
294289

295290
func testAccNetappStoragePool_flexAutoTierStoragePoolCreateExample_update_2(context map[string]interface{}) string {
296-
return acctest.Nprintf(`
291+
return acctest.Nprintf(`
297292
data "google_compute_network" "default" {
298-
provider = google-beta
299293
name = "%{network_name}"
300294
}
301295
302296
resource "google_netapp_storage_pool" "test_pool" {
303-
provider = google-beta
304297
name = "tf-test-pool%{random_suffix}"
305298
location = "us-south1-a"
306299
service_level = "FLEX"
@@ -322,7 +315,6 @@ resource "google_netapp_storage_pool" "test_pool" {
322315
}
323316
`, context)
324317
}
325-
{{ end }}
326318

327319
func TestAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_update(t *testing.T) {
328320
context := map[string]interface{}{
@@ -734,4 +726,4 @@ data "google_compute_network" "default" {
734726
name = "%{network_name}"
735727
}
736728
`, context)
737-
}
729+
}

‎mmv1/third_party/terraform/services/netapp/resource_netapp_volume_test.go.tmpl‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -760,7 +760,6 @@ data "google_compute_network" "default" {
760760
`, context)
761761
}
762762

763-
{{ if ne $.TargetVersionName `ga` -}}
764763
func TestAccNetappVolume_flexAutoTierNetappVolume_update(t *testing.T) {
765764
context := map[string]interface{}{
766765
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
@@ -769,7 +768,7 @@ func TestAccNetappVolume_flexAutoTierNetappVolume_update(t *testing.T) {
769768

770769
acctest.VcrTest(t, resource.TestCase{
771770
PreCheck: func() { acctest.AccTestPreCheck(t) },
772-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
771+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
773772
CheckDestroy: testAccCheckNetappVolumeDestroyProducer(t),
774773
ExternalProviders: map[string]resource.ExternalProvider{
775774
"time": {},
@@ -800,7 +799,6 @@ func TestAccNetappVolume_flexAutoTierNetappVolume_update(t *testing.T) {
800799
func testAccNetappVolume_flexAutoTierVolume_default(context map[string]interface{}) string {
801800
return acctest.Nprintf(`
802801
resource "google_netapp_storage_pool" "default" {
803-
provider = google-beta
804802
name = "tf-test-pool%{random_suffix}"
805803
location = "us-south1-a"
806804
service_level = "FLEX"
@@ -814,7 +812,6 @@ resource "google_netapp_storage_pool" "default" {
814812
enable_hot_tier_auto_resize = true
815813
}
816814
resource "google_netapp_volume" "test_volume" {
817-
provider = google-beta
818815
location = "us-south1-a"
819816
name = "tf-test-volume%{random_suffix}"
820817
capacity_gib = "100"
@@ -828,7 +825,6 @@ resource "google_netapp_volume" "test_volume" {
828825
}
829826
}
830827
data "google_compute_network" "default" {
831-
provider = google-beta
832828
name = "%{network_name}"
833829
}
834830
`, context)
@@ -837,7 +833,6 @@ data "google_compute_network" "default" {
837833
func testAccNetappVolume_flexAutoTierVolume_update(context map[string]interface{}) string {
838834
return acctest.Nprintf(`
839835
resource "google_netapp_storage_pool" "default" {
840-
provider = google-beta
841836
name = "tf-test-pool%{random_suffix}"
842837
location = "us-south1-a"
843838
service_level = "FLEX"
@@ -851,7 +846,6 @@ resource "google_netapp_storage_pool" "default" {
851846
enable_hot_tier_auto_resize = true
852847
}
853848
resource "google_netapp_volume" "test_volume" {
854-
provider = google-beta
855849
location = "us-south1-a"
856850
name = "tf-test-volume%{random_suffix}"
857851
capacity_gib = "100"
@@ -865,12 +859,12 @@ resource "google_netapp_volume" "test_volume" {
865859
}
866860
}
867861
data "google_compute_network" "default" {
868-
provider = google-beta
869862
name = "%{network_name}"
870863
}
871864
`, context)
872865
}
873866

867+
{{ if ne $.TargetVersionName `ga` -}}
874868
func TestAccNetappVolume_volumeExportPolicyWithSquashMode(t *testing.T) {
875869
context := map[string]interface{}{
876870
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),

0 commit comments

Comments
 (0)