Merge pull request #163 from juamedgod/patch-1

Fixed MAC cleaning regular expression

Author: zchee

xhyve/xhyve.go

@@ -995,7 +995,7 @@ func (d *Driver) SendSignal(sig os.Signal) error {
 
 // trimMacAddress trimming "0" of the ten's digit
 func trimMacAddress(rawUUID string) string {
-	re := regexp.MustCompile(`[0]([A-Fa-f0-9][:])`)
+	re := regexp.MustCompile(`0([A-Fa-f0-9](:|$))`)
 	mac := re.ReplaceAllString(rawUUID, "$1")
 
 	return mac

xhyve/xhyve_test.go

@@ -29,7 +29,7 @@ func TestDefaultSSHUsername(t *testing.T) {
 func TestTrimMacAddress(t *testing.T) {
 	// test MAC address 02:f0:0d:60:0f:30 and reverse
 	testMacAddress := trimMacAddress("02:f0:0d:60:01:03")
-	newMacAddress := "2:f0:d:60:1:03"
+	newMacAddress := "2:f0:d:60:1:3"
 
 	if !assert.Equal(t, testMacAddress, newMacAddress) {
 		t.Fatalf("expected different MacAddress \n  source %s\nreceived %s", testMacAddress, newMacAddress)