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

pkg/util

Browse Source
This commit is contained in:
Chao Xu
2016-11-18 13:31:44 -08:00
parent d0a725a522
commit 31ed340eec
8 changed files with 99 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pkg/util/node/node_test.go
View File

@@ -19,15 +19,15 @@ package node
import (
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
)
func TestGetPreferredAddress(t *testing.T) {
testcases := map[string]struct {
Labels map[string]string
Addresses []api.NodeAddress
Preferences []api.NodeAddressType
Addresses []v1.NodeAddress
Preferences []v1.NodeAddressType
ExpectErr string
ExpectAddress string
@@ -36,44 +36,44 @@ func TestGetPreferredAddress(t *testing.T) {
ExpectErr: "no preferred addresses found; known addresses: []",
},
"missing address": {
Addresses: []api.NodeAddress{
{Type: api.NodeInternalIP, Address: "1.2.3.4"},
Addresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "1.2.3.4"},
},
Preferences: []api.NodeAddressType{api.NodeHostName},
Preferences: []v1.NodeAddressType{v1.NodeHostName},
ExpectErr: "no preferred addresses found; known addresses: [{InternalIP 1.2.3.4}]",
},
"found address": {
Addresses: []api.NodeAddress{
{Type: api.NodeInternalIP, Address: "1.2.3.4"},
{Type: api.NodeExternalIP, Address: "1.2.3.5"},
{Type: api.NodeExternalIP, Address: "1.2.3.7"},
Addresses: []v1.NodeAddress{
{Type: v1.NodeInternalIP, Address: "1.2.3.4"},
{Type: v1.NodeExternalIP, Address: "1.2.3.5"},
{Type: v1.NodeExternalIP, Address: "1.2.3.7"},
},
Preferences: []api.NodeAddressType{api.NodeHostName, api.NodeExternalIP},
Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP},
ExpectAddress: "1.2.3.5",
},
"found hostname address": {
Labels: map[string]string{unversioned.LabelHostname: "label-hostname"},
Addresses: []api.NodeAddress{
{Type: api.NodeExternalIP, Address: "1.2.3.5"},
{Type: api.NodeHostName, Address: "status-hostname"},
Addresses: []v1.NodeAddress{
{Type: v1.NodeExternalIP, Address: "1.2.3.5"},
{Type: v1.NodeHostName, Address: "status-hostname"},
},
Preferences: []api.NodeAddressType{api.NodeHostName, api.NodeExternalIP},
Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP},
ExpectAddress: "status-hostname",
},
"found label address": {
Labels: map[string]string{unversioned.LabelHostname: "label-hostname"},
Addresses: []api.NodeAddress{
{Type: api.NodeExternalIP, Address: "1.2.3.5"},
Addresses: []v1.NodeAddress{
{Type: v1.NodeExternalIP, Address: "1.2.3.5"},
},
Preferences: []api.NodeAddressType{api.NodeHostName, api.NodeExternalIP},
Preferences: []v1.NodeAddressType{v1.NodeHostName, v1.NodeExternalIP},
ExpectAddress: "label-hostname",
},
}
for k, tc := range testcases {
node := &api.Node{
ObjectMeta: api.ObjectMeta{Labels: tc.Labels},
Status: api.NodeStatus{Addresses: tc.Addresses},
node := &v1.Node{
ObjectMeta: v1.ObjectMeta{Labels: tc.Labels},
Status: v1.NodeStatus{Addresses: tc.Addresses},
}
address, err := GetPreferredNodeAddress(node, tc.Preferences)
errString := ""