From 6b36a70d7995b337d82b4ca938a1d5679f6e9ba2 Mon Sep 17 00:00:00 2001 From: Jingtao Ren Date: Thu, 16 Nov 2017 11:25:51 -0800 Subject: [PATCH] fix fake name convention --- .../providers/azure/azure_fakes.go | 24 +++++++++---------- .../providers/azure/azure_test.go | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkg/cloudprovider/providers/azure/azure_fakes.go b/pkg/cloudprovider/providers/azure/azure_fakes.go index 0351f4efaa6..45e3eee904c 100644 --- a/pkg/cloudprovider/providers/azure/azure_fakes.go +++ b/pkg/cloudprovider/providers/azure/azure_fakes.go @@ -264,20 +264,20 @@ func (fAPC fakeAzurePIPClient) List(resourceGroupName string) (result network.Pu return result, nil } -type fakeInterfacesClient struct { +type fakeAzureInterfacesClient struct { mutex *sync.Mutex FakeStore map[string]map[string]network.Interface } -func NewFakeInterfacesClient() fakeInterfacesClient { - fIC := fakeInterfacesClient{} +func NewFakeAzureInterfacesClient() fakeAzureInterfacesClient { + fIC := fakeAzureInterfacesClient{} fIC.FakeStore = make(map[string]map[string]network.Interface) fIC.mutex = &sync.Mutex{} return fIC } -func (fIC fakeInterfacesClient) CreateOrUpdate(resourceGroupName string, networkInterfaceName string, parameters network.Interface, cancel <-chan struct{}) (<-chan network.Interface, <-chan error) { +func (fIC fakeAzureInterfacesClient) CreateOrUpdate(resourceGroupName string, networkInterfaceName string, parameters network.Interface, cancel <-chan struct{}) (<-chan network.Interface, <-chan error) { fIC.mutex.Lock() defer fIC.mutex.Unlock() resultChan := make(chan network.Interface, 1) @@ -300,7 +300,7 @@ func (fIC fakeInterfacesClient) CreateOrUpdate(resourceGroupName string, network return resultChan, errChan } -func (fIC fakeInterfacesClient) Get(resourceGroupName string, networkInterfaceName string, expand string) (result network.Interface, err error) { +func (fIC fakeAzureInterfacesClient) Get(resourceGroupName string, networkInterfaceName string, expand string) (result network.Interface, err error) { fIC.mutex.Lock() defer fIC.mutex.Unlock() if _, ok := fIC.FakeStore[resourceGroupName]; ok { @@ -314,19 +314,19 @@ func (fIC fakeInterfacesClient) Get(resourceGroupName string, networkInterfaceNa } } -type fakeVirtualMachinesClient struct { +type fakeAzureVirtualMachinesClient struct { mutex *sync.Mutex FakeStore map[string]map[string]compute.VirtualMachine } -func NewFakeVirtualMachinesClient() fakeVirtualMachinesClient { - fVMC := fakeVirtualMachinesClient{} +func NewFakeAzureVirtualMachinesClient() fakeAzureVirtualMachinesClient { + fVMC := fakeAzureVirtualMachinesClient{} fVMC.FakeStore = make(map[string]map[string]compute.VirtualMachine) fVMC.mutex = &sync.Mutex{} return fVMC } -func (fVMC fakeVirtualMachinesClient) CreateOrUpdate(resourceGroupName string, VMName string, parameters compute.VirtualMachine, cancel <-chan struct{}) (<-chan compute.VirtualMachine, <-chan error) { +func (fVMC fakeAzureVirtualMachinesClient) CreateOrUpdate(resourceGroupName string, VMName string, parameters compute.VirtualMachine, cancel <-chan struct{}) (<-chan compute.VirtualMachine, <-chan error) { fVMC.mutex.Lock() defer fVMC.mutex.Unlock() resultChan := make(chan compute.VirtualMachine, 1) @@ -348,7 +348,7 @@ func (fVMC fakeVirtualMachinesClient) CreateOrUpdate(resourceGroupName string, V return resultChan, errChan } -func (fVMC fakeVirtualMachinesClient) Get(resourceGroupName string, VMName string, expand compute.InstanceViewTypes) (result compute.VirtualMachine, err error) { +func (fVMC fakeAzureVirtualMachinesClient) Get(resourceGroupName string, VMName string, expand compute.InstanceViewTypes) (result compute.VirtualMachine, err error) { fVMC.mutex.Lock() defer fVMC.mutex.Unlock() if _, ok := fVMC.FakeStore[resourceGroupName]; ok { @@ -362,7 +362,7 @@ func (fVMC fakeVirtualMachinesClient) Get(resourceGroupName string, VMName strin } } -func (fVMC fakeVirtualMachinesClient) List(resourceGroupName string) (result compute.VirtualMachineListResult, err error) { +func (fVMC fakeAzureVirtualMachinesClient) List(resourceGroupName string) (result compute.VirtualMachineListResult, err error) { fVMC.mutex.Lock() defer fVMC.mutex.Unlock() var value []compute.VirtualMachine @@ -378,7 +378,7 @@ func (fVMC fakeVirtualMachinesClient) List(resourceGroupName string) (result com result.Value = &value return result, nil } -func (fVMC fakeVirtualMachinesClient) ListNextResults(lastResults compute.VirtualMachineListResult) (result compute.VirtualMachineListResult, err error) { +func (fVMC fakeAzureVirtualMachinesClient) ListNextResults(lastResults compute.VirtualMachineListResult) (result compute.VirtualMachineListResult, err error) { fVMC.mutex.Lock() defer fVMC.mutex.Unlock() return compute.VirtualMachineListResult{}, nil diff --git a/pkg/cloudprovider/providers/azure/azure_test.go b/pkg/cloudprovider/providers/azure/azure_test.go index 73af15642c2..51d9fa12a17 100644 --- a/pkg/cloudprovider/providers/azure/azure_test.go +++ b/pkg/cloudprovider/providers/azure/azure_test.go @@ -822,8 +822,8 @@ func getTestCloud() (az *Cloud) { az.PublicIPAddressesClient = NewFakeAzurePIPClient(az.Config.SubscriptionID) az.SubnetsClient = NewFakeAzureSubnetsClient() az.SecurityGroupsClient = NewFakeAzureNSGClient() - az.VirtualMachinesClient = NewFakeVirtualMachinesClient() - az.InterfacesClient = NewFakeInterfacesClient() + az.VirtualMachinesClient = NewFakeAzureVirtualMachinesClient() + az.InterfacesClient = NewFakeAzureInterfacesClient() return az }