github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #182 from brendandburns/net

Browse Source 
Update IP assignment to be per-pod, not per-container
This commit is contained in:
Daniel Smith
2014-06-20 09:06:34 -07:00
parent 0a3996a5a6 b46d8d2337
commit 8a13e5300d
2 changed files with 74 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/kubelet/kubelet_test.go
View File

@@ -91,7 +91,7 @@ type FakeDockerClient struct {
container *docker.Container
err error
called []string
stopped string
stopped []string
}
func (f *FakeDockerClient) clearCalls() {
@@ -124,7 +124,7 @@ func (f *FakeDockerClient) StartContainer(id string, hostConfig *docker.HostConf
func (f *FakeDockerClient) StopContainer(id string, timeout uint) error {
f.appendCall("stop")
f.stopped = id
f.stopped = append(f.stopped, id)
return nil
}
@@ -499,6 +499,11 @@ func TestSyncManifestsDoesNothing(t *testing.T) {
Names: []string{"bar--foo"},
ID: "1234",
},
{
// network container
Names: []string{"k8snet--foo--"},
ID: "9876",
},
}
fakeDocker.container = &docker.Container{
ID: "1234",
@@ -515,11 +520,12 @@ func TestSyncManifestsDoesNothing(t *testing.T) {
},
})
expectNoError(t, err)
if len(fakeDocker.called) != 4 ||
if len(fakeDocker.called) != 5 ||
fakeDocker.called[0] != "list" ||
fakeDocker.called[1] != "list" ||
fakeDocker.called[2] != "inspect" ||
fakeDocker.called[3] != "list" {
fakeDocker.called[2] != "list" ||
fakeDocker.called[3] != "inspect" ||
fakeDocker.called[4] != "list" {
t.Errorf("Unexpected call sequence: %#v", fakeDocker.called)
}
}
@@ -534,6 +540,11 @@ func TestSyncManifestsDeletes(t *testing.T) {
Names: []string{"foo--bar"},
ID: "1234",
},
{
// network container
Names: []string{"k8snet--foo--"},
ID: "9876",
},
{
Names: []string{"foo"},
ID: "4567",
@@ -544,12 +555,15 @@ func TestSyncManifestsDeletes(t *testing.T) {
}
err := kubelet.SyncManifests([]api.ContainerManifest{})
expectNoError(t, err)
if len(fakeDocker.called) != 3 ||
if len(fakeDocker.called) != 5 ||
fakeDocker.called[0] != "list" ||
fakeDocker.called[1] != "list" ||
fakeDocker.called[2] != "stop" ||
fakeDocker.stopped != "1234" {
t.Errorf("Unexpected call sequence: %#v", fakeDocker.called)
fakeDocker.called[3] != "list" ||
fakeDocker.called[4] != "stop" ||
fakeDocker.stopped[0] != "1234" ||
fakeDocker.stopped[1] != "9876" {
t.Errorf("Unexpected call sequence: %#v %s", fakeDocker.called, fakeDocker.stopped)
}
}