github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 00:07:50 +00:00
Code Issues Projects Releases Wiki Activity

Add ctx to registry test cases

Browse Source
This commit is contained in:
derekwaynecarr 2014-09-26 15:19:22 -04:00
parent 09365fed8d
commit b7fcc7d3ec
6 changed files with 117 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/registry/binding/mock.go
View File

@ -25,6 +25,6 @@ type MockRegistry struct {
OnApplyBinding func(binding *api.Binding) error OnApplyBinding func(binding *api.Binding) error
} }
func (mr MockRegistry) ApplyBinding(binding *api.Binding) error { func (mr MockRegistry) ApplyBinding(ctx api.Context, binding *api.Binding) error {
return mr.OnApplyBinding(binding) return mr.OnApplyBinding(binding)
} }

109
pkg/registry/etcd/etcd_test.go
View File

@ -41,10 +41,11 @@ func NewTestEtcdRegistry(client tools.EtcdClient) *Registry {
} }
func TestEtcdGetPod(t *testing.T) { func TestEtcdGetPod(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set("/registry/pods/foo", runtime.EncodeOrDie(latest.Codec, &api.Pod{JSONBase: api.JSONBase{ID: "foo"}}), 0) fakeClient.Set("/registry/pods/foo", runtime.EncodeOrDie(latest.Codec, &api.Pod{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
pod, err := registry.GetPod("foo") pod, err := registry.GetPod(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -55,6 +56,7 @@ func TestEtcdGetPod(t *testing.T) {
} }
func TestEtcdGetPodNotFound(t *testing.T) { func TestEtcdGetPodNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
R: &etcd.Response{ R: &etcd.Response{
@ -63,13 +65,14 @@ func TestEtcdGetPodNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
_, err := registry.GetPod("foo") _, err := registry.GetPod(ctx, "foo")
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
t.Errorf("Unexpected error returned: %#v", err) t.Errorf("Unexpected error returned: %#v", err)
} }
} }
func TestEtcdCreatePod(t *testing.T) { func TestEtcdCreatePod(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
@ -80,7 +83,7 @@ func TestEtcdCreatePod(t *testing.T) {
} }
fakeClient.Set("/registry/hosts/machine/kubelet", runtime.EncodeOrDie(latest.Codec, &api.ContainerManifestList{}), 0) fakeClient.Set("/registry/hosts/machine/kubelet", runtime.EncodeOrDie(latest.Codec, &api.ContainerManifestList{}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreatePod(&api.Pod{ err := registry.CreatePod(ctx, &api.Pod{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -99,7 +102,7 @@ func TestEtcdCreatePod(t *testing.T) {
} }
// Suddenly, a wild scheduler appears: // Suddenly, a wild scheduler appears:
err = registry.ApplyBinding(&api.Binding{PodID: "foo", Host: "machine"}) err = registry.ApplyBinding(ctx, &api.Binding{PodID: "foo", Host: "machine"})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -130,6 +133,7 @@ func TestEtcdCreatePod(t *testing.T) {
} }
func TestEtcdCreatePodAlreadyExisting(t *testing.T) { func TestEtcdCreatePodAlreadyExisting(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
R: &etcd.Response{ R: &etcd.Response{
@ -140,7 +144,7 @@ func TestEtcdCreatePodAlreadyExisting(t *testing.T) {
E: nil, E: nil,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreatePod(&api.Pod{ err := registry.CreatePod(ctx, &api.Pod{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -151,6 +155,7 @@ func TestEtcdCreatePodAlreadyExisting(t *testing.T) {
} }
func TestEtcdCreatePodWithContainersError(t *testing.T) { func TestEtcdCreatePodWithContainersError(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
@ -166,7 +171,7 @@ func TestEtcdCreatePodWithContainersError(t *testing.T) {
E: tools.EtcdErrorNodeExist, // validate that ApplyBinding is translating Create errors E: tools.EtcdErrorNodeExist, // validate that ApplyBinding is translating Create errors
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreatePod(&api.Pod{ err := registry.CreatePod(ctx, &api.Pod{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -176,12 +181,12 @@ func TestEtcdCreatePodWithContainersError(t *testing.T) {
} }
// Suddenly, a wild scheduler appears: // Suddenly, a wild scheduler appears:
err = registry.ApplyBinding(&api.Binding{PodID: "foo", Host: "machine"}) err = registry.ApplyBinding(ctx, &api.Binding{PodID: "foo", Host: "machine"})
if !errors.IsAlreadyExists(err) { if !errors.IsAlreadyExists(err) {
t.Fatalf("Unexpected error returned: %#v", err) t.Fatalf("Unexpected error returned: %#v", err)
} }
existingPod, err := registry.GetPod("foo") existingPod, err := registry.GetPod(ctx, "foo")
if err != nil { if err != nil {
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
@ -191,6 +196,7 @@ func TestEtcdCreatePodWithContainersError(t *testing.T) {
} }
func TestEtcdCreatePodWithContainersNotFound(t *testing.T) { func TestEtcdCreatePodWithContainersNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
@ -206,7 +212,7 @@ func TestEtcdCreatePodWithContainersNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreatePod(&api.Pod{ err := registry.CreatePod(ctx, &api.Pod{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -226,7 +232,7 @@ func TestEtcdCreatePodWithContainersNotFound(t *testing.T) {
} }
// Suddenly, a wild scheduler appears: // Suddenly, a wild scheduler appears:
err = registry.ApplyBinding(&api.Binding{PodID: "foo", Host: "machine"}) err = registry.ApplyBinding(ctx, &api.Binding{PodID: "foo", Host: "machine"})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -257,6 +263,7 @@ func TestEtcdCreatePodWithContainersNotFound(t *testing.T) {
} }
func TestEtcdCreatePodWithExistingContainers(t *testing.T) { func TestEtcdCreatePodWithExistingContainers(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/pods/foo"] = tools.EtcdResponseWithError{
@ -271,7 +278,7 @@ func TestEtcdCreatePodWithExistingContainers(t *testing.T) {
}, },
}), 0) }), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreatePod(&api.Pod{ err := registry.CreatePod(ctx, &api.Pod{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -291,7 +298,7 @@ func TestEtcdCreatePodWithExistingContainers(t *testing.T) {
} }
// Suddenly, a wild scheduler appears: // Suddenly, a wild scheduler appears:
err = registry.ApplyBinding(&api.Binding{PodID: "foo", Host: "machine"}) err = registry.ApplyBinding(ctx, &api.Binding{PodID: "foo", Host: "machine"})
if err != nil { if err != nil {
t.Fatalf("unexpected error: %v", err) t.Fatalf("unexpected error: %v", err)
} }
@ -322,6 +329,7 @@ func TestEtcdCreatePodWithExistingContainers(t *testing.T) {
} }
func TestEtcdDeletePod(t *testing.T) { func TestEtcdDeletePod(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
@ -336,7 +344,7 @@ func TestEtcdDeletePod(t *testing.T) {
}, },
}), 0) }), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.DeletePod("foo") err := registry.DeletePod(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -358,6 +366,7 @@ func TestEtcdDeletePod(t *testing.T) {
} }
func TestEtcdDeletePodMultipleContainers(t *testing.T) { func TestEtcdDeletePodMultipleContainers(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
@ -373,7 +382,7 @@ func TestEtcdDeletePodMultipleContainers(t *testing.T) {
}, },
}), 0) }), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.DeletePod("foo") err := registry.DeletePod(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -481,6 +490,7 @@ func TestEtcdListPods(t *testing.T) {
} }
func TestEtcdListControllersNotFound(t *testing.T) { func TestEtcdListControllersNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
key := "/registry/controllers" key := "/registry/controllers"
fakeClient.Data[key] = tools.EtcdResponseWithError{ fakeClient.Data[key] = tools.EtcdResponseWithError{
@ -488,7 +498,7 @@ func TestEtcdListControllersNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
controllers, err := registry.ListControllers() controllers, err := registry.ListControllers(ctx)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -499,6 +509,7 @@ func TestEtcdListControllersNotFound(t *testing.T) {
} }
func TestEtcdListServicesNotFound(t *testing.T) { func TestEtcdListServicesNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
key := "/registry/services/specs" key := "/registry/services/specs"
fakeClient.Data[key] = tools.EtcdResponseWithError{ fakeClient.Data[key] = tools.EtcdResponseWithError{
@ -506,7 +517,7 @@ func TestEtcdListServicesNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
services, err := registry.ListServices() services, err := registry.ListServices(ctx)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -517,6 +528,7 @@ func TestEtcdListServicesNotFound(t *testing.T) {
} }
func TestEtcdListControllers(t *testing.T) { func TestEtcdListControllers(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
key := "/registry/controllers" key := "/registry/controllers"
fakeClient.Data[key] = tools.EtcdResponseWithError{ fakeClient.Data[key] = tools.EtcdResponseWithError{
@ -535,7 +547,7 @@ func TestEtcdListControllers(t *testing.T) {
E: nil, E: nil,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
controllers, err := registry.ListControllers() controllers, err := registry.ListControllers(ctx)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -546,10 +558,11 @@ func TestEtcdListControllers(t *testing.T) {
} }
func TestEtcdGetController(t *testing.T) { func TestEtcdGetController(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0) fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
ctrl, err := registry.GetController("foo") ctrl, err := registry.GetController(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -560,6 +573,7 @@ func TestEtcdGetController(t *testing.T) {
} }
func TestEtcdGetControllerNotFound(t *testing.T) { func TestEtcdGetControllerNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Data["/registry/controllers/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/controllers/foo"] = tools.EtcdResponseWithError{
R: &etcd.Response{ R: &etcd.Response{
@ -568,7 +582,7 @@ func TestEtcdGetControllerNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
ctrl, err := registry.GetController("foo") ctrl, err := registry.GetController(ctx, "foo")
if ctrl != nil { if ctrl != nil {
t.Errorf("Unexpected non-nil controller: %#v", ctrl) t.Errorf("Unexpected non-nil controller: %#v", ctrl)
} }
@ -578,9 +592,10 @@ func TestEtcdGetControllerNotFound(t *testing.T) {
} }
func TestEtcdDeleteController(t *testing.T) { func TestEtcdDeleteController(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.DeleteController("foo") err := registry.DeleteController(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -595,9 +610,10 @@ func TestEtcdDeleteController(t *testing.T) {
} }
func TestEtcdCreateController(t *testing.T) { func TestEtcdCreateController(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreateController(&api.ReplicationController{ err := registry.CreateController(ctx, &api.ReplicationController{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -622,11 +638,12 @@ func TestEtcdCreateController(t *testing.T) {
} }
func TestEtcdCreateControllerAlreadyExisting(t *testing.T) { func TestEtcdCreateControllerAlreadyExisting(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0) fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreateController(&api.ReplicationController{ err := registry.CreateController(ctx, &api.ReplicationController{
JSONBase: api.JSONBase{ JSONBase: api.JSONBase{
ID: "foo", ID: "foo",
}, },
@ -637,12 +654,13 @@ func TestEtcdCreateControllerAlreadyExisting(t *testing.T) {
} }
func TestEtcdUpdateController(t *testing.T) { func TestEtcdUpdateController(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
resp, _ := fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0) resp, _ := fakeClient.Set("/registry/controllers/foo", runtime.EncodeOrDie(latest.Codec, &api.ReplicationController{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.UpdateController(&api.ReplicationController{ err := registry.UpdateController(ctx, &api.ReplicationController{
JSONBase: api.JSONBase{ID: "foo", ResourceVersion: resp.Node.ModifiedIndex}, JSONBase: api.JSONBase{ID: "foo", ResourceVersion: resp.Node.ModifiedIndex},
DesiredState: api.ReplicationControllerState{ DesiredState: api.ReplicationControllerState{
Replicas: 2, Replicas: 2,
@ -652,13 +670,14 @@ func TestEtcdUpdateController(t *testing.T) {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
ctrl, err := registry.GetController("foo") ctrl, err := registry.GetController(ctx, "foo")
if ctrl.DesiredState.Replicas != 2 { if ctrl.DesiredState.Replicas != 2 {
t.Errorf("Unexpected controller: %#v", ctrl) t.Errorf("Unexpected controller: %#v", ctrl)
} }
} }
func TestEtcdListServices(t *testing.T) { func TestEtcdListServices(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
key := "/registry/services/specs" key := "/registry/services/specs"
fakeClient.Data[key] = tools.EtcdResponseWithError{ fakeClient.Data[key] = tools.EtcdResponseWithError{
@ -677,7 +696,7 @@ func TestEtcdListServices(t *testing.T) {
E: nil, E: nil,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
services, err := registry.ListServices() services, err := registry.ListServices(ctx)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -688,9 +707,10 @@ func TestEtcdListServices(t *testing.T) {
} }
func TestEtcdCreateService(t *testing.T) { func TestEtcdCreateService(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreateService(&api.Service{ err := registry.CreateService(ctx, &api.Service{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
}) })
if err != nil { if err != nil {
@ -714,10 +734,11 @@ func TestEtcdCreateService(t *testing.T) {
} }
func TestEtcdCreateServiceAlreadyExisting(t *testing.T) { func TestEtcdCreateServiceAlreadyExisting(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set("/registry/services/specs/foo", runtime.EncodeOrDie(latest.Codec, &api.Service{JSONBase: api.JSONBase{ID: "foo"}}), 0) fakeClient.Set("/registry/services/specs/foo", runtime.EncodeOrDie(latest.Codec, &api.Service{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.CreateService(&api.Service{ err := registry.CreateService(ctx, &api.Service{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
}) })
if !errors.IsAlreadyExists(err) { if !errors.IsAlreadyExists(err) {
@ -726,10 +747,11 @@ func TestEtcdCreateServiceAlreadyExisting(t *testing.T) {
} }
func TestEtcdGetService(t *testing.T) { func TestEtcdGetService(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Set("/registry/services/specs/foo", runtime.EncodeOrDie(latest.Codec, &api.Service{JSONBase: api.JSONBase{ID: "foo"}}), 0) fakeClient.Set("/registry/services/specs/foo", runtime.EncodeOrDie(latest.Codec, &api.Service{JSONBase: api.JSONBase{ID: "foo"}}), 0)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
service, err := registry.GetService("foo") service, err := registry.GetService(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -740,6 +762,7 @@ func TestEtcdGetService(t *testing.T) {
} }
func TestEtcdGetServiceNotFound(t *testing.T) { func TestEtcdGetServiceNotFound(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.Data["/registry/services/specs/foo"] = tools.EtcdResponseWithError{ fakeClient.Data["/registry/services/specs/foo"] = tools.EtcdResponseWithError{
R: &etcd.Response{ R: &etcd.Response{
@ -748,16 +771,17 @@ func TestEtcdGetServiceNotFound(t *testing.T) {
E: tools.EtcdErrorNotFound, E: tools.EtcdErrorNotFound,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
_, err := registry.GetService("foo") _, err := registry.GetService(ctx, "foo")
if !errors.IsNotFound(err) { if !errors.IsNotFound(err) {
t.Errorf("Unexpected error returned: %#v", err) t.Errorf("Unexpected error returned: %#v", err)
} }
} }
func TestEtcdDeleteService(t *testing.T) { func TestEtcdDeleteService(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
err := registry.DeleteService("foo") err := registry.DeleteService(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -776,6 +800,7 @@ func TestEtcdDeleteService(t *testing.T) {
} }
func TestEtcdUpdateService(t *testing.T) { func TestEtcdUpdateService(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
@ -790,12 +815,12 @@ func TestEtcdUpdateService(t *testing.T) {
"baz": "bar", "baz": "bar",
}, },
} }
err := registry.UpdateService(&testService) err := registry.UpdateService(ctx, &testService)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
svc, err := registry.GetService("foo") svc, err := registry.GetService(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -809,6 +834,7 @@ func TestEtcdUpdateService(t *testing.T) {
} }
func TestEtcdListEndpoints(t *testing.T) { func TestEtcdListEndpoints(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
key := "/registry/services/endpoints" key := "/registry/services/endpoints"
fakeClient.Data[key] = tools.EtcdResponseWithError{ fakeClient.Data[key] = tools.EtcdResponseWithError{
@ -827,7 +853,7 @@ func TestEtcdListEndpoints(t *testing.T) {
E: nil, E: nil,
} }
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
services, err := registry.ListEndpoints() services, err := registry.ListEndpoints(ctx)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -838,6 +864,7 @@ func TestEtcdListEndpoints(t *testing.T) {
} }
func TestEtcdGetEndpoints(t *testing.T) { func TestEtcdGetEndpoints(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
endpoints := &api.Endpoints{ endpoints := &api.Endpoints{
@ -847,7 +874,7 @@ func TestEtcdGetEndpoints(t *testing.T) {
fakeClient.Set("/registry/services/endpoints/foo", runtime.EncodeOrDie(latest.Codec, endpoints), 0) fakeClient.Set("/registry/services/endpoints/foo", runtime.EncodeOrDie(latest.Codec, endpoints), 0)
got, err := registry.GetEndpoints("foo") got, err := registry.GetEndpoints(ctx, "foo")
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -858,6 +885,7 @@ func TestEtcdGetEndpoints(t *testing.T) {
} }
func TestEtcdUpdateEndpoints(t *testing.T) { func TestEtcdUpdateEndpoints(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
fakeClient.TestIndex = true fakeClient.TestIndex = true
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
@ -868,7 +896,7 @@ func TestEtcdUpdateEndpoints(t *testing.T) {
fakeClient.Set("/registry/services/endpoints/foo", runtime.EncodeOrDie(latest.Codec, &api.Endpoints{}), 0) fakeClient.Set("/registry/services/endpoints/foo", runtime.EncodeOrDie(latest.Codec, &api.Endpoints{}), 0)
err := registry.UpdateEndpoints(&endpoints) err := registry.UpdateEndpoints(ctx, &endpoints)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -885,9 +913,10 @@ func TestEtcdUpdateEndpoints(t *testing.T) {
} }
func TestEtcdWatchServices(t *testing.T) { func TestEtcdWatchServices(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
watching, err := registry.WatchServices( watching, err := registry.WatchServices(ctx,
labels.Everything(), labels.Everything(),
labels.SelectorFromSet(labels.Set{"ID": "foo"}), labels.SelectorFromSet(labels.Set{"ID": "foo"}),
1, 1,
@ -912,9 +941,11 @@ func TestEtcdWatchServices(t *testing.T) {
} }
func TestEtcdWatchServicesBadSelector(t *testing.T) { func TestEtcdWatchServicesBadSelector(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
_, err := registry.WatchServices( _, err := registry.WatchServices(
ctx,
labels.Everything(), labels.Everything(),
labels.SelectorFromSet(labels.Set{"Field.Selector": "foo"}), labels.SelectorFromSet(labels.Set{"Field.Selector": "foo"}),
0, 0,
@ -924,6 +955,7 @@ func TestEtcdWatchServicesBadSelector(t *testing.T) {
} }
_, err = registry.WatchServices( _, err = registry.WatchServices(
ctx,
labels.SelectorFromSet(labels.Set{"Label.Selector": "foo"}), labels.SelectorFromSet(labels.Set{"Label.Selector": "foo"}),
labels.Everything(), labels.Everything(),
0, 0,
@ -934,9 +966,11 @@ func TestEtcdWatchServicesBadSelector(t *testing.T) {
} }
func TestEtcdWatchEndpoints(t *testing.T) { func TestEtcdWatchEndpoints(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
watching, err := registry.WatchEndpoints( watching, err := registry.WatchEndpoints(
ctx,
labels.Everything(), labels.Everything(),
labels.SelectorFromSet(labels.Set{"ID": "foo"}), labels.SelectorFromSet(labels.Set{"ID": "foo"}),
1, 1,
@ -961,9 +995,11 @@ func TestEtcdWatchEndpoints(t *testing.T) {
} }
func TestEtcdWatchEndpointsBadSelector(t *testing.T) { func TestEtcdWatchEndpointsBadSelector(t *testing.T) {
ctx := api.NewContext()
fakeClient := tools.NewFakeEtcdClient(t) fakeClient := tools.NewFakeEtcdClient(t)
registry := NewTestEtcdRegistry(fakeClient) registry := NewTestEtcdRegistry(fakeClient)
_, err := registry.WatchEndpoints( _, err := registry.WatchEndpoints(
ctx,
labels.Everything(), labels.Everything(),
labels.SelectorFromSet(labels.Set{"Field.Selector": "foo"}), labels.SelectorFromSet(labels.Set{"Field.Selector": "foo"}),
0, 0,
@ -973,6 +1009,7 @@ func TestEtcdWatchEndpointsBadSelector(t *testing.T) {
} }
_, err = registry.WatchEndpoints( _, err = registry.WatchEndpoints(
ctx,
labels.SelectorFromSet(labels.Set{"Label.Selector": "foo"}), labels.SelectorFromSet(labels.Set{"Label.Selector": "foo"}),
labels.Everything(), labels.Everything(),
0, 0,

12
pkg/registry/registrytest/controller.go
View File

@ -27,26 +27,26 @@ type ControllerRegistry struct {
Controllers *api.ReplicationControllerList Controllers *api.ReplicationControllerList
} }
func (r *ControllerRegistry) ListControllers() (*api.ReplicationControllerList, error) { func (r *ControllerRegistry) ListControllers(ctx api.Context) (*api.ReplicationControllerList, error) {
return r.Controllers, r.Err return r.Controllers, r.Err
} }
func (r *ControllerRegistry) GetController(ID string) (*api.ReplicationController, error) { func (r *ControllerRegistry) GetController(ctx api.Context, ID string) (*api.ReplicationController, error) {
return &api.ReplicationController{}, r.Err return &api.ReplicationController{}, r.Err
} }
func (r *ControllerRegistry) CreateController(controller *api.ReplicationController) error { func (r *ControllerRegistry) CreateController(ctx api.Context, controller *api.ReplicationController) error {
return r.Err return r.Err
} }
func (r *ControllerRegistry) UpdateController(controller *api.ReplicationController) error { func (r *ControllerRegistry) UpdateController(ctx api.Context, controller *api.ReplicationController) error {
return r.Err return r.Err
} }
func (r *ControllerRegistry) DeleteController(ID string) error { func (r *ControllerRegistry) DeleteController(ctx api.Context, ID string) error {
return r.Err return r.Err
} }
func (r *ControllerRegistry) WatchControllers(resourceVersion uint64) (watch.Interface, error) { func (r *ControllerRegistry) WatchControllers(ctx api.Context, resourceVersion uint64) (watch.Interface, error) {
return nil, r.Err return nil, r.Err
} }

14
pkg/registry/registrytest/pod.go
View File

@ -40,7 +40,7 @@ func NewPodRegistry(pods *api.PodList) *PodRegistry {
} }
} }
func (r *PodRegistry) ListPodsPredicate(filter func(*api.Pod) bool) (*api.PodList, error) { func (r *PodRegistry) ListPodsPredicate(ctx api.Context, filter func(*api.Pod) bool) (*api.PodList, error) {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
if r.Err != nil { if r.Err != nil {
@ -58,23 +58,23 @@ func (r *PodRegistry) ListPodsPredicate(filter func(*api.Pod) bool) (*api.PodLis
} }
func (r *PodRegistry) ListPods(ctx api.Context, selector labels.Selector) (*api.PodList, error) { func (r *PodRegistry) ListPods(ctx api.Context, selector labels.Selector) (*api.PodList, error) {
return r.ListPodsPredicate(func(pod *api.Pod) bool { return r.ListPodsPredicate(ctx, func(pod *api.Pod) bool {
return selector.Matches(labels.Set(pod.Labels)) return selector.Matches(labels.Set(pod.Labels))
}) })
} }
func (r *PodRegistry) WatchPods(resourceVersion uint64, filter func(*api.Pod) bool) (watch.Interface, error) { func (r *PodRegistry) WatchPods(ctx api.Context, resourceVersion uint64, filter func(*api.Pod) bool) (watch.Interface, error) {
// TODO: wire filter down into the mux; it needs access to current and previous state :( // TODO: wire filter down into the mux; it needs access to current and previous state :(
return r.mux.Watch(), nil return r.mux.Watch(), nil
} }
func (r *PodRegistry) GetPod(podId string) (*api.Pod, error) { func (r *PodRegistry) GetPod(ctx api.Context, podId string) (*api.Pod, error) {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
return r.Pod, r.Err return r.Pod, r.Err
} }
func (r *PodRegistry) CreatePod(pod *api.Pod) error { func (r *PodRegistry) CreatePod(ctx api.Context, pod *api.Pod) error {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
r.Pod = pod r.Pod = pod
@ -82,7 +82,7 @@ func (r *PodRegistry) CreatePod(pod *api.Pod) error {
return r.Err return r.Err
} }
func (r *PodRegistry) UpdatePod(pod *api.Pod) error { func (r *PodRegistry) UpdatePod(ctx api.Context, pod *api.Pod) error {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
r.Pod = pod r.Pod = pod
@ -90,7 +90,7 @@ func (r *PodRegistry) UpdatePod(pod *api.Pod) error {
return r.Err return r.Err
} }
func (r *PodRegistry) DeletePod(podId string) error { func (r *PodRegistry) DeletePod(ctx api.Context, podId string) error {
r.Lock() r.Lock()
defer r.Unlock() defer r.Unlock()
r.mux.Action(watch.Deleted, r.Pod) r.mux.Action(watch.Deleted, r.Pod)

20
pkg/registry/registrytest/service.go
View File

@ -38,49 +38,49 @@ type ServiceRegistry struct {
UpdatedID string UpdatedID string
} }
func (r *ServiceRegistry) ListServices() (*api.ServiceList, error) { func (r *ServiceRegistry) ListServices(ctx api.Context) (*api.ServiceList, error) {
return &r.List, r.Err return &r.List, r.Err
} }
func (r *ServiceRegistry) CreateService(svc *api.Service) error { func (r *ServiceRegistry) CreateService(ctx api.Context, svc *api.Service) error {
r.Service = svc r.Service = svc
r.List.Items = append(r.List.Items, *svc) r.List.Items = append(r.List.Items, *svc)
return r.Err return r.Err
} }
func (r *ServiceRegistry) GetService(id string) (*api.Service, error) { func (r *ServiceRegistry) GetService(ctx api.Context, id string) (*api.Service, error) {
r.GottenID = id r.GottenID = id
return r.Service, r.Err return r.Service, r.Err
} }
func (r *ServiceRegistry) DeleteService(id string) error { func (r *ServiceRegistry) DeleteService(ctx api.Context, id string) error {
r.DeletedID = id r.DeletedID = id
return r.Err return r.Err
} }
func (r *ServiceRegistry) UpdateService(svc *api.Service) error { func (r *ServiceRegistry) UpdateService(ctx api.Context, svc *api.Service) error {
r.UpdatedID = svc.ID r.UpdatedID = svc.ID
return r.Err return r.Err
} }
func (r *ServiceRegistry) WatchServices(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) { func (r *ServiceRegistry) WatchServices(ctx api.Context, label labels.Selector, field labels.Selector, resourceVersion uint64) (watch.Interface, error) {
return nil, r.Err return nil, r.Err
} }
func (r *ServiceRegistry) ListEndpoints() (*api.EndpointsList, error) { func (r *ServiceRegistry) ListEndpoints(ctx api.Context) (*api.EndpointsList, error) {
return &r.EndpointsList, r.Err return &r.EndpointsList, r.Err
} }
func (r *ServiceRegistry) GetEndpoints(id string) (*api.Endpoints, error) { func (r *ServiceRegistry) GetEndpoints(ctx api.Context, id string) (*api.Endpoints, error) {
r.GottenID = id r.GottenID = id
return &r.Endpoints, r.Err return &r.Endpoints, r.Err
} }
func (r *ServiceRegistry) UpdateEndpoints(e *api.Endpoints) error { func (r *ServiceRegistry) UpdateEndpoints(ctx api.Context, e *api.Endpoints) error {
r.Endpoints = *e r.Endpoints = *e
return r.Err return r.Err
} }
func (r *ServiceRegistry) WatchEndpoints(label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) { func (r *ServiceRegistry) WatchEndpoints(ctx api.Context, label, field labels.Selector, resourceVersion uint64) (watch.Interface, error) {
return nil, r.Err return nil, r.Err
} }

39
pkg/registry/service/rest_test.go
View File

@ -53,7 +53,7 @@ func TestServiceRegistryCreate(t *testing.T) {
if len(fakeCloud.Calls) != 0 { if len(fakeCloud.Calls) != 0 {
t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls) t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls)
} }
srv, err := registry.GetService(svc.ID) srv, err := registry.GetService(ctx, svc.ID)
if err != nil { if err != nil {
t.Errorf("unexpected error: %v", err) t.Errorf("unexpected error: %v", err)
} }
@ -90,14 +90,14 @@ func TestServiceStorageValidatesCreate(t *testing.T) {
} }
func TestServiceRegistryUpdate(t *testing.T) { func TestServiceRegistryUpdate(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
registry.CreateService(&api.Service{ registry.CreateService(ctx, &api.Service{
Port: 6502, Port: 6502,
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz1"}, Selector: map[string]string{"bar": "baz1"},
}) })
storage := NewREST(registry, nil, nil) storage := NewREST(registry, nil, nil)
ctx := api.NewContext()
c, err := storage.Update(ctx, &api.Service{ c, err := storage.Update(ctx, &api.Service{
Port: 6502, Port: 6502,
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
@ -120,8 +120,9 @@ func TestServiceRegistryUpdate(t *testing.T) {
} }
func TestServiceStorageValidatesUpdate(t *testing.T) { func TestServiceStorageValidatesUpdate(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
registry.CreateService(&api.Service{ registry.CreateService(ctx, &api.Service{
Port: 6502, Port: 6502,
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
@ -139,7 +140,6 @@ func TestServiceStorageValidatesUpdate(t *testing.T) {
Selector: map[string]string{}, Selector: map[string]string{},
}, },
} }
ctx := api.NewContext()
for _, failureCase := range failureCases { for _, failureCase := range failureCases {
c, err := storage.Update(ctx, &failureCase) c, err := storage.Update(ctx, &failureCase)
if c != nil { if c != nil {
@ -152,6 +152,7 @@ func TestServiceStorageValidatesUpdate(t *testing.T) {
} }
func TestServiceRegistryExternalService(t *testing.T) { func TestServiceRegistryExternalService(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
@ -162,13 +163,12 @@ func TestServiceRegistryExternalService(t *testing.T) {
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
CreateExternalLoadBalancer: true, CreateExternalLoadBalancer: true,
} }
ctx := api.NewContext()
c, _ := storage.Create(ctx, svc) c, _ := storage.Create(ctx, svc)
<-c <-c
if len(fakeCloud.Calls) != 2 || fakeCloud.Calls[0] != "get-zone" || fakeCloud.Calls[1] != "create" { if len(fakeCloud.Calls) != 2 || fakeCloud.Calls[0] != "get-zone" || fakeCloud.Calls[1] != "create" {
t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls) t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls)
} }
srv, err := registry.GetService(svc.ID) srv, err := registry.GetService(ctx, svc.ID)
if err != nil { if err != nil {
t.Errorf("Unexpected error: %v", err) t.Errorf("Unexpected error: %v", err)
} }
@ -202,6 +202,7 @@ func TestServiceRegistryExternalServiceError(t *testing.T) {
} }
func TestServiceRegistryDelete(t *testing.T) { func TestServiceRegistryDelete(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
@ -210,8 +211,7 @@ func TestServiceRegistryDelete(t *testing.T) {
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
} }
ctx := api.NewContext() registry.CreateService(ctx, svc)
registry.CreateService(svc)
c, _ := storage.Delete(ctx, svc.ID) c, _ := storage.Delete(ctx, svc.ID)
<-c <-c
if len(fakeCloud.Calls) != 0 { if len(fakeCloud.Calls) != 0 {
@ -223,6 +223,7 @@ func TestServiceRegistryDelete(t *testing.T) {
} }
func TestServiceRegistryDeleteExternal(t *testing.T) { func TestServiceRegistryDeleteExternal(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
@ -232,8 +233,7 @@ func TestServiceRegistryDeleteExternal(t *testing.T) {
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
CreateExternalLoadBalancer: true, CreateExternalLoadBalancer: true,
} }
ctx := api.NewContext() registry.CreateService(ctx, svc)
registry.CreateService(svc)
c, _ := storage.Delete(ctx, svc.ID) c, _ := storage.Delete(ctx, svc.ID)
<-c <-c
if len(fakeCloud.Calls) != 2 || fakeCloud.Calls[0] != "get-zone" || fakeCloud.Calls[1] != "delete" { if len(fakeCloud.Calls) != 2 || fakeCloud.Calls[0] != "get-zone" || fakeCloud.Calls[1] != "delete" {
@ -245,6 +245,7 @@ func TestServiceRegistryDeleteExternal(t *testing.T) {
} }
func TestServiceRegistryMakeLinkVariables(t *testing.T) { func TestServiceRegistryMakeLinkVariables(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
registry.List = api.ServiceList{ registry.List = api.ServiceList{
Items: []api.Service{ Items: []api.Service{
@ -269,7 +270,7 @@ func TestServiceRegistryMakeLinkVariables(t *testing.T) {
}, },
} }
machine := "machine" machine := "machine"
vars, err := GetServiceEnvironmentVariables(registry, machine) vars, err := GetServiceEnvironmentVariables(ctx, registry, machine)
if err != nil { if err != nil {
t.Errorf("Unexpected err: %v", err) t.Errorf("Unexpected err: %v", err)
} }
@ -309,15 +310,15 @@ func TestServiceRegistryMakeLinkVariables(t *testing.T) {
} }
func TestServiceRegistryGet(t *testing.T) { func TestServiceRegistryGet(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines)) storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines))
registry.CreateService(&api.Service{ registry.CreateService(ctx, &api.Service{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
}) })
ctx := api.NewContext()
storage.Get(ctx, "foo") storage.Get(ctx, "foo")
if len(fakeCloud.Calls) != 0 { if len(fakeCloud.Calls) != 0 {
t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls) t.Errorf("Unexpected call(s): %#v", fakeCloud.Calls)
@ -328,13 +329,13 @@ func TestServiceRegistryGet(t *testing.T) {
} }
func TestServiceRegistryResourceLocation(t *testing.T) { func TestServiceRegistryResourceLocation(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
registry.Endpoints = api.Endpoints{Endpoints: []string{"foo:80"}} registry.Endpoints = api.Endpoints{Endpoints: []string{"foo:80"}}
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines)) storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines))
ctx := api.NewContext() registry.CreateService(ctx, &api.Service{
registry.CreateService(&api.Service{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
}) })
@ -358,20 +359,20 @@ func TestServiceRegistryResourceLocation(t *testing.T) {
} }
func TestServiceRegistryList(t *testing.T) { func TestServiceRegistryList(t *testing.T) {
ctx := api.NewContext()
registry := registrytest.NewServiceRegistry() registry := registrytest.NewServiceRegistry()
fakeCloud := &cloud.FakeCloud{} fakeCloud := &cloud.FakeCloud{}
machines := []string{"foo", "bar", "baz"} machines := []string{"foo", "bar", "baz"}
storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines)) storage := NewREST(registry, fakeCloud, minion.NewRegistry(machines))
registry.CreateService(&api.Service{ registry.CreateService(ctx, &api.Service{
JSONBase: api.JSONBase{ID: "foo"}, JSONBase: api.JSONBase{ID: "foo"},
Selector: map[string]string{"bar": "baz"}, Selector: map[string]string{"bar": "baz"},
}) })
registry.CreateService(&api.Service{ registry.CreateService(ctx, &api.Service{
JSONBase: api.JSONBase{ID: "foo2"}, JSONBase: api.JSONBase{ID: "foo2"},
Selector: map[string]string{"bar2": "baz2"}, Selector: map[string]string{"bar2": "baz2"},
}) })
registry.List.ResourceVersion = 1 registry.List.ResourceVersion = 1
ctx := api.NewContext()
s, _ := storage.List(ctx, labels.Everything(), labels.Everything()) s, _ := storage.List(ctx, labels.Everything(), labels.Everything())
sl := s.(*api.ServiceList) sl := s.(*api.ServiceList)
if len(fakeCloud.Calls) != 0 { if len(fakeCloud.Calls) != 0 {