epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-07-25 16:36:10 -03:00
parent 8424479e76
commit 53e6078cc5
22 changed files with 307 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
router/l2/l2.go
View File

@@ -7,7 +7,6 @@ import (
"log"
"net"
"os"
"strings"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
@@ -18,31 +17,23 @@ import (
)
func director(host string) (*net.TCPAddr, error) {
chunks := strings.Split(host, ":")
matches := config.NameFilter.FindStringSubmatch(chunks[0])
var rawHost, port string
if len(matches) == 3 {
rawHost = matches[1]
port = matches[2]
} else if len(matches) == 2 {
rawHost = matches[1]
} else {
return nil, fmt.Errorf("Couldn't find host in string")
info, err := router.DecodeHost(host)
if err != nil {
return nil, err
}
if port == "" {
if len(chunks) == 2 {
port = chunks[1]
} else {
port = "80"
}
port := info.Port
if info.EncodedPort > 0 {
port = info.EncodedPort
}
dstHost := strings.Replace(rawHost, "-", ".", -1)
if port == 0 {
// TODO: Should default depending on the protocol
port = 80
}
t, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf("%s:%s", dstHost, port))
t, err := net.ResolveTCPAddr("tcp4", fmt.Sprintf("%s:%d", info.InstanceIP, port))
if err != nil {
return nil, err
}

21
router/l2/l2_test.go
View File

@@ -7,41 +7,38 @@ import (
)
func TestDirector(t *testing.T) {
addr, err := director("ip10-0-0-1-8080.foo.bar")
addr, err := director("ip10-0-0-1-aabb-8080.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:8080", addr.String())
addr, err = director("ip10-0-0-1.foo.bar")
addr, err = director("ip10-0-0-1-aabb.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:80", addr.String())
addr, err = director("ip10-0-0-1.foo.bar:9090")
addr, err = director("ip10-0-0-1-aabb.foo.bar:9090")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:9090", addr.String())
addr, err = director("ip10-0-0-1-2222.foo.bar:9090")
addr, err = director("ip10-0-0-1-aabb-2222.foo.bar:9090")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("lala.ip10-0-0-1-2222.foo.bar")
addr, err = director("lala.ip10-0-0-1-aabb-2222.foo.bar")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("lala.ip10-0-0-1-2222")
addr, err = director("lala.ip10-0-0-1-aabb-2222")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("ip10-0-0-1-2222")
addr, err = director("ip10-0-0-1-aabb-2222")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:2222", addr.String())
addr, err = director("ip10-0-0-1")
addr, err = director("ip10-0-0-1-aabb")
assert.Nil(t, err)
assert.Equal(t, "10.0.0.1:80", addr.String())
_, err = director("lala10-0-0-1.foo.bar")
assert.NotNil(t, err)
_, err = director("ip10-0-0-1-10-20")
_, err = director("lala10-0-0-1-aabb.foo.bar")
assert.NotNil(t, err)
}