Merge pull request #44 from eyakubovich/master

fixed unit tests and gofmt

pkg/ip/iface.go

@@ -25,7 +25,7 @@ func GetIfaceIP4Addr(iface *net.Interface) (net.IP, error) {
 	return nil, errors.New("No IPv4 address found for given interface")
 }
 
-func GetIfaceIP4AddrMatch(iface *net.Interface, matchAddr net.IP) (error) {
+func GetIfaceIP4AddrMatch(iface *net.Interface, matchAddr net.IP) error {
 	addrs, err := iface.Addrs()
 	if err != nil {
 		return err

pkg/ip/ipnet.go

@@ -157,7 +157,6 @@ func (n IP4Net) MarshalJSON() ([]byte, error) {
 func (n *IP4Net) UnmarshalJSON(j []byte) error {
 	j = bytes.Trim(j, "\"")
 	if _, val, err := net.ParseCIDR(string(j)); err != nil {
-		fmt.Println(err)
 		return err
 	} else {
 		*n = FromIPNet(val)

subnet/registry.go

@@ -1,9 +1,9 @@
 package subnet
 
 import (
+	"path"
 	"sync"
 	"time"
-	"path"
 
 	"github.com/coreos/flannel/Godeps/_workspace/src/github.com/coreos/go-etcd/etcd"
 	log "github.com/coreos/flannel/Godeps/_workspace/src/github.com/golang/glog"

subnet/subnet_test.go

@@ -151,11 +151,13 @@ func TestAcquireLease(t *testing.T) {
 		t.Fatalf("Failed to create subnet manager: %s", err)
 	}
 
-	ip, _ := ip.ParseIP4("1.2.3.4")
-	data := `{ "PublicIP": "1.2.3.4" }`
+	extIP, _ := ip.ParseIP4("1.2.3.4")
+	data := BaseAttrs{
+		PublicIP: extIP,
+	}
 
 	cancel := make(chan bool)
-	sn, err := sm.AcquireLease(ip, data, cancel)
+	sn, err := sm.AcquireLease(extIP, data, cancel)
 	if err != nil {
 		t.Fatal("AcquireLease failed: ", err)
 	}
@@ -165,7 +167,7 @@ func TestAcquireLease(t *testing.T) {
 	}
 
 	// Acquire again, should reuse
-	if sn, err = sm.AcquireLease(ip, data, cancel); err != nil {
+	if sn, err = sm.AcquireLease(extIP, data, cancel); err != nil {
 		t.Fatal("AcquireLease failed: ", err)
 	}
 
@@ -255,13 +257,15 @@ func TestRenewLease(t *testing.T) {
 		t.Fatalf("Failed to create subnet manager: %s", err)
 	}
 
-	ip, _ := ip.ParseIP4("1.2.3.4")
-	data := `{ "PublicIP": "1.2.3.4" }`
+	extIP, _ := ip.ParseIP4("1.2.3.4")
+	data := BaseAttrs{
+		PublicIP: extIP,
+	}
 
 	cancel := make(chan bool)
 	defer close(cancel)
 
-	sn, err := sm.AcquireLease(ip, data, cancel)
+	sn, err := sm.AcquireLease(extIP, data, cancel)
 	if err != nil {
 		t.Fatal("AcquireLease failed: ", err)
 	}