Skip to content

Commit 008ef2d

Browse files
Pearl1594Pearl1594
committed
Merge branch 'main' of https://github.com/apache/cloudstack-terraform-provider into add-autoscale-support
2 parents 3433bce + aba1fde commit 008ef2d

16 files changed

+1857
-43
lines changed

‎cloudstack/data_source_cloudstack_physicalnetwork.go‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
//
2+
// Licensed to the Apache Software Foundation (ASF) under one
3+
// or more contributor license agreements. See the NOTICE file
4+
// distributed with this work for additional information
5+
// regarding copyright ownership. The ASF licenses this file
6+
// to you under the Apache License, Version 2.0 (the
7+
// "License"); you may not use this file except in compliance
8+
// with the License. You may obtain a copy of the License at
9+
//
10+
// http://www.apache.org/licenses/LICENSE-2.0
11+
//
12+
// Unless required by applicable law or agreed to in writing,
13+
// software distributed under the License is distributed on an
14+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
// KIND, either express or implied. See the License for the
16+
// specific language governing permissions and limitations
17+
// under the License.
18+
//
19+
20+
package cloudstack
21+
22+
import (
23+
"encoding/json"
24+
"fmt"
25+
"log"
26+
"regexp"
27+
"strings"
28+
29+
"github.com/apache/cloudstack-go/v2/cloudstack"
30+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
31+
)
32+
33+
func dataSourceCloudStackPhysicalNetwork() *schema.Resource {
34+
return &schema.Resource{
35+
Read: dataSourceCloudStackPhysicalNetworkRead,
36+
Schema: map[string]*schema.Schema{
37+
"filter": dataSourceFiltersSchema(),
38+
39+
//Computed values
40+
"name": {
41+
Type: schema.TypeString,
42+
Computed: true,
43+
},
44+
"zone": {
45+
Type: schema.TypeString,
46+
Computed: true,
47+
},
48+
"broadcast_domain_range": {
49+
Type: schema.TypeString,
50+
Computed: true,
51+
},
52+
"isolation_methods": {
53+
Type: schema.TypeList,
54+
Computed: true,
55+
Elem: &schema.Schema{Type: schema.TypeString},
56+
},
57+
"network_speed": {
58+
Type: schema.TypeString,
59+
Computed: true,
60+
},
61+
"vlan": {
62+
Type: schema.TypeString,
63+
Computed: true,
64+
},
65+
},
66+
}
67+
}
68+
69+
func dataSourceCloudStackPhysicalNetworkRead(d *schema.ResourceData, meta interface{}) error {
70+
cs := meta.(*cloudstack.CloudStackClient)
71+
p := cs.Network.NewListPhysicalNetworksParams()
72+
physicalNetworks, err := cs.Network.ListPhysicalNetworks(p)
73+
74+
if err != nil {
75+
return fmt.Errorf("Failed to list physical networks: %s", err)
76+
}
77+
filters := d.Get("filter")
78+
var physicalNetwork *cloudstack.PhysicalNetwork
79+
80+
for _, pn := range physicalNetworks.PhysicalNetworks {
81+
match, err := applyPhysicalNetworkFilters(pn, filters.(*schema.Set))
82+
if err != nil {
83+
return err
84+
}
85+
if match {
86+
physicalNetwork = pn
87+
}
88+
}
89+
90+
if physicalNetwork == nil {
91+
return fmt.Errorf("No physical network is matching with the specified regex")
92+
}
93+
log.Printf("[DEBUG] Selected physical network: %s\n", physicalNetwork.Name)
94+
95+
return physicalNetworkDescriptionAttributes(d, physicalNetwork)
96+
}
97+
98+
func physicalNetworkDescriptionAttributes(d *schema.ResourceData, physicalNetwork *cloudstack.PhysicalNetwork) error {
99+
d.SetId(physicalNetwork.Id)
100+
d.Set("name", physicalNetwork.Name)
101+
d.Set("broadcast_domain_range", physicalNetwork.Broadcastdomainrange)
102+
d.Set("network_speed", physicalNetwork.Networkspeed)
103+
d.Set("vlan", physicalNetwork.Vlan)
104+
105+
// Set isolation methods
106+
if physicalNetwork.Isolationmethods != "" {
107+
methods := strings.Split(physicalNetwork.Isolationmethods, ",")
108+
d.Set("isolation_methods", methods)
109+
}
110+
111+
// Set the zone
112+
d.Set("zone", physicalNetwork.Zonename)
113+
114+
// Physical networks don't support tags in CloudStack API
115+
116+
return nil
117+
}
118+
119+
func applyPhysicalNetworkFilters(physicalNetwork *cloudstack.PhysicalNetwork, filters *schema.Set) (bool, error) {
120+
var physicalNetworkJSON map[string]interface{}
121+
k, _ := json.Marshal(physicalNetwork)
122+
err := json.Unmarshal(k, &physicalNetworkJSON)
123+
if err != nil {
124+
return false, err
125+
}
126+
127+
for _, f := range filters.List() {
128+
m := f.(map[string]interface{})
129+
r, err := regexp.Compile(m["value"].(string))
130+
if err != nil {
131+
return false, fmt.Errorf("Invalid regex: %s", err)
132+
}
133+
updatedName := strings.ReplaceAll(m["name"].(string), "_", "")
134+
physicalNetworkField := physicalNetworkJSON[updatedName].(string)
135+
if !r.MatchString(physicalNetworkField) {
136+
return false, nil
137+
}
138+
}
139+
return true, nil
140+
}

‎cloudstack/data_source_cloudstack_physicalnetwork_test.go‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
//
2+
// Licensed to the Apache Software Foundation (ASF) under one
3+
// or more contributor license agreements. See the NOTICE file
4+
// distributed with this work for additional information
5+
// regarding copyright ownership. The ASF licenses this file
6+
// to you under the Apache License, Version 2.0 (the
7+
// "License"); you may not use this file except in compliance
8+
// with the License. You may obtain a copy of the License at
9+
//
10+
// http://www.apache.org/licenses/LICENSE-2.0
11+
//
12+
// Unless required by applicable law or agreed to in writing,
13+
// software distributed under the License is distributed on an
14+
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
// KIND, either express or implied. See the License for the
16+
// specific language governing permissions and limitations
17+
// under the License.
18+
//
19+
20+
package cloudstack
21+
22+
import (
23+
"testing"
24+
25+
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
26+
)
27+
28+
func TestAccDataSourceCloudStackPhysicalNetwork_basic(t *testing.T) {
29+
resource.Test(t, resource.TestCase{
30+
PreCheck: func() { testAccPreCheck(t) },
31+
Providers: testAccProviders,
32+
Steps: []resource.TestStep{
33+
{
34+
Config: testAccDataSourceCloudStackPhysicalNetwork_basic,
35+
Check: resource.ComposeTestCheckFunc(
36+
resource.TestCheckResourceAttr(
37+
"data.cloudstack_physicalnetwork.foo", "name", "terraform-physical-network"),
38+
resource.TestCheckResourceAttr(
39+
"data.cloudstack_physicalnetwork.foo", "broadcast_domain_range", "ZONE"),
40+
),
41+
},
42+
},
43+
})
44+
}
45+
46+
const testAccDataSourceCloudStackPhysicalNetwork_basic = `
47+
resource "cloudstack_zone" "foo" {
48+
name = "terraform-zone-ds"
49+
dns1 = "8.8.8.8"
50+
internal_dns1 = "8.8.4.4"
51+
network_type = "Advanced"
52+
}
53+
54+
resource "cloudstack_physicalnetwork" "foo" {
55+
name = "terraform-physical-network"
56+
zone = cloudstack_zone.foo.name
57+
broadcast_domain_range = "ZONE"
58+
isolation_methods = ["VLAN"]
59+
}
60+
61+
data "cloudstack_physicalnetwork" "foo" {
62+
filter {
63+
name = "name"
64+
value = "terraform-physical-network"
65+
}
66+
depends_on = [cloudstack_physicalnetwork.foo]
67+
}`

‎cloudstack/provider.go‎

Lines changed: 47 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -95,58 +95,62 @@ func Provider() *schema.Provider {
9595
"cloudstack_user": dataSourceCloudstackUser(),
9696
"cloudstack_vpn_connection": dataSourceCloudstackVPNConnection(),
9797
"cloudstack_pod": dataSourceCloudstackPod(),
98+
"cloudstack_physicalnetwork": dataSourceCloudStackPhysicalNetwork(),
9899
},
99100

100101
ResourcesMap: map[string]*schema.Resource{
101-
"cloudstack_affinity_group": resourceCloudStackAffinityGroup(),
102-
"cloudstack_attach_volume": resourceCloudStackAttachVolume(),
103-
"cloudstack_autoscale_policy": resourceCloudStackAutoScalePolicy(),
104-
"cloudstack_autoscale_vm_group": resourceCloudStackAutoScaleVMGroup(),
105-
"cloudstack_autoscale_vm_profile": resourceCloudStackAutoScaleVMProfile(),
106-
"cloudstack_condition": resourceCloudStackCondition(),
107-
"cloudstack_configuration": resourceCloudStackConfiguration(),
108-
"cloudstack_counter": resourceCloudStackCounter(),
109-
"cloudstack_disk": resourceCloudStackDisk(),
110-
"cloudstack_egress_firewall": resourceCloudStackEgressFirewall(),
111-
"cloudstack_firewall": resourceCloudStackFirewall(),
112-
"cloudstack_host": resourceCloudStackHost(),
113-
"cloudstack_instance": resourceCloudStackInstance(),
114-
"cloudstack_ipaddress": resourceCloudStackIPAddress(),
115-
"cloudstack_kubernetes_cluster": resourceCloudStackKubernetesCluster(),
116-
"cloudstack_kubernetes_version": resourceCloudStackKubernetesVersion(),
117-
"cloudstack_loadbalancer_rule": resourceCloudStackLoadBalancerRule(),
118-
"cloudstack_network": resourceCloudStackNetwork(),
119-
"cloudstack_network_acl": resourceCloudStackNetworkACL(),
120-
"cloudstack_network_acl_rule": resourceCloudStackNetworkACLRule(),
121-
"cloudstack_nic": resourceCloudStackNIC(),
122-
"cloudstack_port_forward": resourceCloudStackPortForward(),
123-
"cloudstack_private_gateway": resourceCloudStackPrivateGateway(),
124-
"cloudstack_secondary_ipaddress": resourceCloudStackSecondaryIPAddress(),
125-
"cloudstack_security_group": resourceCloudStackSecurityGroup(),
126-
"cloudstack_security_group_rule": resourceCloudStackSecurityGroupRule(),
127-
"cloudstack_ssh_keypair": resourceCloudStackSSHKeyPair(),
128-
"cloudstack_static_nat": resourceCloudStackStaticNAT(),
129-
"cloudstack_static_route": resourceCloudStackStaticRoute(),
130-
"cloudstack_template": resourceCloudStackTemplate(),
131-
"cloudstack_vpc": resourceCloudStackVPC(),
132-
"cloudstack_vpn_connection": resourceCloudStackVPNConnection(),
133-
"cloudstack_vpn_customer_gateway": resourceCloudStackVPNCustomerGateway(),
134-
"cloudstack_vpn_gateway": resourceCloudStackVPNGateway(),
135-
"cloudstack_network_offering": resourceCloudStackNetworkOffering(),
136-
"cloudstack_disk_offering": resourceCloudStackDiskOffering(),
137-
"cloudstack_volume": resourceCloudStackVolume(),
138-
"cloudstack_zone": resourceCloudStackZone(),
139-
"cloudstack_service_offering": resourceCloudStackServiceOffering(),
140-
"cloudstack_account": resourceCloudStackAccount(),
141-
"cloudstack_user": resourceCloudStackUser(),
142-
"cloudstack_domain": resourceCloudStackDomain(),
102+
"cloudstack_affinity_group": resourceCloudStackAffinityGroup(),
103+
"cloudstack_attach_volume": resourceCloudStackAttachVolume(),
104+
"cloudstack_autoscale_policy": resourceCloudStackAutoScalePolicy(),
105+
"cloudstack_autoscale_vm_group": resourceCloudStackAutoScaleVMGroup(),
106+
"cloudstack_autoscale_vm_profile": resourceCloudStackAutoScaleVMProfile(),
107+
"cloudstack_condition": resourceCloudStackCondition(),
108+
"cloudstack_configuration": resourceCloudStackConfiguration(),
109+
"cloudstack_counter": resourceCloudStackCounter(),
110+
"cloudstack_disk": resourceCloudStackDisk(),
111+
"cloudstack_egress_firewall": resourceCloudStackEgressFirewall(),
112+
"cloudstack_firewall": resourceCloudStackFirewall(),
113+
"cloudstack_host": resourceCloudStackHost(),
114+
"cloudstack_instance": resourceCloudStackInstance(),
115+
"cloudstack_ipaddress": resourceCloudStackIPAddress(),
116+
"cloudstack_kubernetes_cluster": resourceCloudStackKubernetesCluster(),
117+
"cloudstack_kubernetes_version": resourceCloudStackKubernetesVersion(),
118+
"cloudstack_loadbalancer_rule": resourceCloudStackLoadBalancerRule(),
119+
"cloudstack_network": resourceCloudStackNetwork(),
120+
"cloudstack_network_acl": resourceCloudStackNetworkACL(),
121+
"cloudstack_network_acl_rule": resourceCloudStackNetworkACLRule(),
122+
"cloudstack_nic": resourceCloudStackNIC(),
123+
"cloudstack_port_forward": resourceCloudStackPortForward(),
124+
"cloudstack_private_gateway": resourceCloudStackPrivateGateway(),
125+
"cloudstack_secondary_ipaddress": resourceCloudStackSecondaryIPAddress(),
126+
"cloudstack_security_group": resourceCloudStackSecurityGroup(),
127+
"cloudstack_security_group_rule": resourceCloudStackSecurityGroupRule(),
128+
"cloudstack_ssh_keypair": resourceCloudStackSSHKeyPair(),
129+
"cloudstack_static_nat": resourceCloudStackStaticNAT(),
130+
"cloudstack_static_route": resourceCloudStackStaticRoute(),
131+
"cloudstack_template": resourceCloudStackTemplate(),
132+
"cloudstack_vpc": resourceCloudStackVPC(),
133+
"cloudstack_vpn_connection": resourceCloudStackVPNConnection(),
134+
"cloudstack_vpn_customer_gateway": resourceCloudStackVPNCustomerGateway(),
135+
"cloudstack_vpn_gateway": resourceCloudStackVPNGateway(),
136+
"cloudstack_network_offering": resourceCloudStackNetworkOffering(),
137+
"cloudstack_disk_offering": resourceCloudStackDiskOffering(),
138+
"cloudstack_volume": resourceCloudStackVolume(),
139+
"cloudstack_zone": resourceCloudStackZone(),
140+
"cloudstack_service_offering": resourceCloudStackServiceOffering(),
141+
"cloudstack_account": resourceCloudStackAccount(),
142+
"cloudstack_user": resourceCloudStackUser(),
143+
"cloudstack_domain": resourceCloudStackDomain(),
144+
"cloudstack_physicalnetwork": resourceCloudStackPhysicalNetwork(),
145+
"cloudstack_traffic_type": resourceCloudStackTrafficType(),
146+
"cloudstack_network_service_provider": resourceCloudStackNetworkServiceProvider(),
143147
},
144148

145149
ConfigureFunc: providerConfigure,
146150
}
147151
}
148152

149-
func providerConfigure(d *schema.ResourceData) (interface{}, error) {
153+
func providerConfigure(d *schema.ResourceData) (any, error) {
150154
apiURL, apiURLOK := d.GetOk("api_url")
151155
apiKey, apiKeyOK := d.GetOk("api_key")
152156
secretKey, secretKeyOK := d.GetOk("secret_key")

‎cloudstack/resource_cloudstack_loadbalancer_rule.go‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ package cloudstack
2222
import (
2323
"fmt"
2424
"log"
25+
"regexp"
2526
"strconv"
2627
"strings"
2728

@@ -97,6 +98,14 @@ func resourceCloudStackLoadBalancerRule() *schema.Resource {
9798
Set: schema.HashString,
9899
},
99100

101+
"cidrlist": {
102+
Type: schema.TypeSet,
103+
Optional: true,
104+
ForceNew: true,
105+
Elem: &schema.Schema{Type: schema.TypeString},
106+
Set: schema.HashString,
107+
},
108+
100109
"project": {
101110
Type: schema.TypeString,
102111
Optional: true,
@@ -143,6 +152,16 @@ func resourceCloudStackLoadBalancerRuleCreate(d *schema.ResourceData, meta inter
143152
p.SetProtocol(protocol.(string))
144153
}
145154

155+
// Set CIDR list
156+
if cidr, ok := d.GetOk("cidrlist"); ok {
157+
var cidrList []string
158+
for _, id := range cidr.(*schema.Set).List() {
159+
cidrList = append(cidrList, id.(string))
160+
}
161+
162+
p.SetCidrlist(cidrList)
163+
}
164+
146165
// Set the ipaddress id
147166
p.SetPublicipid(d.Get("ip_address_id").(string))
148167

@@ -216,6 +235,12 @@ func resourceCloudStackLoadBalancerRuleRead(d *schema.ResourceData, meta interfa
216235
d.Set("private_port", private_port)
217236
d.Set("protocol", lb.Protocol)
218237

238+
// Only set cidr if user specified it to avoid spurious diffs
239+
delimiters := regexp.MustCompile(`\s*,\s*|\s+`)
240+
if _, ok := d.GetOk("cidrlist"); ok {
241+
d.Set("cidrlist", delimiters.Split(lb.Cidrlist, -1))
242+
}
243+
219244
// Only set network if user specified it to avoid spurious diffs
220245
if _, ok := d.GetOk("network_id"); ok {
221246
d.Set("network_id", lb.Networkid)

‎cloudstack/resource_cloudstack_loadbalancer_rule_test.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,8 @@ func TestAccCloudStackLoadBalancerRule_forceNew(t *testing.T) {
129129
"cloudstack_loadbalancer_rule.foo", "private_port", "443"),
130130
resource.TestCheckResourceAttr(
131131
"cloudstack_loadbalancer_rule.foo", "protocol", "tcp-proxy"),
132+
resource.TestCheckResourceAttr(
133+
"cloudstack_loadbalancer_rule.foo", "cidrlist.0", "20.0.0.0/8"),
132134
),
133135
},
134136
},
@@ -192,6 +194,8 @@ func TestAccCloudStackLoadBalancerRule_vpcUpdate(t *testing.T) {
192194
"cloudstack_loadbalancer_rule.foo", "public_port", "443"),
193195
resource.TestCheckResourceAttr(
194196
"cloudstack_loadbalancer_rule.foo", "private_port", "443"),
197+
resource.TestCheckResourceAttr(
198+
"cloudstack_loadbalancer_rule.foo", "cidrlist.0", "20.0.0.0/8"),
195199
),
196200
},
197201
},
@@ -357,6 +361,7 @@ resource "cloudstack_loadbalancer_rule" "foo" {
357361
private_port = 443
358362
protocol = "tcp-proxy"
359363
member_ids = [cloudstack_instance.foobar1.id]
364+
cidrlist = ["20.0.0.0/8"]
360365
}`
361366

362367
const testAccCloudStackLoadBalancerRule_vpc = `
@@ -451,4 +456,5 @@ resource "cloudstack_loadbalancer_rule" "foo" {
451456
public_port = 443
452457
private_port = 443
453458
member_ids = [cloudstack_instance.foobar1.id, cloudstack_instance.foobar2.id]
459+
cidrlist = ["20.0.0.0/8"]
454460
}`

0 commit comments

Comments
 (0)