Skip to content

Commit 522a08a

Browse files
poddmpoddm
committed
updates
1 parent da04d93 commit 522a08a

8 files changed

Lines changed: 40 additions & 27 deletions

cloudstack/data_source_cloudstack_physicalnetwork.go renamed to cloudstack/data_source_cloudstack_physical_network.go

File renamed without changes.

cloudstack/data_source_cloudstack_physicalnetwork_test.go renamed to cloudstack/data_source_cloudstack_physical_network_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ func TestAccDataSourceCloudStackPhysicalNetwork_basic(t *testing.T) {
3434
Config: testAccDataSourceCloudStackPhysicalNetwork_basic,
3535
Check: resource.ComposeTestCheckFunc(
3636
resource.TestCheckResourceAttr(
37-
"data.cloudstack_physicalnetwork.foo", "name", "terraform-physical-network"),
37+
"data.cloudstack_physical_network.foo", "name", "terraform-physical-network"),
3838
resource.TestCheckResourceAttr(
39-
"data.cloudstack_physicalnetwork.foo", "broadcast_domain_range", "ZONE"),
39+
"data.cloudstack_physical_network.foo", "broadcast_domain_range", "ZONE"),
4040
),
4141
},
4242
},
@@ -51,17 +51,17 @@ resource "cloudstack_zone" "foo" {
5151
network_type = "Advanced"
5252
}
5353
54-
resource "cloudstack_physicalnetwork" "foo" {
54+
resource "cloudstack_physical_network" "foo" {
5555
name = "terraform-physical-network"
56-
zone = cloudstack_zone.foo.name
56+
zone_id = cloudstack_zone.foo.id
5757
broadcast_domain_range = "ZONE"
5858
isolation_methods = ["VLAN"]
5959
}
6060
61-
data "cloudstack_physicalnetwork" "foo" {
61+
data "cloudstack_physical_network" "foo" {
6262
filter {
6363
name = "name"
6464
value = "terraform-physical-network"
6565
}
66-
depends_on = [cloudstack_physicalnetwork.foo]
67-
}`
66+
depends_on = [cloudstack_physical_network.foo]
67+
`

‎cloudstack/provider.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ func Provider() *schema.Provider {
9191
"cloudstack_vpn_connection": dataSourceCloudstackVPNConnection(),
9292
"cloudstack_pod": dataSourceCloudstackPod(),
9393
"cloudstack_domain": dataSourceCloudstackDomain(),
94-
"cloudstack_physicalnetwork": dataSourceCloudStackPhysicalNetwork(),
94+
"cloudstack_physical_network": dataSourceCloudStackPhysicalNetwork(),
9595
"cloudstack_role": dataSourceCloudstackRole(),
9696
},
9797

@@ -142,7 +142,6 @@ func Provider() *schema.Provider {
142142
"cloudstack_account": resourceCloudStackAccount(),
143143
"cloudstack_user": resourceCloudStackUser(),
144144
"cloudstack_domain": resourceCloudStackDomain(),
145-
"cloudstack_physicalnetwork": resourceCloudStackPhysicalNetwork(),
146145
"cloudstack_network_service_provider": resourceCloudStackNetworkServiceProvider(),
147146
"cloudstack_role": resourceCloudStackRole(),
148147
},

‎cloudstack/resource_cloudstack_network_service_provider_state_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ resource "cloudstack_zone" "test" {
6464
}
6565
resource "cloudstack_physical_network" "test" {
6666
broadcast_domain_range = "ZONE"
67-
isolation_methods = "VLAN"
67+
isolation_methods = ["VLAN"]
6868
name = "test01"
6969
network_speed = "1G"
7070
tags = "vlan"
@@ -104,7 +104,7 @@ resource "cloudstack_zone" "test" {
104104
}
105105
resource "cloudstack_physical_network" "test" {
106106
broadcast_domain_range = "ZONE"
107-
isolation_methods = "VLAN"
107+
isolation_methods = ["VLAN"]
108108
name = "test01"
109109
network_speed = "1G"
110110
tags = "vlan"

‎cloudstack/resource_cloudstack_network_service_provider_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ resource "cloudstack_zone" "foo" {
200200
network_type = "Advanced"
201201
}
202202
203-
resource "cloudstack_physicalnetwork" "foo" {
203+
resource "cloudstack_physical_network" "foo" {
204204
name = "terraform-physical-network"
205205
zone = cloudstack_zone.foo.name
206206
broadcast_domain_range = "ZONE"
@@ -209,7 +209,7 @@ resource "cloudstack_physicalnetwork" "foo" {
209209
210210
resource "cloudstack_network_service_provider" "foo" {
211211
name = "VirtualRouter"
212-
physical_network_id = cloudstack_physicalnetwork.foo.id
212+
physical_network_id = cloudstack_physical_network.foo.id
213213
service_list = ["Dhcp", "Dns"]
214214
# Note: We don't set state for VirtualRouter as it requires configuration first
215215
}`
@@ -222,7 +222,7 @@ resource "cloudstack_zone" "foo" {
222222
network_type = "Advanced"
223223
}
224224
225-
resource "cloudstack_physicalnetwork" "foo" {
225+
resource "cloudstack_physical_network" "foo" {
226226
name = "terraform-physical-network"
227227
zone = cloudstack_zone.foo.name
228228
broadcast_domain_range = "ZONE"
@@ -231,6 +231,6 @@ resource "cloudstack_physicalnetwork" "foo" {
231231
232232
resource "cloudstack_network_service_provider" "security_group" {
233233
name = "SecurityGroupProvider"
234-
physical_network_id = cloudstack_physicalnetwork.foo.id
234+
physical_network_id = cloudstack_physical_network.foo.id
235235
# Note: We don't set service_list for SecurityGroupProvider as it doesn't support updating
236236
}`

‎cloudstack/resource_cloudstack_physical_network.go‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,10 @@ func resourceCloudStackPhysicalNetwork() *schema.Resource {
5151
},
5252
"isolation_methods": {
5353
Description: "the isolation method for the physical network[VLAN/L3/GRE]",
54-
Type: schema.TypeString,
54+
Type: schema.TypeList,
5555
Optional: true,
5656
ForceNew: true,
57+
Elem: &schema.Schema{Type: schema.TypeString},
5758
},
5859
"name": {
5960
Description: "the name of the physical network",
@@ -93,18 +94,27 @@ func resourceCloudStackPhysicalNetworkCreate(d *schema.ResourceData, meta interf
9394
if v, ok := d.GetOk("broadcast_domain_range"); ok {
9495
p.SetBroadcastdomainrange(strings.ToUpper(v.(string)))
9596
}
97+
9698
if v, ok := d.GetOk("domain_id"); ok {
9799
p.SetDomainid(v.(string))
98100
}
99-
if v, ok := d.GetOk("isolation_methods"); ok {
100-
p.SetIsolationmethods([]string{v.(string)})
101+
102+
if isolationMethods, ok := d.GetOk("isolation_methods"); ok {
103+
methods := make([]string, len(isolationMethods.([]interface{})))
104+
for i, v := range isolationMethods.([]interface{}) {
105+
methods[i] = v.(string)
106+
}
107+
p.SetIsolationmethods(methods)
101108
}
109+
102110
if v, ok := d.GetOk("network_speed"); ok {
103111
p.SetNetworkspeed(v.(string))
104112
}
113+
105114
if v, ok := d.GetOk("tags"); ok {
106115
p.SetTags([]string{v.(string)})
107116
}
117+
108118
if v, ok := d.GetOk("vlan"); ok {
109119
p.SetVlan(v.(string))
110120
}
@@ -129,7 +139,11 @@ func resourceCloudStackPhysicalNetworkRead(d *schema.ResourceData, meta interfac
129139

130140
d.Set("broadcast_domain_range", p.Broadcastdomainrange)
131141
d.Set("domain_id", p.Domainid)
132-
d.Set("isolation_methods", p.Isolationmethods)
142+
// Set isolation methods
143+
if p.Isolationmethods != "" {
144+
methods := strings.Split(p.Isolationmethods, ",")
145+
d.Set("isolation_methods", methods)
146+
}
133147
d.Set("name", p.Name)
134148
d.Set("network_speed", p.Networkspeed)
135149
d.Set("tags", p.Tags)

‎cloudstack/resource_cloudstack_physical_network_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestAccCloudStackPhysicalNetwork_basic(t *testing.T) {
4040
Config: testAccCloudStackPhysicalNetwork_basic,
4141
Check: resource.ComposeTestCheckFunc(
4242
testAccCheckCloudStackPhysicalNetworkExists(
43-
"cloudstack_physicalnetwork.foo", &physicalNetwork),
43+
"cloudstack_physical_network.foo", &physicalNetwork),
4444
testAccCheckCloudStackPhysicalNetworkBasicAttributes(&physicalNetwork),
4545
),
4646
},
@@ -58,7 +58,7 @@ func TestAccCloudStackPhysicalNetwork_import(t *testing.T) {
5858
Config: testAccCloudStackPhysicalNetwork_basic,
5959
},
6060
{
61-
ResourceName: "cloudstack_physicalnetwork.foo",
61+
ResourceName: "cloudstack_physical_network.foo",
6262
ImportState: true,
6363
ImportStateVerify: true,
6464
},
@@ -113,7 +113,7 @@ func testAccCheckCloudStackPhysicalNetworkDestroy(s *terraform.State) error {
113113
cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
114114

115115
for _, rs := range s.RootModule().Resources {
116-
if rs.Type != "cloudstack_physicalnetwork" {
116+
if rs.Type != "cloudstack_physical_network" {
117117
continue
118118
}
119119

@@ -138,7 +138,7 @@ resource "cloudstack_zone" "foo" {
138138
network_type = "Advanced"
139139
}
140140
141-
resource "cloudstack_physicalnetwork" "foo" {
141+
resource "cloudstack_physical_network" "foo" {
142142
name = "terraform-physical-network"
143143
zone_id = cloudstack_zone.foo.id
144144
broadcast_domain_range = "ZONE"

‎cloudstack/resource_cloudstack_traffic_type_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestAccCloudStackTrafficType_basic(t *testing.T) {
4343
"cloudstack_traffic_type.foo", &trafficType),
4444
testAccCheckCloudStackTrafficTypeBasicAttributes(&trafficType),
4545
resource.TestCheckResourceAttrSet(
46-
"cloudstack_traffic_type.foo", "type"),
46+
"cloudstack_traffic_type.foo", "traffic_type"),
4747
resource.TestCheckResourceAttr(
4848
"cloudstack_traffic_type.foo", "kvm_network_label", "cloudbr0"),
4949
),
@@ -160,16 +160,16 @@ resource "cloudstack_zone" "foo" {
160160
network_type = "Advanced"
161161
}
162162
163-
resource "cloudstack_physicalnetwork" "foo" {
163+
resource "cloudstack_physical_network" "foo" {
164164
name = "terraform-physical-network"
165165
zone_id = cloudstack_zone.foo.id
166166
broadcast_domain_range = "ZONE"
167167
isolation_methods = ["VLAN"]
168168
}
169169
170170
resource "cloudstack_traffic_type" "foo" {
171-
physical_network_id = cloudstack_physicalnetwork.foo.id
172-
type = "Management"
171+
physical_network_id = cloudstack_physical_network.foo.id
172+
traffic_type = "Management"
173173
kvm_network_label = "cloudbr0"
174174
xen_network_label = "xenbr0"
175175
}`

0 commit comments

Comments
 (0)