Skip to content

Commit

Permalink
remove unused wrapper
Browse files Browse the repository at this point in the history 
Signed-off-by: Xudong Liu <xudongl@vmware.com>
  • Loading branch information
Xudong Liu committed Jan 29, 2024
1 parent 74bde04 commit 0915a50
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 249 deletions.
18 changes: 5 additions & 13 deletions pkg/cloudprovider/vsphereparavirtual/instances_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
clientgotesting "k8s.io/client-go/testing"
cloudprovider "k8s.io/cloud-provider"
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"
)

var (
Expand Down Expand Up @@ -68,29 +68,21 @@ func createTestVMWithVMIPAndHost(name, namespace, biosUUID string) *vmopv1alpha1
func TestNewInstances(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
config *rest.Config
expectedErr error
}{
{
name: "NewInstance: when everything is ok",
// The above code is declaring a test environment variable of type `envtest.Environment` and
// initializing it with an empty instance of `envtest.Environment`.
testEnv: &envtest.Environment{},
name: "NewInstance: when everything is ok",
config: &rest.Config{},
expectedErr: nil,
},
}

for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
cfg, err := testCase.testEnv.Start()
assert.NoError(t, err)

_, err = NewInstances(testClusterNameSpace, cfg)
_, err := NewInstances(testClusterNameSpace, testCase.config)
assert.NoError(t, err)
assert.Equal(t, testCase.expectedErr, err)

err = testCase.testEnv.Stop()
assert.NoError(t, err)
})
}
}
Expand Down
22 changes: 8 additions & 14 deletions pkg/cloudprovider/vsphereparavirtual/loadbalancer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/rest"
clientgotesting "k8s.io/client-go/testing"
cloudprovider "k8s.io/cloud-provider"
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"

"k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmservice"

Expand Down Expand Up @@ -61,27 +61,21 @@ func newTestLoadBalancer() (cloudprovider.LoadBalancer, *fakevmclient.Clientset)

func TestNewLoadBalancer(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
err error
name string
config *rest.Config
err error
}{
{
name: "NewLoadBalancer: when everything is ok",
testEnv: &envtest.Environment{},
err: nil,
name: "NewLoadBalancer: when everything is ok",
config: &rest.Config{},
err: nil,
},
}

for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
cfg, err := testCase.testEnv.Start()
assert.NoError(t, err)

_, err = NewLoadBalancer(testClusterNameSpace, cfg, &testOwnerReference)
_, err := NewLoadBalancer(testClusterNameSpace, testCase.config, &testOwnerReference)
assert.Equal(t, testCase.err, err)

err = testCase.testEnv.Stop()
assert.NoError(t, err)
})
}
}
Expand Down
25 changes: 8 additions & 17 deletions pkg/cloudprovider/vsphereparavirtual/vmservice/vmservice_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ import (
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
rest "k8s.io/client-go/rest"
clientgotesting "k8s.io/client-go/testing"

"k8s.io/apimachinery/pkg/util/intstr"
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"
)

var (
Expand All @@ -50,9 +50,6 @@ var (
}
vms VMService
fakeLBIP = "1.1.1.1"

// FakeClientWrapper allows functions to be replaced for fault injection
fc *fakevmclient.Clientset
)

func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) {
Expand Down Expand Up @@ -84,31 +81,25 @@ func initTest() (*v1.Service, VMService, *fakevmclient.Clientset) {

func TestNewVMService(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
err error
name string
config *rest.Config
err error
}{
{
name: "NewVMService: when everything is ok",
testEnv: &envtest.Environment{},
err: nil,
name: "NewVMService: when everything is ok",
config: &rest.Config{},
err: nil,
},
}

for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
cfg, err := testCase.testEnv.Start()
assert.NoError(t, err)

client, err := GetVmopClient(cfg)
client, err := GetVmopClient(testCase.config)
assert.NoError(t, err)
assert.NotEqual(t, client, nil)

realVms := NewVMService(client, testClusterNameSpace, &testOwnerReference)
assert.NotEqual(t, realVms, nil)

err = testCase.testEnv.Stop()
assert.NoError(t, err)
})
}
}
Expand Down
15 changes: 4 additions & 11 deletions pkg/cloudprovider/vsphereparavirtual/zone_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
vmopv1alpha1 "github.com/vmware-tanzu/vm-operator-api/api/v1alpha1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/rest"
cloudprovider "k8s.io/cloud-provider"
fakevmclient "k8s.io/cloud-provider-vsphere/pkg/cloudprovider/vsphereparavirtual/vmop/clientset/versioned/fake"
"sigs.k8s.io/controller-runtime/pkg/envtest"
)

var (
Expand All @@ -23,37 +23,31 @@ var (
func TestNewZones(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
config *rest.Config
expectedErr error
testVM *vmopv1alpha1.VirtualMachine
}{
{
name: "NewZone: when everything is ok",
testEnv: &envtest.Environment{},
config: &rest.Config{},
testVM: createTestVMWithZone(string(vmName), testClusterNameSpace),
expectedErr: nil,
},
}

for _, testCase := range testCases {
t.Run(testCase.name, func(t *testing.T) {
cfg, err := testCase.testEnv.Start()
assert.NoError(t, err)
//initVMopClient(testCase.testVM)
_, err = NewZones(testClusterNameSpace, cfg)
_, err := NewZones(testClusterNameSpace, testCase.config)
assert.NoError(t, err)
assert.Equal(t, testCase.expectedErr, err)

err = testCase.testEnv.Stop()
assert.NoError(t, err)
})
}
}

func TestZonesByProviderID(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
expectedResult string
expectedErr error
testVM *vmopv1alpha1.VirtualMachine
Expand Down Expand Up @@ -94,7 +88,6 @@ func TestZonesByProviderID(t *testing.T) {
func TestZonesByNodeName(t *testing.T) {
testCases := []struct {
name string
testEnv *envtest.Environment
expectedResult string
expectedErr error
testVM *vmopv1alpha1.VirtualMachine
Expand Down
97 changes: 0 additions & 97 deletions pkg/util/fake_vm_client_wrapper.go
View file

This file was deleted.

Loading

0 comments on commit 0915a50

Please sign in to comment.