From d32e73aba9c25be8d96587e28690662864688802 Mon Sep 17 00:00:00 2001 From: Pengfei Ni Date: Tue, 8 May 2018 22:42:58 +0800 Subject: [PATCH] Fix unit tests for new interfaces --- pkg/cloudprovider/providers/azure/azure_fakes.go | 11 ++++------- .../providers/azure/azure_routes_test.go | 6 ++---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_fakes.go b/pkg/cloudprovider/providers/azure/azure_fakes.go index a37e07b1423..a79e7e19011 100644 --- a/pkg/cloudprovider/providers/azure/azure_fakes.go +++ b/pkg/cloudprovider/providers/azure/azure_fakes.go @@ -826,7 +826,7 @@ func (fDC *fakeDisksClient) Get(ctx context.Context, resourceGroupName string, d } type fakeVMSet struct { - NodeToIP map[string]map[string]string + NodeToIP map[string]string Err error } @@ -838,15 +838,12 @@ func (f *fakeVMSet) GetInstanceTypeByNodeName(name string) (string, error) { return "", fmt.Errorf("unimplemented") } -func (f *fakeVMSet) GetIPByNodeName(name, vmSetName string) (string, string, error) { - nodes, found := f.NodeToIP[vmSetName] - if !found { - return "", "", fmt.Errorf("not found") - } - ip, found := nodes[name] +func (f *fakeVMSet) GetIPByNodeName(name string) (string, string, error) { + ip, found := f.NodeToIP[name] if !found { return "", "", fmt.Errorf("not found") } + return ip, "", nil } diff --git a/pkg/cloudprovider/providers/azure/azure_routes_test.go b/pkg/cloudprovider/providers/azure/azure_routes_test.go index c879abc3cd4..cc248ee52e6 100644 --- a/pkg/cloudprovider/providers/azure/azure_routes_test.go +++ b/pkg/cloudprovider/providers/azure/azure_routes_test.go @@ -94,10 +94,8 @@ func TestCreateRoute(t *testing.T) { route := cloudprovider.Route{TargetNode: "node", DestinationCIDR: "1.2.3.4/24"} nodeIP := "2.4.6.8" - fakeVM.NodeToIP = map[string]map[string]string{ - "": { - "node": nodeIP, - }, + fakeVM.NodeToIP = map[string]string{ + "node": nodeIP, } err := cloud.CreateRoute(context.TODO(), "cluster", "unused", &route)