Merge pull request #85 from Madhan-SWE/hack2

Repo endpoints changed in the unit tests, mock expectations added as per latest changes.

Author: Power Cloud Robot

cmd/options_test.go

@@ -19,7 +19,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/driver"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/driver"
 )
 
 func TestGetOptions(t *testing.T) {

pkg/cloud/mocks/mock_cloud.go

@@ -21,11 +21,11 @@ import (
 
 	csi "github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/mock/gomock"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud"
-	mocks "github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud/mocks"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud"
+	mocks "sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud/mocks"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
 )
 
 const (
@@ -74,6 +74,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{
@@ -128,6 +129,7 @@ func TestCreateVolume(t *testing.T) {
 				}
 			},
 		},
+
 		{
 			name: "success same name and same capacity",
 			testFunc: func(t *testing.T) {
@@ -160,6 +162,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{
@@ -177,7 +180,8 @@ func TestCreateVolume(t *testing.T) {
 				}
 
 				// Subsequent call returns the created disk
-				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(mockDisk, nil)
+				mockCloud.EXPECT().WaitForVolumeState(gomock.Any(), gomock.Any()).Return(nil)
 				resp, err := powervsDriver.CreateVolume(ctx, extraReq)
 				if err != nil {
 					srvErr, ok := status.FromError(err)
@@ -214,6 +218,7 @@ func TestCreateVolume(t *testing.T) {
 				}
 			},
 		},
+
 		{
 			name: "success no capacity range",
 			testFunc: func(t *testing.T) {
@@ -239,6 +244,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{
@@ -299,6 +305,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{
@@ -352,6 +359,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{
@@ -395,6 +403,7 @@ func TestCreateVolume(t *testing.T) {
 				defer mockCtl.Finish()
 
 				mockCloud := mocks.NewMockCloud(mockCtl)
+				mockCloud.EXPECT().GetDiskByName(gomock.Eq(req.Name)).Return(nil, nil)
 				mockCloud.EXPECT().CreateDisk(gomock.Eq(req.Name), gomock.Any()).Return(mockDisk, nil)
 
 				powervsDriver := controllerService{

pkg/driver/controller_test.go

@@ -21,10 +21,10 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/mock/gomock"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud"
-	cloudmocks "github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud/mocks"
-	mocks "github.com/ppc64le-cloud/powervs-csi-driver/pkg/driver/mocks"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud"
+	cloudmocks "sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud/mocks"
+	mocks "sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/driver/mocks"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -229,9 +229,6 @@ func TestNodeStageVolume(t *testing.T) {
 				VolumeId:          volumeID,
 			},
 			expectedCode: codes.InvalidArgument,
-			expectMock: func(mockMounter mocks.MockMounter) {
-				mockMounter.EXPECT().IsLikelyNotMountPoint(gomock.Any()).Return(true, nil)
-			},
 		},
 
 		{

pkg/driver/node_test.go

@@ -12,10 +12,10 @@ import (
 	"time"
 
 	"github.com/kubernetes-csi/csi-test/pkg/sanity"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/cloud"
-	"github.com/ppc64le-cloud/powervs-csi-driver/pkg/util"
 	"k8s.io/utils/exec"
 	"k8s.io/utils/mount"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/cloud"
+	"sigs.k8s.io/ibm-powervs-block-csi-driver/pkg/util"
 )
 
 func TestSanity(t *testing.T) {