From f26a50a483e7c5518f9bf3f8def4f73c47a26c54 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Tue, 2 Feb 2016 12:08:09 -0800 Subject: [PATCH] update dockerclient Signed-off-by: Victor Vieux --- Godeps/Godeps.json | 2 +- .../github.com/samalba/dockerclient/types.go | 2 ++ scheduler/filter/port_test.go | 23 ++++++------------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 52fae0d97b..f19c84e34c 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -167,7 +167,7 @@ }, { "ImportPath": "github.com/samalba/dockerclient", - "Rev": "8328370620b71cb5acadd41f259dca96865a069b" + "Rev": "154a327e7f551978278530db4771e2f05376b541" }, { "ImportPath": "github.com/samuel/go-zookeeper/zk", diff --git a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go index 8eae4f08ce..1317076c14 100644 --- a/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go +++ b/Godeps/_workspace/src/github.com/samalba/dockerclient/types.go @@ -236,6 +236,8 @@ type ContainerInfo struct { Gateway string Bridge string Ports map[string][]PortBinding + Networks map[string]*EndpointSettings + } SysInitPath string ResolvConfPath string diff --git a/scheduler/filter/port_test.go b/scheduler/filter/port_test.go index 842efa8d4c..4a95608e2c 100644 --- a/scheduler/filter/port_test.go +++ b/scheduler/filter/port_test.go @@ -235,24 +235,15 @@ func TestPortFilterRandomAssignment(t *testing.T) { }, }, }}, - NetworkSettings: struct { - IPAddress string `json:"IpAddress"` - IPPrefixLen int `json:"IpPrefixLen"` - Gateway string - Bridge string - Ports map[string][]dockerclient.PortBinding - }{ - Ports: map[string][]dockerclient.PortBinding{ - "80/tcp": { - { - HostIp: "127.0.0.1", - HostPort: "1234", - }, - }, - }, - }, }, } + container.Info.NetworkSettings.Ports = map[string][]dockerclient.PortBinding{ + "80/tcp": { + { + HostIp: "127.0.0.1", + HostPort: "1234", + }, + }} assert.NoError(t, nodes[0].AddContainer(container))