0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #154 from mrjana/cnm_integ

Browse source 
Change portallocator New() method to Get()
This commit is contained in:
Madhu Venugopal 2015-05-14 15:25:30 -07:00
commit 7623cd3f4d
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libnetwork/pkg/portallocator/portallocator.go
View file

@ -80,8 +80,8 @@ type (
protoMap map[string]*portMap
)
// New returns a new instance of PortAllocator
func New() *PortAllocator {
// Get returns the default instance of PortAllocator
func Get() *PortAllocator {
// Port Allocator is a singleton
// Note: Long term solution will be each PortAllocator will have access to
// the OS so that it can have up to date view of the OS port allocation.

20
libnetwork/pkg/portallocator/portallocator_test.go
View file

@ -12,7 +12,7 @@ func resetPortAllocator() {
}
func TestRequestNewPort(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
port, err := p.RequestPort(defaultIP, "tcp", 0)
@ -26,7 +26,7 @@ func TestRequestNewPort(t *testing.T) {
}
func TestRequestSpecificPort(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
port, err := p.RequestPort(defaultIP, "tcp", 5000)
@ -40,7 +40,7 @@ func TestRequestSpecificPort(t *testing.T) {
}
func TestReleasePort(t *testing.T) {
p := New()
p := Get()
port, err := p.RequestPort(defaultIP, "tcp", 5000)
if err != nil {
@ -56,7 +56,7 @@ func TestReleasePort(t *testing.T) {
}
func TestReuseReleasedPort(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
port, err := p.RequestPort(defaultIP, "tcp", 5000)
@ -78,7 +78,7 @@ func TestReuseReleasedPort(t *testing.T) {
}
func TestReleaseUnreadledPort(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
port, err := p.RequestPort(defaultIP, "tcp", 5000)
@ -99,13 +99,13 @@ func TestReleaseUnreadledPort(t *testing.T) {
}
func TestUnknowProtocol(t *testing.T) {
if _, err := New().RequestPort(defaultIP, "tcpp", 0); err != ErrUnknownProtocol {
if _, err := Get().RequestPort(defaultIP, "tcpp", 0); err != ErrUnknownProtocol {
t.Fatalf("Expected error %s got %s", ErrUnknownProtocol, err)
}
}
func TestAllocateAllPorts(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
for i := 0; i <= p.End-p.Begin; i++ {
@ -156,7 +156,7 @@ func TestAllocateAllPorts(t *testing.T) {
}
func BenchmarkAllocatePorts(b *testing.B) {
p := New()
p := Get()
defer resetPortAllocator()
for i := 0; i < b.N; i++ {
@ -175,7 +175,7 @@ func BenchmarkAllocatePorts(b *testing.B) {
}
func TestPortAllocation(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
ip := net.ParseIP("192.168.0.1")
@ -237,7 +237,7 @@ func TestPortAllocation(t *testing.T) {
}
func TestNoDuplicateBPR(t *testing.T) {
p := New()
p := Get()
defer resetPortAllocator()
if port, err := p.RequestPort(defaultIP, "tcp", p.Begin); err != nil {

2
libnetwork/portmapper/mapper.go
View file

@ -42,7 +42,7 @@ type PortMapper struct {
// New returns a new instance of PortMapper
func New() *PortMapper {
return NewWithPortAllocator(portallocator.New())
return NewWithPortAllocator(portallocator.Get())
}
// NewWithPortAllocator returns a new instance of PortMapper which will use the specified PortAllocator