Skip to content

Commit 1da4ff5

Browse files
committed
fix: Remove ExpectNonEmptyPlan from network data source tests and add zone data source configuration
1 parent 049d7b6 commit 1da4ff5

1 file changed

Lines changed: 9 additions & 5 deletions

File tree

cloudstack/data_source_cloudstack_network_test.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ func TestAccNetworkDataSource_basic(t *testing.T) {
4242
resource.TestCheckResourceAttrPair(datasourceName, "gateway", resourceName, "gateway"),
4343
resource.TestCheckResourceAttr(datasourceName, "network_offering_name", "DefaultIsolatedNetworkOfferingWithSourceNatService"),
4444
),
45-
ExpectNonEmptyPlan: true,
4645
},
4746
},
4847
})
@@ -62,7 +61,6 @@ func TestAccNetworkDataSource_filterByZone(t *testing.T) {
6261
resource.TestCheckResourceAttrPair(datasourceName, "name", resourceName, "name"),
6362
resource.TestCheckResourceAttr(datasourceName, "zone_name", "Sandbox-simulator"),
6463
),
65-
ExpectNonEmptyPlan: true,
6664
},
6765
},
6866
})
@@ -83,7 +81,6 @@ func TestAccNetworkDataSource_vpcNetwork(t *testing.T) {
8381
resource.TestCheckResourceAttrPair(datasourceName, "vpc_id", resourceName, "vpc_id"),
8482
resource.TestCheckResourceAttr(datasourceName, "vpc_name", "test-vpc-network"),
8583
),
86-
ExpectNonEmptyPlan: true,
8784
},
8885
},
8986
})
@@ -116,6 +113,13 @@ output "network-output" {
116113
`
117114

118115
const testNetworkDataSourceConfig_filterByZone = `
116+
data "cloudstack_zone" "zone" {
117+
filter {
118+
name = "name"
119+
value = "Sandbox-simulator"
120+
}
121+
}
122+
119123
resource "cloudstack_network" "network-resource" {
120124
name = "test-network-zone"
121125
display_text = "Test Network with Zone Filter"
@@ -125,7 +129,7 @@ resource "cloudstack_network" "network-resource" {
125129
}
126130
127131
data "cloudstack_network" "network-data-source-zone" {
128-
zone_id = cloudstack_network.network-resource.zone
132+
zone_id = data.cloudstack_zone.zone.id
129133
130134
filter {
131135
name = "name"
@@ -146,7 +150,7 @@ const testNetworkDataSourceConfig_vpcNetwork = `
146150
resource "cloudstack_vpc" "vpc-resource" {
147151
name = "test-vpc-network"
148152
cidr = "10.2.0.0/16"
149-
vpc_offering = "Default VPC Offering"
153+
vpc_offering = "Default VPC offering"
150154
zone = "Sandbox-simulator"
151155
}
152156

0 commit comments

Comments
 (0)