Move CIDR allocation logic away from nodecontroller.go

pkg/controller/node/nodecontroller_test.go

@@ -17,24 +17,19 @@ limitations under the License.
 package node
 
 import (
-	"errors"
-	"sync"
 	"testing"
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
-	apierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/unversioned"
 	"k8s.io/kubernetes/pkg/apis/extensions"
 	"k8s.io/kubernetes/pkg/client/cache"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/fake"
-	unversionedcore "k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset/typed/core/unversioned"
 	fakecloud "k8s.io/kubernetes/pkg/cloudprovider/providers/fake"
 	"k8s.io/kubernetes/pkg/util/diff"
 	"k8s.io/kubernetes/pkg/util/flowcontrol"
 	"k8s.io/kubernetes/pkg/util/wait"
-	"k8s.io/kubernetes/pkg/watch"
 )
 
 const (
@@ -43,133 +38,6 @@ const (
 	testNodeMonitorPeriod      = 5 * time.Second
 )
 
-// FakeNodeHandler is a fake implementation of NodesInterface and NodeInterface. It
-// allows test cases to have fine-grained control over mock behaviors. We also need
-// PodsInterface and PodInterface to test list & delet pods, which is implemented in
-// the embedded client.Fake field.
-type FakeNodeHandler struct {
-	*fake.Clientset
-
-	// Input: Hooks determine if request is valid or not
-	CreateHook func(*FakeNodeHandler, *api.Node) bool
-	Existing   []*api.Node
-
-	// Output
-	CreatedNodes        []*api.Node
-	DeletedNodes        []*api.Node
-	UpdatedNodes        []*api.Node
-	UpdatedNodeStatuses []*api.Node
-	RequestCount        int
-
-	// Synchronization
-	createLock     sync.Mutex
-	deleteWaitChan chan struct{}
-}
-
-type FakeLegacyHandler struct {
-	unversionedcore.CoreInterface
-	n *FakeNodeHandler
-}
-
-func (c *FakeNodeHandler) Core() unversionedcore.CoreInterface {
-	return &FakeLegacyHandler{c.Clientset.Core(), c}
-}
-
-func (m *FakeLegacyHandler) Nodes() unversionedcore.NodeInterface {
-	return m.n
-}
-
-func (m *FakeNodeHandler) Create(node *api.Node) (*api.Node, error) {
-	m.createLock.Lock()
-	defer func() {
-		m.RequestCount++
-		m.createLock.Unlock()
-	}()
-	for _, n := range m.Existing {
-		if n.Name == node.Name {
-			return nil, apierrors.NewAlreadyExists(api.Resource("nodes"), node.Name)
-		}
-	}
-	if m.CreateHook == nil || m.CreateHook(m, node) {
-		nodeCopy := *node
-		m.CreatedNodes = append(m.CreatedNodes, &nodeCopy)
-		return node, nil
-	} else {
-		return nil, errors.New("Create error.")
-	}
-}
-
-func (m *FakeNodeHandler) Get(name string) (*api.Node, error) {
-	return nil, nil
-}
-
-func (m *FakeNodeHandler) List(opts api.ListOptions) (*api.NodeList, error) {
-	defer func() { m.RequestCount++ }()
-	var nodes []*api.Node
-	for i := 0; i < len(m.UpdatedNodes); i++ {
-		if !contains(m.UpdatedNodes[i], m.DeletedNodes) {
-			nodes = append(nodes, m.UpdatedNodes[i])
-		}
-	}
-	for i := 0; i < len(m.Existing); i++ {
-		if !contains(m.Existing[i], m.DeletedNodes) && !contains(m.Existing[i], nodes) {
-			nodes = append(nodes, m.Existing[i])
-		}
-	}
-	for i := 0; i < len(m.CreatedNodes); i++ {
-		if !contains(m.Existing[i], m.DeletedNodes) && !contains(m.CreatedNodes[i], nodes) {
-			nodes = append(nodes, m.CreatedNodes[i])
-		}
-	}
-	nodeList := &api.NodeList{}
-	for _, node := range nodes {
-		nodeList.Items = append(nodeList.Items, *node)
-	}
-	return nodeList, nil
-}
-
-func (m *FakeNodeHandler) Delete(id string, opt *api.DeleteOptions) error {
-	defer func() {
-		if m.deleteWaitChan != nil {
-			m.deleteWaitChan <- struct{}{}
-		}
-	}()
-	m.DeletedNodes = append(m.DeletedNodes, newNode(id))
-	m.RequestCount++
-	return nil
-}
-
-func (m *FakeNodeHandler) DeleteCollection(opt *api.DeleteOptions, listOpts api.ListOptions) error {
-	return nil
-}
-
-func (m *FakeNodeHandler) Update(node *api.Node) (*api.Node, error) {
-	nodeCopy := *node
-	m.UpdatedNodes = append(m.UpdatedNodes, &nodeCopy)
-	m.RequestCount++
-	return node, nil
-}
-
-func (m *FakeNodeHandler) UpdateStatus(node *api.Node) (*api.Node, error) {
-	nodeCopy := *node
-	m.UpdatedNodeStatuses = append(m.UpdatedNodeStatuses, &nodeCopy)
-	m.RequestCount++
-	return node, nil
-}
-
-func (m *FakeNodeHandler) PatchStatus(nodeName string, data []byte) (*api.Node, error) {
-	m.RequestCount++
-	return &api.Node{}, nil
-}
-
-func (m *FakeNodeHandler) Watch(opts api.ListOptions) (watch.Interface, error) {
-	return nil, nil
-}
-
-func (m *FakeNodeHandler) Patch(name string, pt api.PatchType, data []byte) (*api.Node, error) {
-	return nil, nil
-}
-
 func TestMonitorNodeStatusEvictPods(t *testing.T) {
 	fakeNow := unversioned.Date(2015, 1, 1, 12, 0, 0, 0, time.UTC)
 	evictionTimeout := 10 * time.Minute
@@ -1409,49 +1277,3 @@ func TestCleanupOrphanedPods(t *testing.T) {
 		t.Fatalf("expected deleted pod name to be 'c', but got: %q", deletedPodName)
 	}
 }
-
-func newNode(name string) *api.Node {
-	return &api.Node{
-		ObjectMeta: api.ObjectMeta{Name: name},
-		Spec: api.NodeSpec{
-			ExternalID: name,
-		},
-		Status: api.NodeStatus{
-			Capacity: api.ResourceList{
-				api.ResourceName(api.ResourceCPU):    resource.MustParse("10"),
-				api.ResourceName(api.ResourceMemory): resource.MustParse("10G"),
-			},
-		},
-	}
-}
-
-func newPod(name, host string) *api.Pod {
-	pod := &api.Pod{
-		ObjectMeta: api.ObjectMeta{
-			Namespace: "default",
-			Name:      name,
-		},
-		Spec: api.PodSpec{
-			NodeName: host,
-		},
-		Status: api.PodStatus{
-			Conditions: []api.PodCondition{
-				{
-					Type:   api.PodReady,
-					Status: api.ConditionTrue,
-				},
-			},
-		},
-	}
-
-	return pod
-}
-
-func contains(node *api.Node, nodes []*api.Node) bool {
-	for i := 0; i < len(nodes); i++ {
-		if node.Name == nodes[i].Name {
-			return true
-		}
-	}
-	return false
-}