Skip to content

Commit ff6d28f

Browse files
committed
physical network conflicts
1 parent 4e32403 commit ff6d28f

File tree

3 files changed

+9
-364
lines changed

3 files changed

+9
-364
lines changed

cloudstack/resource_cloudstack_physical_network.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -122,19 +122,19 @@ func resourceCloudStackPhysicalNetworkCreate(d *schema.ResourceData, meta interf
122122
func resourceCloudStackPhysicalNetworkRead(d *schema.ResourceData, meta interface{}) error {
123123
cs := meta.(*cloudstack.CloudStackClient)
124124

125-
pn, _, err := cs.Network.GetPhysicalNetworkByID(d.Id())
125+
p, _, err := cs.Network.GetPhysicalNetworkByID(d.Id())
126126
if err != nil {
127127
return err
128128
}
129129

130-
d.Set("broadcast_domain_range", pn.Broadcastdomainrange)
131-
d.Set("domain_id", pn.Domainid)
132-
d.Set("isolation_methods", pn.Isolationmethods)
133-
d.Set("name", pn.Name)
134-
d.Set("network_speed", pn.Networkspeed)
135-
d.Set("tags", pn.Tags)
136-
d.Set("vlan", pn.Vlan)
137-
d.Set("zone_id", pn.Zoneid)
130+
d.Set("broadcast_domain_range", p.Broadcastdomainrange)
131+
d.Set("domain_id", p.Domainid)
132+
d.Set("isolation_methods", p.Isolationmethods)
133+
d.Set("name", p.Name)
134+
d.Set("network_speed", p.Networkspeed)
135+
d.Set("tags", p.Tags)
136+
d.Set("vlan", p.Vlan)
137+
d.Set("zone_id", p.Zoneid)
138138

139139
return nil
140140
}

cloudstack/resource_cloudstack_physicalnetwork.go

Lines changed: 0 additions & 209 deletions
This file was deleted.

cloudstack/resource_cloudstack_physicalnetwork_test.go

Lines changed: 0 additions & 146 deletions
This file was deleted.

0 commit comments

Comments
 (0)