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

Merge pull request #5008 from ddysher/external-id

Browse Source 
Move Node.ExternalID to CloudNodes()
This commit is contained in:
Eric Tune
2015-03-04 12:30:38 -08:00
parent f205c983cf 53e17f0fa5
commit 0059c39211
2 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/cloudprovider/controller/nodecontroller_test.go
View File

@@ -254,7 +254,7 @@ func TestRegisterNodes(t *testing.T) {
}
}
func TestCreateStaticNodes(t *testing.T) {
func TestCreateGetStaticNodesWithSpec(t *testing.T) {
table := []struct {
machines []string
expectedNodes *api.NodeList
@@ -296,7 +296,7 @@ func TestCreateStaticNodes(t *testing.T) {
for _, item := range table {
nodeController := NewNodeController(nil, "", item.machines, &api.NodeResources{}, nil, nil, 10, time.Minute)
nodes, err := nodeController.StaticNodes()
nodes, err := nodeController.GetStaticNodesWithSpec()
if err != nil {
t.Errorf("unexpected error: %v", err)
}
@@ -306,7 +306,7 @@ func TestCreateStaticNodes(t *testing.T) {
}
}
func TestCreateCloudNodes(t *testing.T) {
func TestCreateGetCloudNodesWithSpec(t *testing.T) {
resourceList := api.ResourceList{
api.ResourceCPU: *resource.NewMilliQuantity(1000, resource.DecimalSI),
api.ResourceMemory: *resource.NewQuantity(3000, resource.DecimalSI),
@@ -357,7 +357,7 @@ func TestCreateCloudNodes(t *testing.T) {
for _, item := range table {
nodeController := NewNodeController(item.fakeCloud, ".*", nil, &api.NodeResources{}, nil, nil, 10, time.Minute)
nodes, err := nodeController.CloudNodes()
nodes, err := nodeController.GetCloudNodesWithSpec()
if err != nil {
t.Errorf("unexpected error: %v", err)
}