Skip to content

Commit ab8977e

Browse files
author
Sander van Harmelen
committed
Last tweaks needed to get through all acc tests
Needed to tweak a few things in order get all tests running OK and to be able to handle the latest changes in master. All is good again now…
1 parent 19776ba commit ab8977e

5 files changed

Lines changed: 52 additions & 39 deletions

‎builtin/providers/cloudstack/resource_cloudstack_egress_firewall.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func resourceCloudStackEgressFirewall() *schema.Resource {
7575
},
7676
},
7777
},
78-
Set: resourceCloudStackFirewallRuleHash,
78+
Set: resourceCloudStackEgressFirewallRuleHash,
7979
},
8080
},
8181
}
@@ -98,7 +98,7 @@ func resourceCloudStackEgressFirewallCreate(d *schema.ResourceData, meta interfa
9898

9999
// Create an empty schema.Set to hold all rules
100100
rules := &schema.Set{
101-
F: resourceCloudStackFirewallRuleHash,
101+
F: resourceCloudStackEgressFirewallRuleHash,
102102
}
103103

104104
for _, rule := range rs.List() {
@@ -200,7 +200,7 @@ func resourceCloudStackEgressFirewallRead(d *schema.ResourceData, meta interface
200200

201201
// Create an empty schema.Set to hold all rules
202202
rules := &schema.Set{
203-
F: resourceCloudStackFirewallRuleHash,
203+
F: resourceCloudStackEgressFirewallRuleHash,
204204
}
205205

206206
if d.Get("managed").(bool) {
@@ -343,7 +343,7 @@ func resourceCloudStackEgressFirewallUpdate(d *schema.ResourceData, meta interfa
343343
// Now first loop through all the old rules and delete any obsolete ones
344344
for _, rule := range ors.List() {
345345
// Delete the rule as it no longer exists in the config
346-
err := resourceCloudStackFirewallDeleteRule(d, meta, rule.(map[string]interface{}))
346+
err := resourceCloudStackEgressFirewallDeleteRule(d, meta, rule.(map[string]interface{}))
347347
if err != nil {
348348
return err
349349
}
@@ -356,7 +356,7 @@ func resourceCloudStackEgressFirewallUpdate(d *schema.ResourceData, meta interfa
356356
// Then loop through al the currently configured rules and create the new ones
357357
for _, rule := range nrs.List() {
358358
// When succesfully deleted, re-create it again if it still exists
359-
err := resourceCloudStackFirewallCreateRule(
359+
err := resourceCloudStackEgressFirewallCreateRule(
360360
d, meta, rule.(map[string]interface{}))
361361

362362
// We need to update this first to preserve the correct state
@@ -377,7 +377,7 @@ func resourceCloudStackEgressFirewallDelete(d *schema.ResourceData, meta interfa
377377
if rs := d.Get("rule").(*schema.Set); rs.Len() > 0 {
378378
for _, rule := range rs.List() {
379379
// Delete a single rule
380-
err := resourceCloudStackFirewallDeleteRule(d, meta, rule.(map[string]interface{}))
380+
err := resourceCloudStackEgressFirewallDeleteRule(d, meta, rule.(map[string]interface{}))
381381

382382
// We need to update this first to preserve the correct state
383383
d.Set("rule", rs)

‎builtin/providers/cloudstack/resource_cloudstack_egress_firewall_test.go‎

Lines changed: 39 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,17 @@ func TestAccCloudStackEgressFirewall_basic(t *testing.T) {
2323
resource.TestCheckResourceAttr(
2424
"cloudstack_egress_firewall.foo", "network", CLOUDSTACK_NETWORK_1),
2525
resource.TestCheckResourceAttr(
26-
"cloudstack_egress_firewall.foo", "rule.1702320581.source_cidr", "10.0.0.0/24"),
26+
"cloudstack_egress_firewall.foo",
27+
"rule.411689741.source_cidr",
28+
CLOUDSTACK_NETWORK_1_IPADDRESS+"/32"),
2729
resource.TestCheckResourceAttr(
28-
"cloudstack_egress_firewall.foo", "rule.1702320581.protocol", "tcp"),
30+
"cloudstack_egress_firewall.foo", "rule.411689741.protocol", "tcp"),
2931
resource.TestCheckResourceAttr(
30-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.#", "2"),
32+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.#", "2"),
3133
resource.TestCheckResourceAttr(
32-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1209010669", "1000-2000"),
34+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1209010669", "1000-2000"),
3335
resource.TestCheckResourceAttr(
34-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1889509032", "80"),
36+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1889509032", "80"),
3537
),
3638
},
3739
},
@@ -49,19 +51,21 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
4951
Check: resource.ComposeTestCheckFunc(
5052
testAccCheckCloudStackEgressFirewallRulesExist("cloudstack_egress_firewall.foo"),
5153
resource.TestCheckResourceAttr(
52-
"cloudstack_egress_firewall.foo", "ipaddress", CLOUDSTACK_NETWORK_1),
54+
"cloudstack_egress_firewall.foo", "network", CLOUDSTACK_NETWORK_1),
5355
resource.TestCheckResourceAttr(
5456
"cloudstack_egress_firewall.foo", "rule.#", "1"),
5557
resource.TestCheckResourceAttr(
56-
"cloudstack_egress_firewall.foo", "rule.1702320581.source_cidr", "10.0.0.0/24"),
58+
"cloudstack_egress_firewall.foo",
59+
"rule.411689741.source_cidr",
60+
CLOUDSTACK_NETWORK_1_IPADDRESS+"/32"),
5761
resource.TestCheckResourceAttr(
58-
"cloudstack_egress_firewall.foo", "rule.1702320581.protocol", "tcp"),
62+
"cloudstack_egress_firewall.foo", "rule.411689741.protocol", "tcp"),
5963
resource.TestCheckResourceAttr(
60-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.#", "2"),
64+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.#", "2"),
6165
resource.TestCheckResourceAttr(
62-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1209010669", "1000-2000"),
66+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1209010669", "1000-2000"),
6367
resource.TestCheckResourceAttr(
64-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1889509032", "80"),
68+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1889509032", "80"),
6569
),
6670
},
6771

@@ -70,29 +74,31 @@ func TestAccCloudStackEgressFirewall_update(t *testing.T) {
7074
Check: resource.ComposeTestCheckFunc(
7175
testAccCheckCloudStackEgressFirewallRulesExist("cloudstack_egress_firewall.foo"),
7276
resource.TestCheckResourceAttr(
73-
"cloudstack_egress_firewall.foo", "ipaddress", CLOUDSTACK_NETWORK_1),
77+
"cloudstack_egress_firewall.foo", "network", CLOUDSTACK_NETWORK_1),
7478
resource.TestCheckResourceAttr(
7579
"cloudstack_egress_firewall.foo", "rule.#", "2"),
7680
resource.TestCheckResourceAttr(
77-
"cloudstack_egress_firewall.foo", "rule.1702320581.source_cidr", "10.0.0.0/24"),
78-
resource.TestCheckResourceAttr(
79-
"cloudstack_egress_firewall.foo", "rule.1702320581.protocol", "tcp"),
81+
"cloudstack_egress_firewall.foo",
82+
"rule.411689741.source_cidr",
83+
CLOUDSTACK_NETWORK_1_IPADDRESS+"/32"),
8084
resource.TestCheckResourceAttr(
81-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.#", "2"),
85+
"cloudstack_egress_firewall.foo", "rule.411689741.protocol", "tcp"),
8286
resource.TestCheckResourceAttr(
83-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1209010669", "1000-2000"),
87+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.#", "2"),
8488
resource.TestCheckResourceAttr(
85-
"cloudstack_egress_firewall.foo", "rule.1702320581.ports.1889509032", "80"),
89+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1209010669", "1000-2000"),
8690
resource.TestCheckResourceAttr(
87-
"cloudstack_egress_firewall.foo", "rule.3779782959.source_cidr", "172.16.100.0/24"),
91+
"cloudstack_egress_firewall.foo", "rule.411689741.ports.1889509032", "80"),
8892
resource.TestCheckResourceAttr(
89-
"cloudstack_egress_firewall.foo", "rule.3779782959.protocol", "tcp"),
93+
"cloudstack_egress_firewall.foo",
94+
"rule.845479598.source_cidr",
95+
CLOUDSTACK_NETWORK_1_IPADDRESS+"/32"),
9096
resource.TestCheckResourceAttr(
91-
"cloudstack_egress_firewall.foo", "rule.3779782959.ports.#", "2"),
97+
"cloudstack_egress_firewall.foo", "rule.845479598.protocol", "tcp"),
9298
resource.TestCheckResourceAttr(
93-
"cloudstack_egress_firewall.foo", "rule.3779782959.ports.1889509032", "80"),
99+
"cloudstack_egress_firewall.foo", "rule.845479598.ports.#", "1"),
94100
resource.TestCheckResourceAttr(
95-
"cloudstack_egress_firewall.foo", "rule.3779782959.ports.3638101695", "443"),
101+
"cloudstack_egress_firewall.foo", "rule.845479598.ports.3638101695", "443"),
96102
),
97103
},
98104
},
@@ -162,7 +168,7 @@ func testAccCheckCloudStackEgressFirewallDestroy(s *terraform.State) error {
162168

163169
var testAccCloudStackEgressFirewall_basic = fmt.Sprintf(`
164170
resource "cloudstack_egress_firewall" "foo" {
165-
ipaddress = "%s"
171+
network = "%s"
166172
167173
rule {
168174
source_cidr = "%s/32"
@@ -175,13 +181,20 @@ resource "cloudstack_egress_firewall" "foo" {
175181

176182
var testAccCloudStackEgressFirewall_update = fmt.Sprintf(`
177183
resource "cloudstack_egress_firewall" "foo" {
178-
ipaddress = "%s"
184+
network = "%s"
185+
186+
rule {
187+
source_cidr = "%s/32"
188+
protocol = "tcp"
189+
ports = ["80", "1000-2000"]
190+
}
179191
180192
rule {
181193
source_cidr = "%s/32"
182194
protocol = "tcp"
183-
ports = ["80", "443", 1000-2000"]
195+
ports = ["443"]
184196
}
185197
}`,
186198
CLOUDSTACK_NETWORK_1,
199+
CLOUDSTACK_NETWORK_1_IPADDRESS,
187200
CLOUDSTACK_NETWORK_1_IPADDRESS)

‎builtin/providers/cloudstack/resource_cloudstack_network.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,13 @@ func resourceCloudStackNetworkCreate(d *schema.ResourceData, meta interface{}) e
7979
}
8080

8181
// Compute/set the display text
82-
displaytext := d.Get("display_text").(string)
83-
if displaytext == "" {
82+
displaytext, ok := d.GetOk("display_text")
83+
if !ok {
8484
displaytext = name
8585
}
8686

8787
// Create a new parameter struct
88-
p := cs.Network.NewCreateNetworkParams(displaytext, name, networkofferingid, zoneid)
88+
p := cs.Network.NewCreateNetworkParams(displaytext.(string), name, networkofferingid, zoneid)
8989

9090
// Get the network details from the CIDR
9191
m, err := parseCIDR(d.Get("cidr").(string))
@@ -147,7 +147,7 @@ func resourceCloudStackNetworkRead(d *schema.ResourceData, meta interface{}) err
147147
}
148148

149149
d.Set("name", n.Name)
150-
d.Set("display_test", n.Displaytext)
150+
d.Set("display_text", n.Displaytext)
151151
d.Set("cidr", n.Cidr)
152152
d.Set("network_offering", n.Networkofferingname)
153153
d.Set("zone", n.Zonename)

‎builtin/providers/cloudstack/resource_cloudstack_network_acl_rule_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestAccCloudStackNetworkACLRule_update(t *testing.T) {
104104
resource.TestCheckResourceAttr(
105105
"cloudstack_network_acl_rule.foo", "rule.4267872693.ports.1889509032", "80"),
106106
resource.TestCheckResourceAttr(
107-
"cloudstack_network_acl_rule.foo", "rule.4267872693.traffic_type", "engress"),
107+
"cloudstack_network_acl_rule.foo", "rule.4267872693.traffic_type", "egress"),
108108
),
109109
},
110110
},

‎builtin/providers/cloudstack/resource_cloudstack_vpc.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ func resourceCloudStackVPCCreate(d *schema.ResourceData, meta interface{}) error
6969
// Set the display text
7070
displaytext, ok := d.GetOk("display_text")
7171
if !ok {
72-
displaytext = d.Get("name")
72+
displaytext = name
7373
}
7474

7575
// Create a new parameter struct
@@ -103,7 +103,7 @@ func resourceCloudStackVPCRead(d *schema.ResourceData, meta interface{}) error {
103103
}
104104

105105
d.Set("name", v.Name)
106-
d.Set("display_test", v.Displaytext)
106+
d.Set("display_text", v.Displaytext)
107107
d.Set("cidr", v.Cidr)
108108
d.Set("zone", v.Zonename)
109109

0 commit comments

Comments
 (0)