kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #20842 from dongluochen/IPv6Support 

Handle IPv6 entries in discovery
This commit is contained in:
David Calavera 2016-03-01 21:03:37 -08:00
parent 04a3cedf44 7554e882df
commit 266a75ac22
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/discovery/backends.go
View File

@ -89,7 +89,7 @@ func ParseAdvertise(advertise string) (string, error) {
return "", fmt.Errorf("couldnt find a valid ip-address in interface %s", advertise)
}
addr = fmt.Sprintf("%s:%s", addr, port)
addr = net.JoinHostPort(addr, port)
return addr, nil
}

8
pkg/discovery/discovery_test.go
View File

@ -19,6 +19,11 @@ func (s *DiscoverySuite) TestNewEntry(c *check.C) {
c.Assert(entry.Equals(&Entry{Host: "127.0.0.1", Port: "2375"}), check.Equals, true)
c.Assert(entry.String(), check.Equals, "127.0.0.1:2375")
entry, err = NewEntry("[2001:db8:0:f101::2]:2375")
c.Assert(err, check.IsNil)
c.Assert(entry.Equals(&Entry{Host: "2001:db8:0:f101::2", Port: "2375"}), check.Equals, true)
c.Assert(entry.String(), check.Equals, "[2001:db8:0:f101::2]:2375")
_, err = NewEntry("127.0.0.1")
c.Assert(err, check.NotNil)
}
@ -50,11 +55,12 @@ func (s *DiscoverySuite) TestCreateEntries(c *check.C) {
c.Assert(entries, check.DeepEquals, Entries{})
c.Assert(err, check.IsNil)
entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", ""})
entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", "[2001:db8:0:f101::2]:2375", ""})
c.Assert(err, check.IsNil)
expected := Entries{
&Entry{Host: "127.0.0.1", Port: "2375"},
&Entry{Host: "127.0.0.2", Port: "2375"},
&Entry{Host: "2001:db8:0:f101::2", Port: "2375"},
}
c.Assert(entries.Equals(expected), check.Equals, true)

7
pkg/discovery/entry.go
View File

@ -1,9 +1,6 @@
package discovery
import (
"fmt"
"net"
)
import "net"
// NewEntry creates a new entry.
func NewEntry(url string) (*Entry, error) {
@ -27,7 +24,7 @@ func (e *Entry) Equals(cmp *Entry) bool {
// String returns the string form of an entry.
func (e *Entry) String() string {
return fmt.Sprintf("%s:%s", e.Host, e.Port)
return net.JoinHostPort(e.Host, e.Port)
}
// Entries is a list of *Entry with some helpers.