Skip to content

Commit f8f86d1

Browse files
chore(tests): add display_text in cloudstack_network test to support cloudstack v4.17
1 parent c8d8dc1 commit f8f86d1

12 files changed

+33
-0
lines changed

cloudstack/resource_cloudstack_attach_volume_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ func TestAccCloudstackAttachVolume_basic(t *testing.T) {
4343
const testAccCloudstackAttachVolume_basic = `
4444
resource "cloudstack_network" "foo" {
4545
name = "terraform-network"
46+
display_text = "terraform-network"
4647
cidr = "10.1.1.0/24"
4748
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
4849
zone = "Sandbox-simulator"

cloudstack/resource_cloudstack_disk_test.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ resource "cloudstack_disk" "foo" {
228228
const testAccCloudStackDisk_deviceID = `
229229
resource "cloudstack_network" "foo" {
230230
name = "terraform-network"
231+
display_text = "terraform-network"
231232
cidr = "10.1.1.0/24"
232233
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
233234
zone = "Sandbox-simulator"

cloudstack/resource_cloudstack_egress_firewall_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@ func testAccCheckCloudStackEgressFirewallDestroy(s *terraform.State) error {
162162
const testAccCloudStackEgressFirewall_basic = `
163163
resource "cloudstack_network" "foo" {
164164
name = "terraform-network"
165+
display_text = "terraform-network"
165166
cidr = "10.1.1.0/24"
166167
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
167168
zone = "Sandbox-simulator"
@@ -180,6 +181,7 @@ resource "cloudstack_egress_firewall" "foo" {
180181
const testAccCloudStackEgressFirewall_update = `
181182
resource "cloudstack_network" "foo" {
182183
name = "terraform-network"
184+
display_text = "terraform-network"
183185
cidr = "10.1.1.0/24"
184186
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
185187
zone = "Sandbox-simulator"

cloudstack/resource_cloudstack_firewall_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ func testAccCheckCloudStackFirewallDestroy(s *terraform.State) error {
188188
const testAccCloudStackFirewall_basic = `
189189
resource "cloudstack_network" "foo" {
190190
name = "terraform-network"
191+
display_text = "terraform-network"
191192
cidr = "10.1.1.0/24"
192193
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
193194
source_nat_ip = true
@@ -213,6 +214,7 @@ resource "cloudstack_firewall" "foo" {
213214
const testAccCloudStackFirewall_update = `
214215
resource "cloudstack_network" "foo" {
215216
name = "terraform-network"
217+
display_text = "terraform-network"
216218
cidr = "10.1.1.0/24"
217219
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
218220
source_nat_ip = true

cloudstack/resource_cloudstack_instance_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ func testAccCheckCloudStackInstanceDestroy(s *terraform.State) error {
312312
const testAccCloudStackInstance_basic = `
313313
resource "cloudstack_network" "foo" {
314314
name = "terraform-network"
315+
display_text = "terraform-network"
315316
cidr = "10.1.1.0/24"
316317
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
317318
zone = "Sandbox-simulator"
@@ -334,6 +335,7 @@ resource "cloudstack_instance" "foobar" {
334335
const testAccCloudStackInstance_stopped = `
335336
resource "cloudstack_network" "foo" {
336337
name = "terraform-network"
338+
display_text = "terraform-network"
337339
cidr = "10.1.1.0/24"
338340
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
339341
zone = "Sandbox-simulator"
@@ -353,6 +355,7 @@ resource "cloudstack_instance" "foobar" {
353355
const testAccCloudStackInstance_renameAndResize = `
354356
resource "cloudstack_network" "foo" {
355357
name = "terraform-network"
358+
display_text = "terraform-network"
356359
cidr = "10.1.1.0/24"
357360
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
358361
zone = "Sandbox-simulator"
@@ -372,6 +375,7 @@ resource "cloudstack_instance" "foobar" {
372375
const testAccCloudStackInstance_fixedIP = `
373376
resource "cloudstack_network" "foo" {
374377
name = "terraform-network"
378+
display_text = "terraform-network"
375379
cidr = "10.1.1.0/24"
376380
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
377381
zone = "Sandbox-simulator"
@@ -391,6 +395,7 @@ resource "cloudstack_instance" "foobar" {
391395
const testAccCloudStackInstance_keyPair = `
392396
resource "cloudstack_network" "foo" {
393397
name = "terraform-network"
398+
display_text = "terraform-network"
394399
cidr = "10.1.1.0/24"
395400
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
396401
zone = "Sandbox-simulator"
@@ -414,6 +419,7 @@ resource "cloudstack_instance" "foobar" {
414419
const testAccCloudStackInstance_project = `
415420
resource "cloudstack_network" "foo" {
416421
name = "terraform-network"
422+
display_text = "terraform-network"
417423
cidr = "10.1.1.0/24"
418424
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
419425
project = "terraform"

cloudstack/resource_cloudstack_ipaddress_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,7 @@ func testAccCheckCloudStackIPAddressDestroy(s *terraform.State) error {
137137
const testAccCloudStackIPAddress_basic = `
138138
resource "cloudstack_network" "foo" {
139139
name = "terraform-network"
140+
display_text = "terraform-network"
140141
cidr = "10.1.1.0/24"
141142
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
142143
source_nat_ip = true
@@ -173,6 +174,7 @@ resource "cloudstack_vpc" "foo" {
173174
174175
resource "cloudstack_network" "foo" {
175176
name = "terraform-network"
177+
display_text = "terraform-network"
176178
cidr = "10.1.1.0/24"
177179
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
178180
source_nat_ip = true

cloudstack/resource_cloudstack_loadbalancer_rule_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ func testAccCheckCloudStackLoadBalancerRuleDestroy(s *terraform.State) error {
262262
const testAccCloudStackLoadBalancerRule_basic = `
263263
resource "cloudstack_network" "foo" {
264264
name = "terraform-network"
265+
display_text = "terraform-network"
265266
cidr = "10.1.1.0/24"
266267
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
267268
source_nat_ip = true
@@ -294,6 +295,7 @@ resource "cloudstack_loadbalancer_rule" "foo" {
294295
const testAccCloudStackLoadBalancerRule_update = `
295296
resource "cloudstack_network" "foo" {
296297
name = "terraform-network"
298+
display_text = "terraform-network"
297299
cidr = "10.1.1.0/24"
298300
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
299301
source_nat_ip = true
@@ -326,6 +328,7 @@ resource "cloudstack_loadbalancer_rule" "foo" {
326328
const testAccCloudStackLoadBalancerRule_forcenew = `
327329
resource "cloudstack_network" "foo" {
328330
name = "terraform-network"
331+
display_text = "terraform-network"
329332
cidr = "10.1.1.0/24"
330333
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
331334
source_nat_ip = true
@@ -366,6 +369,7 @@ resource "cloudstack_vpc" "foo" {
366369
367370
resource "cloudstack_network" "foo" {
368371
name = "terraform-network"
372+
display_text = "terraform-network"
369373
cidr = "10.1.1.0/24"
370374
network_offering = "DefaultIsolatedNetworkOfferingForVpcNetworks"
371375
vpc_id = cloudstack_vpc.foo.id
@@ -407,6 +411,7 @@ resource "cloudstack_vpc" "foo" {
407411
408412
resource "cloudstack_network" "foo" {
409413
name = "terraform-network"
414+
display_text = "terraform-network"
410415
cidr = "10.1.1.0/24"
411416
network_offering = "DefaultIsolatedNetworkOfferingForVpcNetworks"
412417
vpc_id = cloudstack_vpc.foo.id

cloudstack/resource_cloudstack_network_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ func testAccCheckCloudStackNetworkDestroy(s *terraform.State) error {
261261
const testAccCloudStackNetwork_basic = `
262262
resource "cloudstack_network" "foo" {
263263
name = "terraform-network"
264+
display_text = "terraform-network"
264265
cidr = "10.1.1.0/24"
265266
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
266267
zone = "Sandbox-simulator"
@@ -272,6 +273,7 @@ resource "cloudstack_network" "foo" {
272273
const testAccCloudStackNetwork_project = `
273274
resource "cloudstack_network" "foo" {
274275
name = "terraform-network"
276+
display_text = "terraform-network"
275277
cidr = "10.1.1.0/24"
276278
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
277279
project = "terraform"
@@ -288,6 +290,7 @@ resource "cloudstack_vpc" "foo" {
288290
289291
resource "cloudstack_network" "foo" {
290292
name = "terraform-network"
293+
display_text = "terraform-network"
291294
cidr = "10.1.1.0/24"
292295
network_offering = "DefaultIsolatedNetworkOfferingForVpcNetworks"
293296
vpc_id = cloudstack_vpc.foo.id
@@ -309,6 +312,7 @@ resource "cloudstack_network_acl" "foo" {
309312
310313
resource "cloudstack_network" "foo" {
311314
name = "terraform-network"
315+
display_text = "terraform-network"
312316
cidr = "10.1.1.0/24"
313317
network_offering = "DefaultIsolatedNetworkOfferingForVpcNetworks"
314318
vpc_id = cloudstack_vpc.foo.id
@@ -331,6 +335,7 @@ resource "cloudstack_network_acl" "bar" {
331335
332336
resource "cloudstack_network" "foo" {
333337
name = "terraform-network"
338+
display_text = "terraform-network"
334339
cidr = "10.1.1.0/24"
335340
network_offering = "DefaultIsolatedNetworkOfferingForVpcNetworks"
336341
vpc_id = cloudstack_vpc.foo.id

cloudstack/resource_cloudstack_nic_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,13 +171,15 @@ func testAccCheckCloudStackNICDestroy(s *terraform.State) error {
171171
const testAccCloudStackNIC_basic = `
172172
resource "cloudstack_network" "foo" {
173173
name = "terraform-network"
174+
display_text = "terraform-network"
174175
cidr = "10.1.1.0/24"
175176
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
176177
zone = "Sandbox-simulator"
177178
}
178179
179180
resource "cloudstack_network" "bar" {
180181
name = "terraform-network"
182+
display_text = "terraform-network"
181183
cidr = "10.1.2.0/24"
182184
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
183185
zone = "Sandbox-simulator"
@@ -201,13 +203,15 @@ resource "cloudstack_nic" "foo" {
201203
const testAccCloudStackNIC_ipaddress = `
202204
resource "cloudstack_network" "foo" {
203205
name = "terraform-network"
206+
display_text = "terraform-network"
204207
cidr = "10.1.1.0/24"
205208
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
206209
zone = "Sandbox-simulator"
207210
}
208211
209212
resource "cloudstack_network" "bar" {
210213
name = "terraform-network"
214+
display_text = "terraform-network"
211215
cidr = "10.1.2.0/24"
212216
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
213217
zone = "Sandbox-simulator"

cloudstack/resource_cloudstack_port_forward_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ func testAccCheckCloudStackPortForwardDestroy(s *terraform.State) error {
136136
const testAccCloudStackPortForward_basic = `
137137
resource "cloudstack_network" "foo" {
138138
name = "terraform-network"
139+
display_text = "terraform-network"
139140
cidr = "10.1.1.0/24"
140141
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
141142
source_nat_ip = true
@@ -166,6 +167,7 @@ resource "cloudstack_port_forward" "foo" {
166167
const testAccCloudStackPortForward_update = `
167168
resource "cloudstack_network" "foo" {
168169
name = "terraform-network"
170+
display_text = "terraform-network"
169171
cidr = "10.1.1.0/24"
170172
network_offering = "DefaultIsolatedNetworkOfferingWithSourceNatService"
171173
source_nat_ip = true

0 commit comments

Comments
 (0)