1. docker
  2. Commit ad10ae9b3bd03bf0073876ab0e792fbb82273cd7
Browse code

Move engine-api to docker/docker/api

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

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>

Jana Radhakrishnan authored on 2016/09/08 05:32:35
Showing 6 changed files
libnetwork/cluster/provider.go
History View file @ ad10ae9
... ... 
@@ -1,7 +1,7 @@
1 1 
 package cluster
2 2
3 3 
 import (
4 
-	"github.com/docker/engine-api/types/network"
4 
+	"github.com/docker/docker/api/types/network"
5 5 
 	"golang.org/x/net/context"
6 6 
 )
7 7
libnetwork/cmd/dnet/dnet.go
History View file @ ad10ae9
... ... 
@@ -23,8 +23,8 @@ import (
23 23 
 	"github.com/docker/docker/pkg/reexec"
24 24
25 25 
 	"github.com/Sirupsen/logrus"
26 
+	"github.com/docker/docker/api/types/network"
26 27 
 	"github.com/docker/docker/pkg/term"
27 
-	"github.com/docker/engine-api/types/network"
28 28 
 	"github.com/docker/libnetwork"
29 29 
 	"github.com/docker/libnetwork/api"
30 30 
 	"github.com/docker/libnetwork/config"
libnetwork/cmd/dnet/dnet_linux.go
History View file @ ad10ae9
... ... 
@@ -13,7 +13,7 @@ func setupDumpStackTrap() {
13 13 
 	signal.Notify(c, syscall.SIGUSR1)
14 14 
 	go func() {
15 15 
 		for range c {
16 
-			psignal.DumpStacks()
16 
+			psignal.DumpStacks("")
17 17 
 		}
18 18 
 	}()
19 19 
 }
libnetwork/cmd/dnet/dnet_windows.go
History View file @ ad10ae9
... ... 
@@ -21,7 +21,7 @@ func setupDumpStackTrap() {
21 21 
 			logrus.Debugf("Stackdump - waiting signal at %s", ev)
22 22 
 			for {
23 23 
 				syscall.WaitForSingleObject(h, syscall.INFINITE)
24 
-				signal.DumpStacks()
24 
+				signal.DumpStacks("")
25 25 
 			}
26 26 
 		}
27 27 
 	}()
libnetwork/drivers/remote/driver_test.go
History View file @ ad10ae9
... ... 
@@ -218,7 +218,7 @@ func TestGetEmptyCapabilities(t *testing.T) {
218 218 
 		t.Fatal(err)
219 219 
 	}
220 220
221 
-	d := newDriver(plugin, p.Client)
221 
+	d := newDriver(plugin, p.Client())
222 222 
 	if d.Type() != plugin {
223 223 
 		t.Fatal("Driver type does not match that given")
224 224 
 	}
... ... 
@@ -247,7 +247,7 @@ func TestGetExtraCapabilities(t *testing.T) {
247 247 
 		t.Fatal(err)
248 248 
 	}
249 249
250 
-	d := newDriver(plugin, p.Client)
250 
+	d := newDriver(plugin, p.Client())
251 251 
 	if d.Type() != plugin {
252 252 
 		t.Fatal("Driver type does not match that given")
253 253 
 	}
... ... 
@@ -277,7 +277,7 @@ func TestGetInvalidCapabilities(t *testing.T) {
277 277 
 		t.Fatal(err)
278 278 
 	}
279 279
280 
-	d := newDriver(plugin, p.Client)
280 
+	d := newDriver(plugin, p.Client())
281 281 
 	if d.Type() != plugin {
282 282 
 		t.Fatal("Driver type does not match that given")
283 283 
 	}
... ... 
@@ -391,7 +391,7 @@ func TestRemoteDriver(t *testing.T) {
391 391 
 		t.Fatal(err)
392 392 
 	}
393 393
394 
-	d := newDriver(plugin, p.Client)
394 
+	d := newDriver(plugin, p.Client())
395 395 
 	if d.Type() != plugin {
396 396 
 		t.Fatal("Driver type does not match that given")
397 397 
 	}
... ... 
@@ -469,7 +469,7 @@ func TestDriverError(t *testing.T) {
469 469 
 		t.Fatal(err)
470 470 
 	}
471 471
472 
-	driver := newDriver(plugin, p.Client)
472 
+	driver := newDriver(plugin, p.Client())
473 473
474 474 
 	if err := driver.CreateEndpoint("dummy", "dummy", &testEndpoint{t: t}, map[string]interface{}{}); err == nil {
475 475 
 		t.Fatalf("Expected error from driver")
... ... 
@@ -501,7 +501,7 @@ func TestMissingValues(t *testing.T) {
501 501 
 	if err != nil {
502 502 
 		t.Fatal(err)
503 503 
 	}
504 
-	driver := newDriver(plugin, p.Client)
504 
+	driver := newDriver(plugin, p.Client())
505 505
506 506 
 	if err := driver.CreateEndpoint("dummy", "dummy", ep, map[string]interface{}{}); err != nil {
507 507 
 		t.Fatal(err)
... ... 
@@ -562,7 +562,7 @@ func TestRollback(t *testing.T) {
562 562 
 	if err != nil {
563 563 
 		t.Fatal(err)
564 564 
 	}
565 
-	driver := newDriver(plugin, p.Client)
565 
+	driver := newDriver(plugin, p.Client())
566 566
567 567 
 	ep := &rollbackEndpoint{}
568 568
libnetwork/ipams/remote/remote_test.go
History View file @ ad10ae9
... ... 
@@ -79,7 +79,7 @@ func TestGetCapabilities(t *testing.T) {
79 79 
 		t.Fatal(err)
80 80 
 	}
81 81
82 
-	d := newAllocator(plugin, p.Client)
82 
+	d := newAllocator(plugin, p.Client())
83 83
84 84 
 	caps, err := d.(*allocator).getCapabilities()
85 85 
 	if err != nil {
... ... 
@@ -102,7 +102,7 @@ func TestGetCapabilitiesFromLegacyDriver(t *testing.T) {
102 102 
 		t.Fatal(err)
103 103 
 	}
104 104
105 
-	d := newAllocator(plugin, p.Client)
105 
+	d := newAllocator(plugin, p.Client())
106 106
107 107 
 	if _, err := d.(*allocator).getCapabilities(); err == nil {
108 108 
 		t.Fatalf("Expected error, but got Success %v", err)
... ... 
@@ -127,7 +127,7 @@ func TestGetDefaultAddressSpaces(t *testing.T) {
127 127 
 		t.Fatal(err)
128 128 
 	}
129 129
130 
-	d := newAllocator(plugin, p.Client)
130 
+	d := newAllocator(plugin, p.Client())
131 131
132 132 
 	l, g, err := d.(*allocator).GetDefaultAddressSpaces()
133 133 
 	if err != nil {
... ... 
@@ -217,7 +217,7 @@ func TestRemoteDriver(t *testing.T) {
217 217 
 		t.Fatal(err)
218 218 
 	}
219 219
220 
-	d := newAllocator(plugin, p.Client)
220 
+	d := newAllocator(plugin, p.Client())
221 221
222 222 
 	l, g, err := d.(*allocator).GetDefaultAddressSpaces()
223 223 
 	if err != nil {