Skip to content

Commit 5be9d61

Browse files
Update netapp tests to use bootstrapped networks (#13877) (#22650)
[upstream:2bd90791ede9b76e572fd50cb52628d6995c3c43] Signed-off-by: Modular Magician <magic-modules@google.com>
1 parent 4007da3 commit 5be9d61

File tree

3 files changed

+15
-95
lines changed

3 files changed

+15
-95
lines changed

google/services/netapp/resource_netapp_storage_pool_generated_test.go

+4-32
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ func TestAccNetappStoragePool_storagePoolCreateExample(t *testing.T) {
3434
t.Parallel()
3535

3636
context := map[string]interface{}{
37+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-1", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
3738
"random_suffix": acctest.RandString(t, 10),
3839
}
3940

@@ -57,37 +58,8 @@ func TestAccNetappStoragePool_storagePoolCreateExample(t *testing.T) {
5758

5859
func testAccNetappStoragePool_storagePoolCreateExample(context map[string]interface{}) string {
5960
return acctest.Nprintf(`
60-
# Create a network or use datasource to reference existing network
61-
resource "google_compute_network" "peering_network" {
62-
name = "tf-test-test-network%{random_suffix}"
63-
}
64-
65-
# Reserve a CIDR for NetApp Volumes to use
66-
# When using shared-VPCs, this resource needs to be created in host project
67-
resource "google_compute_global_address" "private_ip_alloc" {
68-
name = "tf-test-test-address%{random_suffix}"
69-
purpose = "VPC_PEERING"
70-
address_type = "INTERNAL"
71-
prefix_length = 16
72-
network = google_compute_network.peering_network.id
73-
}
74-
75-
# Create a Private Service Access connection
76-
# When using shared-VPCs, this resource needs to be created in host project
77-
resource "google_service_networking_connection" "default" {
78-
network = google_compute_network.peering_network.id
79-
service = "netapp.servicenetworking.goog"
80-
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
81-
}
82-
83-
# Modify the PSA Connection to allow import/export of custom routes
84-
# When using shared-VPCs, this resource needs to be created in host project
85-
resource "google_compute_network_peering_routes_config" "route_updates" {
86-
peering = google_service_networking_connection.default.peering
87-
network = google_compute_network.peering_network.name
88-
89-
import_custom_routes = true
90-
export_custom_routes = true
61+
data "google_compute_network" "default" {
62+
name = "%{network_name}"
9163
}
9264
9365
# Create a storage pool
@@ -98,7 +70,7 @@ resource "google_netapp_storage_pool" "test_pool" {
9870
location = "us-central1"
9971
service_level = "PREMIUM"
10072
capacity_gib = "2048"
101-
network = google_compute_network.peering_network.id
73+
network = data.google_compute_network.default.id
10274
}
10375
`, context)
10476
}

google/services/netapp/resource_netapp_storage_pool_test.go

+10-57
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ func TestAccNetappStoragePool_storagePoolCreateExample_update(t *testing.T) {
1414
t.Parallel()
1515

1616
context := map[string]interface{}{
17+
"network_name": acctest.BootstrapSharedServiceNetworkingConnection(t, "gcnv-network-config-1", acctest.ServiceNetworkWithParentService("netapp.servicenetworking.goog")),
1718
"random_suffix": acctest.RandString(t, 10),
1819
}
1920

@@ -46,32 +47,16 @@ func TestAccNetappStoragePool_storagePoolCreateExample_update(t *testing.T) {
4647
func testAccNetappStoragePool_storagePoolCreateExample_full(context map[string]interface{}) string {
4748
return acctest.Nprintf(`
4849
49-
resource "google_compute_network" "peering_network" {
50-
name = "tf-test-network%{random_suffix}"
51-
}
52-
53-
# Create an IP address
54-
resource "google_compute_global_address" "private_ip_alloc" {
55-
name = "tf-test-address%{random_suffix}"
56-
purpose = "VPC_PEERING"
57-
address_type = "INTERNAL"
58-
prefix_length = 16
59-
network = google_compute_network.peering_network.id
60-
}
61-
62-
# Create a private connection
63-
resource "google_service_networking_connection" "default" {
64-
network = google_compute_network.peering_network.id
65-
service = "netapp.servicenetworking.goog"
66-
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
50+
data "google_compute_network" "default" {
51+
name = "%{network_name}"
6752
}
6853
6954
resource "google_netapp_storage_pool" "test_pool" {
7055
name = "tf-test-pool%{random_suffix}"
7156
location = "us-central1"
7257
service_level = "PREMIUM"
7358
capacity_gib = "2048"
74-
network = google_compute_network.peering_network.id
59+
network = data.google_compute_network.default.id
7560
active_directory = ""
7661
description = "this is a test description"
7762
kms_config = ""
@@ -88,32 +73,16 @@ resource "google_netapp_storage_pool" "test_pool" {
8873
func testAccNetappStoragePool_storagePoolCreateExample_update(context map[string]interface{}) string {
8974
return acctest.Nprintf(`
9075
91-
resource "google_compute_network" "peering_network" {
92-
name = "tf-test-network%{random_suffix}"
93-
}
94-
95-
# Create an IP address
96-
resource "google_compute_global_address" "private_ip_alloc" {
97-
name = "tf-test-address%{random_suffix}"
98-
purpose = "VPC_PEERING"
99-
address_type = "INTERNAL"
100-
prefix_length = 16
101-
network = google_compute_network.peering_network.id
102-
}
103-
104-
# Create a private connection
105-
resource "google_service_networking_connection" "default" {
106-
network = google_compute_network.peering_network.id
107-
service = "netapp.servicenetworking.goog"
108-
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
76+
data "google_compute_network" "default" {
77+
name = "%{network_name}"
10978
}
11079
11180
resource "google_netapp_storage_pool" "test_pool" {
11281
name = "tf-test-pool%{random_suffix}"
11382
location = "us-central1"
11483
service_level = "PREMIUM"
11584
capacity_gib = "4096"
116-
network = google_compute_network.peering_network.id
85+
network = data.google_compute_network.default.id
11786
active_directory = ""
11887
description = "this is test"
11988
kms_config = ""
@@ -156,32 +125,16 @@ func TestAccNetappStoragePool_autoTieredStoragePoolCreateExample_update(t *testi
156125

157126
func testAccNetappStoragePool_autoTieredStoragePoolCreateExample_full(context map[string]interface{}) string {
158127
return acctest.Nprintf(`
159-
resource "google_compute_network" "peering_network" {
160-
name = "tf-test-network%{random_suffix}"
161-
}
162-
163-
# Create an IP address
164-
resource "google_compute_global_address" "private_ip_alloc" {
165-
name = "tf-test-address%{random_suffix}"
166-
purpose = "VPC_PEERING"
167-
address_type = "INTERNAL"
168-
prefix_length = 16
169-
network = google_compute_network.peering_network.id
170-
}
171-
172-
# Create a private connection
173-
resource "google_service_networking_connection" "default" {
174-
network = google_compute_network.peering_network.id
175-
service = "netapp.servicenetworking.goog"
176-
reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
128+
data "google_compute_network" "default" {
129+
name = "%{network_name}"
177130
}
178131
179132
resource "google_netapp_storage_pool" "test_pool" {
180133
name = "tf-test-pool%{random_suffix}"
181134
location = "us-east4"
182135
service_level = "PREMIUM"
183136
capacity_gib = "2048"
184-
network = google_compute_network.peering_network.id
137+
network = data.google_compute_network.default.id
185138
active_directory = ""
186139
description = "this is a test description"
187140
kms_config = ""

website/docs/r/netapp_storage_pool.html.markdown

+1-6
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,7 @@ To get more information about StoragePool, see:
5252
* [Quickstart documentation](https://cloud.google.com/netapp/volumes/docs/get-started/quickstarts/create-storage-pool)
5353
* [Regional Flex zone switch](https://cloud.google.com/netapp/volumes/docs/configure-and-use/storage-pools/edit-or-delete-storage-pool#switch_active_and_replica_zones)
5454

55-
<div class = "oics-button" style="float: right; margin: 0 0 -15px">
56-
<a href="https://console.cloud.google.com/cloudshell/open?cloudshell_git_repo=https%3A%2F%2Fgithub.com%2Fterraform-google-modules%2Fdocs-examples.git&cloudshell_image=gcr.io%2Fcloudshell-images%2Fcloudshell%3Alatest&cloudshell_print=.%2Fmotd&cloudshell_tutorial=.%2Ftutorial.md&cloudshell_working_dir=Storage_pool_create&open_in_editor=main.tf" target="_blank">
57-
<img alt="Open in Cloud Shell" src="//gstatic.com/cloudssh/images/open-btn.svg" style="max-height: 44px; margin: 32px auto; max-width: 100%;">
58-
</a>
59-
</div>
60-
## Example Usage - Storage Pool Create
55+
## Example Usage - Storage Pool Create Doc
6156

6257

6358
```hcl

0 commit comments

Comments
 (0)