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

Merge pull request #96728 from jeremyje/dontpanic

Browse Source 
Fail instead of panic when HNS network cannot be created in test.
This commit is contained in:
Kubernetes Prow Robot 2020-12-08 18:36:14 -08:00 committed by GitHub
commit c9dfd5829b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pkg/proxy/winkernel/hns_test.go
View File

@ -110,10 +110,7 @@ func TestDeleteLoadBalancer(t *testing.T) {
testDeleteLoadBalancer(t, hnsV2) testDeleteLoadBalancer(t, hnsV2)
} }
func testGetNetworkByName(t *testing.T, hns HostNetworkService) { func testGetNetworkByName(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
network, err := hns.getNetworkByName(Network.Name) network, err := hns.getNetworkByName(Network.Name)
if err != nil { if err != nil {
@ -129,10 +126,7 @@ func testGetNetworkByName(t *testing.T, hns HostNetworkService) {
} }
} }
func testGetEndpointByID(t *testing.T, hns HostNetworkService) { func testGetEndpointByID(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -146,7 +140,7 @@ func testGetEndpointByID(t *testing.T, hns HostNetworkService) {
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -169,10 +163,7 @@ func testGetEndpointByID(t *testing.T, hns HostNetworkService) {
} }
} }
func testGetEndpointByIpAddress(t *testing.T, hns HostNetworkService) { func testGetEndpointByIpAddress(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -185,7 +176,7 @@ func testGetEndpointByIpAddress(t *testing.T, hns HostNetworkService) {
Minor: 0, Minor: 0,
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -211,10 +202,7 @@ func testGetEndpointByIpAddress(t *testing.T, hns HostNetworkService) {
} }
} }
func testCreateEndpointLocal(t *testing.T, hns HostNetworkService) { func testCreateEndpointLocal(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
endpoint := &endpointsInfo{ endpoint := &endpointsInfo{
ip: epIpAddress, ip: epIpAddress,
@ -222,7 +210,7 @@ func testCreateEndpointLocal(t *testing.T, hns HostNetworkService) {
isLocal: true, isLocal: true,
} }
endpoint, err = hns.createEndpoint(endpoint, Network.Name) endpoint, err := hns.createEndpoint(endpoint, Network.Name)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -250,10 +238,7 @@ func testCreateEndpointLocal(t *testing.T, hns HostNetworkService) {
} }
} }
func testCreateEndpointRemote(t *testing.T, hns HostNetworkService, providerAddress string) { func testCreateEndpointRemote(t *testing.T, hns HostNetworkService, providerAddress string) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
endpoint := &endpointsInfo{ endpoint := &endpointsInfo{
ip: epIpAddressRemote, ip: epIpAddressRemote,
@ -262,7 +247,7 @@ func testCreateEndpointRemote(t *testing.T, hns HostNetworkService, providerAddr
providerAddress: providerAddress, providerAddress: providerAddress,
} }
endpoint, err = hns.createEndpoint(endpoint, Network.Name) endpoint, err := hns.createEndpoint(endpoint, Network.Name)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -293,10 +278,7 @@ func testCreateEndpointRemote(t *testing.T, hns HostNetworkService, providerAddr
} }
} }
func testDeleteEndpoint(t *testing.T, hns HostNetworkService) { func testDeleteEndpoint(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -309,7 +291,7 @@ func testDeleteEndpoint(t *testing.T, hns HostNetworkService) {
Minor: 0, Minor: 0,
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -330,10 +312,7 @@ func testDeleteEndpoint(t *testing.T, hns HostNetworkService) {
} }
func testGetLoadBalancerExisting(t *testing.T, hns HostNetworkService) { func testGetLoadBalancerExisting(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -346,7 +325,7 @@ func testGetLoadBalancerExisting(t *testing.T, hns HostNetworkService) {
Minor: 0, Minor: 0,
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -394,10 +373,7 @@ func testGetLoadBalancerExisting(t *testing.T, hns HostNetworkService) {
} }
} }
func testGetLoadBalancerNew(t *testing.T, hns HostNetworkService) { func testGetLoadBalancerNew(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -410,7 +386,7 @@ func testGetLoadBalancerNew(t *testing.T, hns HostNetworkService) {
Minor: 0, Minor: 0,
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -445,10 +421,7 @@ func testGetLoadBalancerNew(t *testing.T, hns HostNetworkService) {
} }
} }
func testDeleteLoadBalancer(t *testing.T, hns HostNetworkService) { func testDeleteLoadBalancer(t *testing.T, hns HostNetworkService) {
Network, err := createTestNetwork() Network := mustTestNetwork(t)
if err != nil {
t.Error(err)
}
ipConfig := &hcn.IpConfig{ ipConfig := &hcn.IpConfig{
IpAddress: epIpAddress, IpAddress: epIpAddress,
@ -461,7 +434,7 @@ func testDeleteLoadBalancer(t *testing.T, hns HostNetworkService) {
Minor: 0, Minor: 0,
}, },
} }
Endpoint, err = Network.CreateEndpoint(Endpoint) Endpoint, err := Network.CreateEndpoint(Endpoint)
if err != nil { if err != nil {
t.Error(err) t.Error(err)
} }
@ -499,6 +472,16 @@ func testDeleteLoadBalancer(t *testing.T, hns HostNetworkService) {
t.Error(err) t.Error(err)
} }
} }
func mustTestNetwork(t *testing.T) *hcn.HostComputeNetwork {
network, err := createTestNetwork()
if err != nil {
t.Fatalf("cannot create test network: %v", err)
}
if network == nil {
t.Fatal("test network was nil without error")
}
return network
}
func createTestNetwork() (*hcn.HostComputeNetwork, error) { func createTestNetwork() (*hcn.HostComputeNetwork, error) {
network := &hcn.HostComputeNetwork{ network := &hcn.HostComputeNetwork{
Type: "Overlay", Type: "Overlay",