Skip to content

Move Storage Pool mode and its tests to GA #16960

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

Open
riteshghorse wants to merge 1 commit into
base: main
Choose a base branch
from
+82 −83
Open

Move Storage Pool mode and its tests to GA #16960

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
1 change: 0 additions & 1 deletion mmv1/products/netapp/StoragePool.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,5 +270,4 @@ properties:
- 'DEFAULT'
- 'ONTAP'
immutable: true
min_version: beta
default_from_api: true
164 changes: 82 additions & 82 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 @@ -809,23 +809,20 @@ resource "google_netapp_storage_pool" "test_pool" {
`, context)
}

{{- if ne $.TargetVersionName "ga" }}
func TestAccNetappStoragePool_ScaleTierEnterprise(t *testing.T) {
func TestAccNetappStoragePool_ontapMode(t *testing.T) {
t.Parallel()

context := map[string]interface{}{
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
"random_suffix": acctest.RandString(t, 10),
}

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
CheckDestroy: testAccCheckNetappVolumeDestroyProducer(t),
ExternalProviders: map[string]resource.ExternalProvider{
"time": {},
},
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
Steps: []resource.TestStep{
{
Config: testAccNetappStoragePool_ScaleTierEnterprise(context),
Config: testAccNetappStoragePool_ontapMode(context),
},
{
ResourceName: "google_netapp_storage_pool.test_pool",
Expand All @@ -834,7 +831,7 @@ func TestAccNetappStoragePool_ScaleTierEnterprise(t *testing.T) {
ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
},
{
Config: testAccNetappStoragePool_ScaleTierEnterprise_update(context),
Config: testAccNetappStoragePool_ontapModeUpdate(context),
},
{
ResourceName: "google_netapp_storage_pool.test_pool",
Expand All @@ -846,70 +843,72 @@ func TestAccNetappStoragePool_ScaleTierEnterprise(t *testing.T) {
})
}

func testAccNetappStoragePool_ScaleTierEnterprise(context map[string]interface{}) string {
func testAccNetappStoragePool_ontapMode(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-central1-a"
service_level = "FLEX"
type = "UNIFIED"
capacity_gib = "12288"
network = data.google_compute_network.default.id
description = "this is a test description"
labels = {
key = "test"
value = "pool"
}
scale_tier = "SCALE_TIER_ENTERPRISE"
}

data "google_compute_network" "default" {
provider = google-beta
name = "%{network_name}"
name = "%{network_name}"
}

resource "google_netapp_storage_pool" "test_pool" {
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
mode = "ONTAP"
capacity_gib = "2048"
network = data.google_compute_network.default.id
description = "testing ontap mode"
labels = {
key = "test"
value = "pool"
}
}
`, context)
}

func testAccNetappStoragePool_ScaleTierEnterprise_update(context map[string]interface{}) string {
func testAccNetappStoragePool_ontapModeUpdate(context map[string]interface{}) string {
return acctest.Nprintf(`

data "google_compute_network" "default" {
name = "%{network_name}"
}

resource "google_netapp_storage_pool" "test_pool" {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
capacity_gib = "13312"
network = data.google_compute_network.default.id
description = "this is a test description"
labels = {
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
mode = "ONTAP"
capacity_gib = "2048"
network = data.google_compute_network.default.id
description = "updated description"
labels = {
key = "test"
value = "pool"
}
scale_tier = "SCALE_TIER_ENTERPRISE"
}

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

func TestAccNetappStoragePool_ontapMode(t *testing.T) {
t.Parallel()

{{- if ne $.TargetVersionName "ga" }}
func TestAccNetappStoragePool_ScaleTierEnterprise(t *testing.T) {
context := map[string]interface{}{
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
"random_suffix": acctest.RandString(t, 10),
}

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t),
CheckDestroy: testAccCheckNetappVolumeDestroyProducer(t),
ExternalProviders: map[string]resource.ExternalProvider{
"time": {},
},
Steps: []resource.TestStep{
{
Config: testAccNetappStoragePool_ontapMode(context),
Config: testAccNetappStoragePool_ScaleTierEnterprise(context),
},
{
ResourceName: "google_netapp_storage_pool.test_pool",
Expand All @@ -918,7 +917,7 @@ func TestAccNetappStoragePool_ontapMode(t *testing.T) {
ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
},
{
Config: testAccNetappStoragePool_ontapModeUpdate(context),
Config: testAccNetappStoragePool_ScaleTierEnterprise_update(context),
},
{
ResourceName: "google_netapp_storage_pool.test_pool",
Expand All @@ -930,51 +929,52 @@ func TestAccNetappStoragePool_ontapMode(t *testing.T) {
})
}

func testAccNetappStoragePool_ontapMode(context map[string]interface{}) string {
func testAccNetappStoragePool_ScaleTierEnterprise(context map[string]interface{}) string {
return acctest.Nprintf(`

data "google_compute_network" "default" {
name = "%{network_name}"
resource "google_netapp_storage_pool" "test_pool" {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
capacity_gib = "12288"
network = data.google_compute_network.default.id
description = "this is a test description"
labels = {
key = "test"
value = "pool"
}
scale_tier = "SCALE_TIER_ENTERPRISE"
}

resource "google_netapp_storage_pool" "test_pool" {
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
mode = "ONTAP"
capacity_gib = "2048"
network = data.google_compute_network.default.id
description = "testing ontap mode"
labels = {
key = "test"
value = "pool"
}
data "google_compute_network" "default" {
provider = google-beta
name = "%{network_name}"
}
`, context)
}

func testAccNetappStoragePool_ontapModeUpdate(context map[string]interface{}) string {
func testAccNetappStoragePool_ScaleTierEnterprise_update(context map[string]interface{}) string {
return acctest.Nprintf(`

data "google_compute_network" "default" {
name = "%{network_name}"
}

resource "google_netapp_storage_pool" "test_pool" {
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
mode = "ONTAP"
capacity_gib = "2048"
network = data.google_compute_network.default.id
description = "updated description"
labels = {
provider = google-beta
name = "tf-test-pool%{random_suffix}"
location = "us-central1-a"
service_level = "FLEX"
type = "UNIFIED"
capacity_gib = "13312"
network = data.google_compute_network.default.id
description = "this is a test description"
labels = {
key = "test"
value = "pool"
}
total_throughput_mibps = "200"
scale_tier = "SCALE_TIER_ENTERPRISE"
}

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