mirrors/terraform-provider-proxmox
0
0
Fork 0
mirror of https://github.com/bpg/terraform-provider-proxmox.git synced 2025-07-05 05:24:01 +00:00
Code

fix(node): creating linux_bridge with 'vlan_aware=false' or 'autostart=false' (#529)

Browse Source
This commit is contained in:
Pavel Boldyrev 2023-08-30 21:30:26 -04:00 committed by GitHub
parent 11d82614e6
commit f00e48a51e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/network/resource_linux_bridge.go
View File

@ -86,7 +86,9 @@ func (m *linuxBridgeResourceModel) exportToNetworkInterfaceCreateUpdateBody() *n
body.BridgePorts = &bridgePorts body.BridgePorts = &bridgePorts
} }
body.BridgeVLANAware = pvetypes.CustomBool(m.VLANAware.ValueBool()).Pointer() if m.VLANAware.ValueBool() {
body.BridgeVLANAware = pvetypes.CustomBool(true).Pointer()
}
return body return body
} }
@ -99,7 +101,11 @@ func (m *linuxBridgeResourceModel) importFromNetworkInterfaceList(
m.Gateway = pvetypes.NewIPAddrPointerValue(iface.Gateway) m.Gateway = pvetypes.NewIPAddrPointerValue(iface.Gateway)
m.Address6 = pvetypes.NewIPCIDRPointerValue(iface.CIDR6) m.Address6 = pvetypes.NewIPCIDRPointerValue(iface.CIDR6)
m.Gateway6 = pvetypes.NewIPAddrPointerValue(iface.Gateway6) m.Gateway6 = pvetypes.NewIPAddrPointerValue(iface.Gateway6)
m.Autostart = types.BoolPointerValue(iface.Autostart.PointerBool()) m.Autostart = types.BoolPointerValue(iface.Autostart.PointerBool())
if m.Autostart.IsNull() {
m.Autostart = types.BoolValue(false)
}
if iface.MTU != nil { if iface.MTU != nil {
if v, err := strconv.Atoi(*iface.MTU); err == nil { if v, err := strconv.Atoi(*iface.MTU); err == nil {

32
internal/test/network/resource_linux_bridge_test.go
View File

@ -33,6 +33,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
name = "vmbr99" name = "vmbr99"
address = "3.3.3.3/24" address = "3.3.3.3/24"
comment = "created by terraform" comment = "created by terraform"
vlan_aware = false
autostart = false
mtu = 1499 mtu = 1499
} }
`, `,
@ -40,7 +42,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
resource.TestCheckResourceAttr(resourceName, "name", "vmbr99"), resource.TestCheckResourceAttr(resourceName, "name", "vmbr99"),
resource.TestCheckResourceAttr(resourceName, "address", "3.3.3.3/24"), resource.TestCheckResourceAttr(resourceName, "address", "3.3.3.3/24"),
resource.TestCheckResourceAttr(resourceName, "comment", "created by terraform"), resource.TestCheckResourceAttr(resourceName, "comment", "created by terraform"),
resource.TestCheckResourceAttr(resourceName, "vlan_aware", "true"), resource.TestCheckResourceAttr(resourceName, "vlan_aware", "false"),
resource.TestCheckResourceAttr(resourceName, "autostart", "false"),
resource.TestCheckResourceAttr(resourceName, "mtu", "1499"), resource.TestCheckResourceAttr(resourceName, "mtu", "1499"),
resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "id"),
), ),
@ -60,7 +63,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
address = "1.1.1.1/24" address = "1.1.1.1/24"
address6 = "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64" address6 = "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64"
comment = "updated by terraform" comment = "updated by terraform"
vlan_aware = false vlan_aware = true
autostart = true
mtu = null mtu = null
} }
`, `,
@ -69,11 +73,33 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
resource.TestCheckResourceAttr(resourceName, "address", "1.1.1.1/24"), resource.TestCheckResourceAttr(resourceName, "address", "1.1.1.1/24"),
resource.TestCheckResourceAttr(resourceName, "address6", "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64"), resource.TestCheckResourceAttr(resourceName, "address6", "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64"),
resource.TestCheckResourceAttr(resourceName, "comment", "updated by terraform"), resource.TestCheckResourceAttr(resourceName, "comment", "updated by terraform"),
resource.TestCheckResourceAttr(resourceName, "vlan_aware", "false"), resource.TestCheckResourceAttr(resourceName, "vlan_aware", "true"),
resource.TestCheckResourceAttr(resourceName, "autostart", "true"),
resource.TestCheckNoResourceAttr(resourceName, "mtu"), resource.TestCheckNoResourceAttr(resourceName, "mtu"),
resource.TestCheckResourceAttrSet(resourceName, "id"), resource.TestCheckResourceAttrSet(resourceName, "id"),
), ),
}, },
// Create with other default overrides
{
Config: test.ProviderConfig + `
resource "proxmox_virtual_environment_network_linux_bridge" "test" {
node_name = "pve"
name = "vmbr98"
address = "3.3.3.4/24"
comment = "created by terraform 2"
vlan_aware = true
autostart = true
}
`,
Check: resource.ComposeAggregateTestCheckFunc(
resource.TestCheckResourceAttr(resourceName, "name", "vmbr98"),
resource.TestCheckResourceAttr(resourceName, "address", "3.3.3.4/24"),
resource.TestCheckResourceAttr(resourceName, "comment", "created by terraform 2"),
resource.TestCheckResourceAttr(resourceName, "vlan_aware", "true"),
resource.TestCheckResourceAttr(resourceName, "autostart", "true"),
resource.TestCheckResourceAttrSet(resourceName, "id"),
),
},
}, },
}) })
} }