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

Move engine-api to docker/docker/api

Browse source 
Remove all dependencies to engine-api and start using docker/docker/api.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan 2016-09-07 13:32:35 -07:00
parent 68ed10ff07
commit ad10ae9b3b
6 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libnetwork/cluster/provider.go
View file

@ -1,7 +1,7 @@
package cluster
import (
"github.com/docker/engine-api/types/network"
"github.com/docker/docker/api/types/network"
"golang.org/x/net/context"
)

2
libnetwork/cmd/dnet/dnet.go
View file

@ -23,8 +23,8 @@ import (
"github.com/docker/docker/pkg/reexec"
"github.com/Sirupsen/logrus"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/pkg/term"
"github.com/docker/engine-api/types/network"
"github.com/docker/libnetwork"
"github.com/docker/libnetwork/api"
"github.com/docker/libnetwork/config"

2
libnetwork/cmd/dnet/dnet_linux.go
View file

@ -13,7 +13,7 @@ func setupDumpStackTrap() {
signal.Notify(c, syscall.SIGUSR1)
go func() {
for range c {
psignal.DumpStacks()
psignal.DumpStacks("")
}
}()
}

2
libnetwork/cmd/dnet/dnet_windows.go
View file

@ -21,7 +21,7 @@ func setupDumpStackTrap() {
logrus.Debugf("Stackdump - waiting signal at %s", ev)
for {
syscall.WaitForSingleObject(h, syscall.INFINITE)
signal.DumpStacks()
signal.DumpStacks("")
}
}
}()

14
libnetwork/drivers/remote/driver_test.go
View file

@ -218,7 +218,7 @@ func TestGetEmptyCapabilities(t *testing.T) {
t.Fatal(err)
}
d := newDriver(plugin, p.Client)
d := newDriver(plugin, p.Client())
if d.Type() != plugin {
t.Fatal("Driver type does not match that given")
}
@ -247,7 +247,7 @@ func TestGetExtraCapabilities(t *testing.T) {
t.Fatal(err)
}
d := newDriver(plugin, p.Client)
d := newDriver(plugin, p.Client())
if d.Type() != plugin {
t.Fatal("Driver type does not match that given")
}
@ -277,7 +277,7 @@ func TestGetInvalidCapabilities(t *testing.T) {
t.Fatal(err)
}
d := newDriver(plugin, p.Client)
d := newDriver(plugin, p.Client())
if d.Type() != plugin {
t.Fatal("Driver type does not match that given")
}
@ -391,7 +391,7 @@ func TestRemoteDriver(t *testing.T) {
t.Fatal(err)
}
d := newDriver(plugin, p.Client)
d := newDriver(plugin, p.Client())
if d.Type() != plugin {
t.Fatal("Driver type does not match that given")
}
@ -469,7 +469,7 @@ func TestDriverError(t *testing.T) {
t.Fatal(err)
}
driver := newDriver(plugin, p.Client)
driver := newDriver(plugin, p.Client())
if err := driver.CreateEndpoint("dummy", "dummy", &testEndpoint{t: t}, map[string]interface{}{}); err == nil {
t.Fatalf("Expected error from driver")
@ -501,7 +501,7 @@ func TestMissingValues(t *testing.T) {
if err != nil {
t.Fatal(err)
}
driver := newDriver(plugin, p.Client)
driver := newDriver(plugin, p.Client())
if err := driver.CreateEndpoint("dummy", "dummy", ep, map[string]interface{}{}); err != nil {
t.Fatal(err)
@ -562,7 +562,7 @@ func TestRollback(t *testing.T) {
if err != nil {
t.Fatal(err)
}
driver := newDriver(plugin, p.Client)
driver := newDriver(plugin, p.Client())
ep := &rollbackEndpoint{}

8
libnetwork/ipams/remote/remote_test.go
View file

@ -79,7 +79,7 @@ func TestGetCapabilities(t *testing.T) {
t.Fatal(err)
}
d := newAllocator(plugin, p.Client)
d := newAllocator(plugin, p.Client())
caps, err := d.(*allocator).getCapabilities()
if err != nil {
@ -102,7 +102,7 @@ func TestGetCapabilitiesFromLegacyDriver(t *testing.T) {
t.Fatal(err)
}
d := newAllocator(plugin, p.Client)
d := newAllocator(plugin, p.Client())
if _, err := d.(*allocator).getCapabilities(); err == nil {
t.Fatalf("Expected error, but got Success %v", err)
@ -127,7 +127,7 @@ func TestGetDefaultAddressSpaces(t *testing.T) {
t.Fatal(err)
}
d := newAllocator(plugin, p.Client)
d := newAllocator(plugin, p.Client())
l, g, err := d.(*allocator).GetDefaultAddressSpaces()
if err != nil {
@ -217,7 +217,7 @@ func TestRemoteDriver(t *testing.T) {
t.Fatal(err)
}
d := newAllocator(plugin, p.Client)
d := newAllocator(plugin, p.Client())
l, g, err := d.(*allocator).GetDefaultAddressSpaces()
if err != nil {