chore: Add a helper for the MAC address property

terraform-routeros · May 14, 2023 · 13a006d · 13a006d
1 parent a6fdcf8
commit 13a006d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/routeros/provider_schema_helpers.go b/routeros/provider_schema_helpers.go
@@ -31,6 +31,7 @@ const (
 	KeyInterface   = "interface"
 	KeyInvalid     = "invalid"
 	KeyL2Mtu       = "l2mtu"
+	KeyMacAddress  = "mac_address"
 	KeyMtu         = "mtu"
 	KeyName        = "name"
 	KeyPlaceBefore = "place_before"
@@ -157,6 +158,11 @@ var (
 		Computed:    true,
 		Description: "Layer2 Maximum transmission unit.",
 	}
+	PropMacAddressRo = &schema.Schema{
+		Type:        schema.TypeString,
+		Computed:    true,
+		Description: "Current mac address.",
+	}
 	PropNameForceNewRw = &schema.Schema{
 		Type:     schema.TypeString,
 		Required: true,

diff --git a/routeros/resource_interface_bridge.go b/routeros/resource_interface_bridge.go
@@ -124,10 +124,7 @@ func ResourceInterfaceBridge() *schema.Resource {
 				"forwarding a certain multicast stream. This property only has effect when igmp-snooping is set to yes.",
 			RequiredWith: []string{"igmp_snooping"},
 		},
-		"mac_address": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
+		KeyMacAddress: PropMacAddressRo,
 		"max_hops": {
 			Type:     schema.TypeInt,
 			Optional: true,

diff --git a/routeros/resource_interface_vlan.go b/routeros/resource_interface_vlan.go
@@ -41,13 +41,10 @@ func ResourceInterfaceVlan() *schema.Resource {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
-		"mac_address": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		KeyMtu:     PropMtuRw(),
-		KeyName:    PropNameForceNewRw,
-		KeyRunning: PropRunningRo,
+		KeyMacAddress: PropMacAddressRo,
+		KeyMtu:        PropMtuRw(),
+		KeyName:       PropNameForceNewRw,
+		KeyRunning:    PropRunningRo,
 		"use_service_tag": {
 			Type:     schema.TypeBool,
 			Optional: true,

diff --git a/routeros/resource_interface_vrrp.go b/routeros/resource_interface_vrrp.go
@@ -84,12 +84,9 @@ func ResourceInterfaceVrrp() *schema.Resource {
 			Type:     schema.TypeBool,
 			Computed: true,
 		},
-		"mac_address": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		KeyMtu:  PropMtuRw(),
-		KeyName: PropNameForceNewRw,
+		KeyMacAddress: PropMacAddressRo,
+		KeyMtu:        PropMtuRw(),
+		KeyName:       PropNameForceNewRw,
 		"on_fail": {
 			Type:        schema.TypeString,
 			Optional:    true,

diff --git a/routeros/resource_ovpn_server.go b/routeros/resource_ovpn_server.go
@@ -90,6 +90,7 @@ func ResourceOpenVPNServer() *schema.Resource {
 				"disconnected",
 			DiffSuppressFunc: TimeEquall,
 		},
+		// Computed only???
 		"mac_address": {
 			Type:        schema.TypeString,
 			Optional:    true,