
Currently all registry implementations live in a single package, which makes it bit harder to maintain. The different registry implementations do not follow the same coding style and naming conventions, which makes the code harder to read. Breakup the registry package into smaller packages based on the registry implementation. Refactor the registry packages to follow a similar coding style and naming convention. This patch does not introduce any changes in behavior.
329 lines
7.7 KiB
Go
329 lines
7.7 KiB
Go
/*
|
|
Copyright 2014 Google Inc. All rights reserved.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package controller
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"reflect"
|
|
"testing"
|
|
"time"
|
|
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
|
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/registry/registrytest"
|
|
)
|
|
|
|
func TestListControllersError(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{
|
|
Err: fmt.Errorf("test error"),
|
|
}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
}
|
|
controllersObj, err := storage.List(nil)
|
|
controllers := controllersObj.(api.ReplicationControllerList)
|
|
if err != mockRegistry.Err {
|
|
t.Errorf("Expected %#v, Got %#v", mockRegistry.Err, err)
|
|
}
|
|
if len(controllers.Items) != 0 {
|
|
t.Errorf("Unexpected non-zero ctrl list: %#v", controllers)
|
|
}
|
|
}
|
|
|
|
func TestListEmptyControllerList(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
}
|
|
controllers, err := storage.List(labels.Everything())
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if len(controllers.(api.ReplicationControllerList).Items) != 0 {
|
|
t.Errorf("Unexpected non-zero ctrl list: %#v", controllers)
|
|
}
|
|
}
|
|
|
|
func TestListControllerList(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{
|
|
Controllers: []api.ReplicationController{
|
|
{
|
|
JSONBase: api.JSONBase{
|
|
ID: "foo",
|
|
},
|
|
},
|
|
{
|
|
JSONBase: api.JSONBase{
|
|
ID: "bar",
|
|
},
|
|
},
|
|
},
|
|
}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
}
|
|
controllersObj, err := storage.List(labels.Everything())
|
|
controllers := controllersObj.(api.ReplicationControllerList)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if len(controllers.Items) != 2 {
|
|
t.Errorf("Unexpected controller list: %#v", controllers)
|
|
}
|
|
if controllers.Items[0].ID != "foo" {
|
|
t.Errorf("Unexpected controller: %#v", controllers.Items[0])
|
|
}
|
|
if controllers.Items[1].ID != "bar" {
|
|
t.Errorf("Unexpected controller: %#v", controllers.Items[1])
|
|
}
|
|
}
|
|
|
|
func TestControllerDecode(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
}
|
|
controller := &api.ReplicationController{
|
|
JSONBase: api.JSONBase{
|
|
ID: "foo",
|
|
},
|
|
}
|
|
body, err := api.Encode(controller)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
controllerOut := storage.New()
|
|
if err := api.DecodeInto(body, controllerOut); err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(controller, controllerOut) {
|
|
t.Errorf("Expected %#v, found %#v", controller, controllerOut)
|
|
}
|
|
}
|
|
|
|
func TestControllerParsing(t *testing.T) {
|
|
expectedController := api.ReplicationController{
|
|
JSONBase: api.JSONBase{
|
|
ID: "nginxController",
|
|
},
|
|
DesiredState: api.ReplicationControllerState{
|
|
Replicas: 2,
|
|
ReplicaSelector: map[string]string{
|
|
"name": "nginx",
|
|
},
|
|
PodTemplate: api.PodTemplate{
|
|
DesiredState: api.PodState{
|
|
Manifest: api.ContainerManifest{
|
|
Containers: []api.Container{
|
|
{
|
|
Image: "dockerfile/nginx",
|
|
Ports: []api.Port{
|
|
{
|
|
ContainerPort: 80,
|
|
HostPort: 8080,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
Labels: map[string]string{
|
|
"name": "nginx",
|
|
},
|
|
},
|
|
},
|
|
Labels: map[string]string{
|
|
"name": "nginx",
|
|
},
|
|
}
|
|
file, err := ioutil.TempFile("", "controller")
|
|
fileName := file.Name()
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
data, err := json.Marshal(expectedController)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
_, err = file.Write(data)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
err = file.Close()
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
data, err = ioutil.ReadFile(fileName)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
var controller api.ReplicationController
|
|
err = json.Unmarshal(data, &controller)
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
if !reflect.DeepEqual(controller, expectedController) {
|
|
t.Errorf("Parsing failed: %s %#v %#v", string(data), controller, expectedController)
|
|
}
|
|
}
|
|
|
|
var validPodTemplate = api.PodTemplate{
|
|
DesiredState: api.PodState{
|
|
Manifest: api.ContainerManifest{
|
|
Version: "v1beta1",
|
|
Containers: []api.Container{
|
|
{
|
|
Name: "test",
|
|
Image: "test_image",
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
|
|
func TestCreateController(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{}
|
|
mockPodRegistry := registrytest.PodRegistry{
|
|
Pods: []api.Pod{
|
|
{
|
|
JSONBase: api.JSONBase{ID: "foo"},
|
|
Labels: map[string]string{"a": "b"},
|
|
},
|
|
},
|
|
}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
podRegistry: &mockPodRegistry,
|
|
pollPeriod: time.Millisecond * 1,
|
|
}
|
|
controller := &api.ReplicationController{
|
|
JSONBase: api.JSONBase{ID: "test"},
|
|
DesiredState: api.ReplicationControllerState{
|
|
Replicas: 2,
|
|
ReplicaSelector: map[string]string{"a": "b"},
|
|
PodTemplate: validPodTemplate,
|
|
},
|
|
}
|
|
channel, err := storage.Create(controller)
|
|
if err != nil {
|
|
t.Fatalf("Unexpected error: %v", err)
|
|
}
|
|
if err != nil {
|
|
t.Errorf("unexpected error: %v", err)
|
|
}
|
|
|
|
select {
|
|
case <-time.After(time.Millisecond * 100):
|
|
// Do nothing, this is expected.
|
|
case <-channel:
|
|
t.Error("Unexpected read from async channel")
|
|
}
|
|
|
|
mockPodRegistry.Lock()
|
|
mockPodRegistry.Pods = []api.Pod{
|
|
{
|
|
JSONBase: api.JSONBase{ID: "foo"},
|
|
Labels: map[string]string{"a": "b"},
|
|
},
|
|
{
|
|
JSONBase: api.JSONBase{ID: "bar"},
|
|
Labels: map[string]string{"a": "b"},
|
|
},
|
|
}
|
|
mockPodRegistry.Unlock()
|
|
|
|
select {
|
|
case <-time.After(time.Second * 1):
|
|
t.Error("Unexpected timeout")
|
|
case <-channel:
|
|
// Do nothing, this is expected
|
|
}
|
|
}
|
|
|
|
func TestControllerStorageValidatesCreate(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
podRegistry: nil,
|
|
pollPeriod: time.Millisecond * 1,
|
|
}
|
|
|
|
failureCases := map[string]api.ReplicationController{
|
|
"empty ID": {
|
|
JSONBase: api.JSONBase{ID: ""},
|
|
DesiredState: api.ReplicationControllerState{
|
|
ReplicaSelector: map[string]string{"bar": "baz"},
|
|
},
|
|
},
|
|
"empty selector": {
|
|
JSONBase: api.JSONBase{ID: "abc"},
|
|
DesiredState: api.ReplicationControllerState{},
|
|
},
|
|
}
|
|
for _, failureCase := range failureCases {
|
|
c, err := storage.Create(&failureCase)
|
|
if c != nil {
|
|
t.Errorf("Expected nil channel")
|
|
}
|
|
if err == nil {
|
|
t.Errorf("Expected to get an error")
|
|
}
|
|
}
|
|
}
|
|
|
|
func TestControllerStorageValidatesUpdate(t *testing.T) {
|
|
mockRegistry := registrytest.ControllerRegistry{}
|
|
storage := RegistryStorage{
|
|
registry: &mockRegistry,
|
|
podRegistry: nil,
|
|
pollPeriod: time.Millisecond * 1,
|
|
}
|
|
failureCases := map[string]api.ReplicationController{
|
|
"empty ID": {
|
|
JSONBase: api.JSONBase{ID: ""},
|
|
DesiredState: api.ReplicationControllerState{
|
|
ReplicaSelector: map[string]string{"bar": "baz"},
|
|
},
|
|
},
|
|
"empty selector": {
|
|
JSONBase: api.JSONBase{ID: "abc"},
|
|
DesiredState: api.ReplicationControllerState{},
|
|
},
|
|
}
|
|
for _, failureCase := range failureCases {
|
|
c, err := storage.Update(&failureCase)
|
|
if c != nil {
|
|
t.Errorf("Expected nil channel")
|
|
}
|
|
if err == nil {
|
|
t.Errorf("Expected to get an error")
|
|
}
|
|
}
|
|
}
|