Skip to content

Commit 98617c8

Browse files
raazanandraazanand
authored
updated tests for manualQos (#15165)
1 parent e38abc1 commit 98617c8

File tree

3 files changed

+97
-100
lines changed

3 files changed

+97
-100
lines changed

‎mmv1/products/netapp/StoragePool.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ properties:
218218
- 'QOS_TYPE_UNSPECIFIED'
219219
- 'AUTO'
220220
- 'MANUAL'
221+
default_from_api: true
221222
- name: 'availableThroughputMibps'
222223
type: Double
223224
description: |

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

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -634,6 +634,102 @@ resource "google_netapp_storage_pool" "test_pool" {
634634
total_iops = "3500"
635635
}
636636

637+
data "google_compute_network" "default" {
638+
name = "%{network_name}"
639+
}
640+
`, context)
641+
}
642+
643+
func TestAccNetappStoragePool_ManualQos(t *testing.T) {
644+
context := map[string]interface{}{
645+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
646+
"random_suffix": acctest.RandString(t, 10),
647+
}
648+
649+
acctest.VcrTest(t, resource.TestCase{
650+
PreCheck: func() { acctest.AccTestPreCheck(t) },
651+
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
652+
CheckDestroy: testAccCheckNetappVolumeDestroyProducer(t),
653+
ExternalProviders: map[string]resource.ExternalProvider{
654+
"time": {},
655+
},
656+
Steps: []resource.TestStep{
657+
{
658+
Config: testAccNetappVolume_ManualQosAuto(context),
659+
},
660+
{
661+
ResourceName: "google_netapp_storage_pool.test_pool",
662+
ImportState: true,
663+
ImportStateVerify: true,
664+
ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
665+
},
666+
{
667+
Config: testAccNetappVolume_ManualQosManual(context),
668+
},
669+
{
670+
ResourceName: "google_netapp_storage_pool.test_pool",
671+
ImportState: true,
672+
ImportStateVerify: true,
673+
ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
674+
},
675+
{
676+
Config: testAccNetappVolume_ManualQosManual_update(context),
677+
},
678+
{
679+
ResourceName: "google_netapp_storage_pool.test_pool",
680+
ImportState: true,
681+
ImportStateVerify: true,
682+
ImportStateVerifyIgnore: []string{"location", "name", "labels", "terraform_labels"},
683+
},
684+
},
685+
})
686+
}
687+
688+
func testAccNetappVolume_ManualQosAuto(context map[string]interface{}) string {
689+
return acctest.Nprintf(`
690+
resource "google_netapp_storage_pool" "test_pool" {
691+
name = "tf-test-pool%{random_suffix}"
692+
location = "us-east4"
693+
service_level = "EXTREME"
694+
capacity_gib = "2048"
695+
network = data.google_compute_network.default.id
696+
qos_type = "AUTO"
697+
}
698+
699+
data "google_compute_network" "default" {
700+
name = "%{network_name}"
701+
}
702+
`, context)
703+
}
704+
705+
func testAccNetappVolume_ManualQosManual(context map[string]interface{}) string {
706+
return acctest.Nprintf(`
707+
resource "google_netapp_storage_pool" "test_pool" {
708+
name = "tf-test-pool%{random_suffix}"
709+
location = "us-east4"
710+
service_level = "EXTREME"
711+
capacity_gib = "2048"
712+
network = data.google_compute_network.default.id
713+
qos_type = "MANUAL"
714+
}
715+
716+
data "google_compute_network" "default" {
717+
name = "%{network_name}"
718+
}
719+
`, context)
720+
}
721+
722+
func testAccNetappVolume_ManualQosManual_update(context map[string]interface{}) string {
723+
return acctest.Nprintf(`
724+
resource "google_netapp_storage_pool" "test_pool" {
725+
name = "tf-test-pool%{random_suffix}"
726+
location = "us-east4"
727+
service_level = "EXTREME"
728+
capacity_gib = "3046"
729+
network = data.google_compute_network.default.id
730+
qos_type = "MANUAL"
731+
}
732+
637733
data "google_compute_network" "default" {
638734
name = "%{network_name}"
639735
}

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

Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -871,106 +871,6 @@ data "google_compute_network" "default" {
871871
`, context)
872872
}
873873

874-
func TestAccNetappStoragePool_ManualQos(t *testing.T) {
875-
context := map[string]interface{}{
876-
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
877-
"random_suffix": acctest.RandString(t, 10),
878-
}
879-
880-
acctest.VcrTest(t, resource.TestCase{
881-
PreCheck: func() { acctest.AccTestPreCheck(t) },
882-
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
883-
CheckDestroy: testAccCheckNetappVolumeDestroyProducer(t),
884-
ExternalProviders: map[string]resource.ExternalProvider{
885-
"time": {},
886-
},
887-
Steps: []resource.TestStep{
888-
{
889-
Config: testAccNetappVolume_ManualQosAuto(context),
890-
},
891-
{
892-
ResourceName: "google_netapp_volume.test_volume",
893-
ImportState: true,
894-
ImportStateVerify: true,
895-
ImportStateVerifyIgnore: []string{"restore_parameters", "location", "name", "deletion_policy", "labels", "terraform_labels"},
896-
},
897-
{
898-
Config: testAccNetappVolume_ManualQosManual(context),
899-
},
900-
{
901-
ResourceName: "google_netapp_volume.test_volume",
902-
ImportState: true,
903-
ImportStateVerify: true,
904-
ImportStateVerifyIgnore: []string{"restore_parameters", "location", "name", "deletion_policy", "labels", "terraform_labels"},
905-
},
906-
},
907-
})
908-
}
909-
910-
func testAccNetappVolume_ManualQosAuto(context map[string]interface{}) string {
911-
return acctest.Nprintf(`
912-
resource "google_netapp_storage_pool" "test_pool" {
913-
name = "tf-test-pool%{random_suffix}"
914-
location = "us-east4"
915-
service_level = "EXTREME"
916-
capacity_gib = "2048"
917-
network = data.google_compute_network.default.id
918-
qos_type = "AUTO"
919-
}
920-
921-
resource "time_sleep" "wait_3_minutes" {
922-
depends_on = [google_netapp_storage_pool.test_pool]
923-
create_duration = "3m"
924-
}
925-
926-
resource "google_netapp_volume" "test_volume" {
927-
location = "us-east4"
928-
name = "tf-test-test-volume%{random_suffix}"
929-
capacity_gib = "100"
930-
share_name = "tf-test-test-volume%{random_suffix}"
931-
storage_pool = google_netapp_storage_pool.test_pool.name
932-
protocols = ["NFSV3"]
933-
}
934-
935-
data "google_compute_network" "default" {
936-
name = "%{network_name}"
937-
}
938-
`, context)
939-
}
940-
941-
func testAccNetappVolume_ManualQosManual(context map[string]interface{}) string {
942-
return acctest.Nprintf(`
943-
resource "google_netapp_storage_pool" "test_pool" {
944-
name = "tf-test-pool%{random_suffix}"
945-
location = "us-east4"
946-
service_level = "EXTREME"
947-
capacity_gib = "2048"
948-
network = data.google_compute_network.default.id
949-
qos_type = "MANUAL"
950-
}
951-
952-
resource "time_sleep" "wait_3_minutes" {
953-
depends_on = [google_netapp_storage_pool.test_pool]
954-
create_duration = "3m"
955-
}
956-
957-
resource "google_netapp_volume" "test_volume" {
958-
location = "us-east4"
959-
name = "tf-test-test-volume%{random_suffix}"
960-
capacity_gib = "100"
961-
description = "This is a test description for manual qos volume"
962-
share_name = "tf-test-test-volume%{random_suffix}"
963-
storage_pool = google_netapp_storage_pool.test_pool.name
964-
protocols = ["NFSV3"]
965-
throughput_mibps = 12.5
966-
}
967-
968-
data "google_compute_network" "default" {
969-
name = "%{network_name}"
970-
}
971-
`, context)
972-
}
973-
974874
func TestAccNetappVolume_volumeExportPolicyWithSquashMode(t *testing.T) {
975875
context := map[string]interface{}{
976876
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-3", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),

0 commit comments

Comments
 (0)