Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

promote netapp regional flex storage pool and volume to GA #12082

Merged
merged 1 commit into from
Oct 23, 2024
Merged

promote netapp regional flex storage pool and volume to GA #12082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions mmv1/products/netapp/StoragePool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ description: |
the next apply. You can trigger a manual
[zone switch](https://cloud.google.com/netapp/volumes/docs/configure-and-use/storage-pools/edit-or-delete-storage-pool#switch_active_and_replica_zones)
via Terraform by swapping the value of the `zone` and `replica_zone` parameters in your HCL code.
Note : Regional FLEX storage pool are supported in beta provider currently.

references:
guides:
Expand Down Expand Up @@ -161,13 +160,11 @@ properties:
Specifies the active zone for regional Flex pools. `zone` and `replica_zone` values can be swapped to initiate a
[zone switch](https://cloud.google.com/netapp/volumes/docs/configure-and-use/storage-pools/edit-or-delete-storage-pool#switch_active_and_replica_zones).
If you want to create a zonal Flex pool, specify a zone name for `location` and omit `zone`.
min_version: 'beta'
- name: 'replicaZone'
type: String
description: |
Specifies the replica zone for regional Flex pools. `zone` and `replica_zone` values can be swapped to initiate a
[zone switch](https://cloud.google.com/netapp/volumes/docs/configure-and-use/storage-pools/edit-or-delete-storage-pool#switch_active_and_replica_zones).
min_version: 'beta'
- name: 'allowAutoTiering'
type: Boolean
description: |
Expand Down
2 changes: 0 additions & 2 deletions mmv1/products/netapp/Volume.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,13 +480,11 @@ properties:
type: String
description: |
Specifies the active zone for regional volume.
min_version: 'beta'
output: true
- name: 'replicaZone'
type: String
description: |
Specifies the replica zone for regional volume.
min_version: 'beta'
output: true
- name: 'largeCapacity'
type: Boolean
Expand Down
14 changes: 1 addition & 13 deletions mmv1/third_party/terraform/services/netapp/resource_netapp_storage_pool_test.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,8 @@ package netapp_test

import (
"testing"
{{- if ne $.TargetVersionName "ga" }}
"time"
"github.com/hashicorp/terraform-plugin-testing/terraform"
{{- end }}

"github.com/hashicorp/terraform-plugin-testing/helper/resource"
"github.com/hashicorp/terraform-provider-google/google/acctest"
)
Expand Down Expand Up @@ -197,7 +194,6 @@ resource "google_netapp_storage_pool" "test_pool" {
`, context)
}

{{ if ne $.TargetVersionName `ga` -}}
func TestAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_update(t *testing.T) {
context := map[string]interface{}{
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-1", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
Expand All @@ -206,7 +202,7 @@ func TestAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_update(t *tes

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
CheckDestroy: testAccCheckNetappStoragePoolDestroyProducer(t),
ExternalProviders: map[string]resource.ExternalProvider{
"time": {},
Expand Down Expand Up @@ -247,7 +243,6 @@ func TestAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_update(t *tes
func testAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_full(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_netapp_storage_pool" "test_pool" {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-east1"
service_level = "FLEX"
Expand All @@ -263,7 +258,6 @@ resource "time_sleep" "wait_5_minutes" {
}

data "google_compute_network" "default" {
provider = google-beta
name = "%{network_name}"
}
`, context)
Expand All @@ -272,7 +266,6 @@ data "google_compute_network" "default" {
func testAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_switchZone(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_netapp_storage_pool" "test_pool" {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-east1"
service_level = "FLEX"
Expand All @@ -288,7 +281,6 @@ resource "time_sleep" "wait_5_minutes" {
}

data "google_compute_network" "default" {
provider = google-beta
name = "%{network_name}"
}
`, context)
Expand All @@ -305,7 +297,6 @@ func testAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_sleep_5_mins(
func testAccNetappStoragePool_FlexRegionalStoragePoolCreateExample_switchBackZone(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_netapp_storage_pool" "test_pool" {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-east1"
service_level = "FLEX"
Expand All @@ -321,10 +312,7 @@ resource "time_sleep" "wait_5_minutes" {
}

data "google_compute_network" "default" {
provider = google-beta
name = "%{network_name}"
}
`, context)
}

{{ end }}
Loading