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

refactor aws nodeAddresses tests

Browse Source
This commit is contained in:
louisgong 2020-05-14 10:12:19 +08:00
parent e26af96b8e
commit c0b78c83a1
1 changed files with 32 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
staging/src/k8s.io/legacy-cloud-providers/aws/aws_test.go
View File

@ -583,68 +583,46 @@ func testHasNodeAddress(t *testing.T, addrs []v1.NodeAddress, addressType v1.Nod
t.Errorf("Did not find expected address: %s:%s in %v", addressType, address, addrs) t.Errorf("Did not find expected address: %s:%s in %v", addressType, address, addrs)
} }
func TestNodeAddresses(t *testing.T) { func makeInstance(num int, privateIP, publicIP, privateDNSName, publicDNSName string, setNetInterface bool) ec2.Instance {
// Note instance0 and instance1 have the same name
// (we test that this produces an error)
var instance0 ec2.Instance
var instance1 ec2.Instance
var instance2 ec2.Instance
// ClusterID needs to be set
var tag ec2.Tag var tag ec2.Tag
tag.Key = aws.String(TagNameKubernetesClusterLegacy) tag.Key = aws.String(TagNameKubernetesClusterLegacy)
tag.Value = aws.String(TestClusterID) tag.Value = aws.String(TestClusterID)
tags := []*ec2.Tag{&tag} tags := []*ec2.Tag{&tag}
//0 instance := ec2.Instance{
instance0.InstanceId = aws.String("i-0") InstanceId: aws.String(fmt.Sprintf("i-%d", num)),
instance0.PrivateDnsName = aws.String("instance-same.ec2.internal") PrivateDnsName: aws.String(privateDNSName),
instance0.PrivateIpAddress = aws.String("192.168.0.1") PrivateIpAddress: aws.String(privateIP),
instance0.PublicDnsName = aws.String("instance-same.ec2.external") PublicDnsName: aws.String(publicDNSName),
instance0.PublicIpAddress = aws.String("1.2.3.4") PublicIpAddress: aws.String(publicIP),
instance0.NetworkInterfaces = []*ec2.InstanceNetworkInterface{ InstanceType: aws.String("c3.large"),
{ Tags: tags,
Status: aws.String(ec2.NetworkInterfaceStatusInUse), Placement: &ec2.Placement{AvailabilityZone: aws.String("us-east-1a")},
PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{ State: &ec2.InstanceState{
{ Name: aws.String("running"),
PrivateIpAddress: aws.String("192.168.0.1"),
},
},
}, },
} }
instance0.InstanceType = aws.String("c3.large") if setNetInterface == true {
instance0.Placement = &ec2.Placement{AvailabilityZone: aws.String("us-east-1a")} instance.NetworkInterfaces = []*ec2.InstanceNetworkInterface{
instance0.Tags = tags {
state0 := ec2.InstanceState{ Status: aws.String(ec2.NetworkInterfaceStatusInUse),
Name: aws.String("running"), PrivateIpAddresses: []*ec2.InstancePrivateIpAddress{
{
PrivateIpAddress: aws.String(privateIP),
},
},
},
}
} }
instance0.State = &state0 return instance
}
//1
instance1.InstanceId = aws.String("i-1")
instance1.PrivateDnsName = aws.String("instance-same.ec2.internal")
instance1.PrivateIpAddress = aws.String("192.168.0.2")
instance1.InstanceType = aws.String("c3.large")
instance1.Placement = &ec2.Placement{AvailabilityZone: aws.String("us-east-1a")}
instance1.Tags = tags
state1 := ec2.InstanceState{
Name: aws.String("running"),
}
instance1.State = &state1
//2
instance2.InstanceId = aws.String("i-2")
instance2.PrivateDnsName = aws.String("instance-other.ec2.internal")
instance2.PrivateIpAddress = aws.String("192.168.0.1")
instance2.PublicIpAddress = aws.String("1.2.3.4")
instance2.InstanceType = aws.String("c3.large")
instance2.Placement = &ec2.Placement{AvailabilityZone: aws.String("us-east-1a")}
instance2.Tags = tags
state2 := ec2.InstanceState{
Name: aws.String("running"),
}
instance2.State = &state2
func TestNodeAddresses(t *testing.T) {
// Note instance0 and instance1 have the same name
// (we test that this produces an error)
instance0 := makeInstance(0, "192.168.0.1", "1.2.3.4", "instance-same.ec2.internal", "instance-same.ec2.external", true)
instance1 := makeInstance(1, "192.168.0.2", "", "instance-same.ec2.internal", "", false)
instance2 := makeInstance(2, "192.168.0.1", "1.2.3.4", "instance-other.ec2.internal", "", false)
instances := []*ec2.Instance{&instance0, &instance1, &instance2} instances := []*ec2.Instance{&instance0, &instance1, &instance2}
aws1, _ := mockInstancesResp(&instance0, []*ec2.Instance{&instance0}) aws1, _ := mockInstancesResp(&instance0, []*ec2.Instance{&instance0})
@ -677,26 +655,7 @@ func TestNodeAddresses(t *testing.T) {
} }
func TestNodeAddressesWithMetadata(t *testing.T) { func TestNodeAddressesWithMetadata(t *testing.T) {
var instance ec2.Instance instance := makeInstance(0, "", "2.3.4.5", "instance.ec2.internal", "", false)
// ClusterID needs to be set
var tag ec2.Tag
tag.Key = aws.String(TagNameKubernetesClusterLegacy)
tag.Value = aws.String(TestClusterID)
tags := []*ec2.Tag{&tag}
instanceName := "instance.ec2.internal"
instance.InstanceId = aws.String("i-0")
instance.PrivateDnsName = &instanceName
instance.PublicIpAddress = aws.String("2.3.4.5")
instance.InstanceType = aws.String("c3.large")
instance.Placement = &ec2.Placement{AvailabilityZone: aws.String("us-east-1a")}
instance.Tags = tags
state := ec2.InstanceState{
Name: aws.String("running"),
}
instance.State = &state
instances := []*ec2.Instance{&instance} instances := []*ec2.Instance{&instance}
awsCloud, awsServices := mockInstancesResp(&instance, instances) awsCloud, awsServices := mockInstancesResp(&instance, instances)