From f00e48a51e1618bccf1d1800590b81696db15071 Mon Sep 17 00:00:00 2001
From: Pavel Boldyrev <627562+bpg@users.noreply.github.com>
Date: Wed, 30 Aug 2023 21:30:26 -0400
Subject: [PATCH] fix(node): creating linux_bridge with 'vlan_aware=false' or
 'autostart=false' (#529)

---
 internal/network/resource_linux_bridge.go     |  8 ++++-
 .../network/resource_linux_bridge_test.go     | 32 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/internal/network/resource_linux_bridge.go b/internal/network/resource_linux_bridge.go
index 9c9a0054..c4d229d0 100644
--- a/internal/network/resource_linux_bridge.go
+++ b/internal/network/resource_linux_bridge.go
@@ -86,7 +86,9 @@ func (m *linuxBridgeResourceModel) exportToNetworkInterfaceCreateUpdateBody() *n
 		body.BridgePorts = &bridgePorts
 	}
 
-	body.BridgeVLANAware = pvetypes.CustomBool(m.VLANAware.ValueBool()).Pointer()
+	if m.VLANAware.ValueBool() {
+		body.BridgeVLANAware = pvetypes.CustomBool(true).Pointer()
+	}
 
 	return body
 }
@@ -99,7 +101,11 @@ func (m *linuxBridgeResourceModel) importFromNetworkInterfaceList(
 	m.Gateway = pvetypes.NewIPAddrPointerValue(iface.Gateway)
 	m.Address6 = pvetypes.NewIPCIDRPointerValue(iface.CIDR6)
 	m.Gateway6 = pvetypes.NewIPAddrPointerValue(iface.Gateway6)
+
 	m.Autostart = types.BoolPointerValue(iface.Autostart.PointerBool())
+	if m.Autostart.IsNull() {
+		m.Autostart = types.BoolValue(false)
+	}
 
 	if iface.MTU != nil {
 		if v, err := strconv.Atoi(*iface.MTU); err == nil {
diff --git a/internal/test/network/resource_linux_bridge_test.go b/internal/test/network/resource_linux_bridge_test.go
index fe8bec51..292bde44 100644
--- a/internal/test/network/resource_linux_bridge_test.go
+++ b/internal/test/network/resource_linux_bridge_test.go
@@ -33,6 +33,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
 	name = "vmbr99"
 	address = "3.3.3.3/24"
 	comment = "created by terraform"
+    vlan_aware = false
+    autostart = false
 	mtu = 1499
 }
 `,
@@ -40,7 +42,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
 					resource.TestCheckResourceAttr(resourceName, "name", "vmbr99"),
 					resource.TestCheckResourceAttr(resourceName, "address", "3.3.3.3/24"),
 					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.TestCheckResourceAttrSet(resourceName, "id"),
 				),
@@ -60,7 +63,8 @@ resource "proxmox_virtual_environment_network_linux_bridge" "test" {
 	address = "1.1.1.1/24"
 	address6 = "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64"
 	comment = "updated by terraform"
-	vlan_aware = false
+	vlan_aware = true
+	autostart = true
 	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, "address6", "FE80:0000:0000:0000:0202:B3FF:FE1E:8329/64"),
 					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.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"),
+				),
+			},
 		},
 	})
 }