Merge pull request dmacvicar#574 from dmacvicar/issue-572

Make MAC address attribute case insensitive

Author: MalloZup

libvirt/helper/suppress/strings.go

@@ -0,0 +1,10 @@
+package suppress
+
+import (
+	"strings"
+	"github.com/hashicorp/terraform/helper/schema"
+)
+
+func CaseDifference(_, old, new string, _ *schema.ResourceData) bool {
+	return strings.EqualFold(old, new)
+}

libvirt/resource_libvirt_domain.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/davecgh/go-spew/spew"
+	"github.com/dmacvicar/terraform-provider-libvirt/libvirt/helper/suppress"
 	"github.com/hashicorp/terraform/helper/schema"
 	libvirt "github.com/libvirt/libvirt-go"
 	"github.com/libvirt/libvirt-go-xml"
@@ -198,9 +199,10 @@ func resourceLibvirtDomain() *schema.Resource {
 							Computed: true,
 						},
 						"mac": {
-							Type:     schema.TypeString,
-							Optional: true,
-							Computed: true,
+							Type:             schema.TypeString,
+							Optional:         true,
+							Computed:         true,
+							DiffSuppressFunc: suppress.CaseDifference,
 						},
 						"wait_for_lease": {
 							Type:     schema.TypeBool,

libvirt/resource_libvirt_domain_test.go

@@ -1315,6 +1315,34 @@ func TestAccLibvirtDomain_ShutoffMultiDomainsRunning(t *testing.T) {
 	})
 }
 
+func TestAccLibvirtDomain_CaseInsensitiveAttrs_MAC(t *testing.T) {
+	randomDomainName := acctest.RandString(10)
+	var config = fmt.Sprintf(`
+	resource "libvirt_domain" "%s" {
+		name      = "%s"
+        network_interface {
+            mac = "52:54:00:b2:2f:88"
+        }
+	}`, randomDomainName, randomDomainName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckLibvirtDomainDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+				Check: resource.ComposeTestCheckFunc(
+					// libvirt always returns upper-cased
+					resource.TestCheckResourceAttr("libvirt_domain."+randomDomainName, "network_interface.0.mac", "52:54:00:B2:2F:88"),
+				),
+				// because the attribute is case insensitive, there should be no plan
+				ExpectNonEmptyPlan: false,
+			},
+		},
+	})
+}
+
 func testAccCheckLibvirtDomainStateEqual(name string, domain *libvirt.Domain, exptectedState string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {