merged upstream changes from main

dell · Feb 1, 2022 · b43b95c · b43b95c
1 parent d228e8f
commit b43b95c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 23 deletions.
diff --git a/go.mod b/go.mod
@@ -5,9 +5,9 @@ require (
 	github.com/akutz/gournal v0.5.0
 	github.com/container-storage-interface/spec v1.5.0
 	github.com/cucumber/godog v0.10.0
-	github.com/dell/gocsi v1.5.0
 	github.com/dell/dell-csi-extensions/replication v1.0.0
-		github.com/dell/gofsutil v1.6.0
+	github.com/dell/gocsi v1.5.0
+	github.com/dell/gofsutil v1.6.0
 	github.com/dell/goisilon v1.6.0
 	github.com/fsnotify/fsnotify v1.4.9
 	github.com/golang/protobuf v1.5.2
@@ -27,7 +27,7 @@ require (
 )
 
 replace (
-	github.com/dell/goisilon v1.6.0 => ../gopowerscale
+	github.com/dell/goisilon v1.6.0 => github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b
 	k8s.io/api => k8s.io/api v0.20.2
 	k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.2
 	k8s.io/apimachinery => k8s.io/apimachinery v0.20.2

diff --git a/go.sum b/go.sum
@@ -158,14 +158,12 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
 github.com/dell/dell-csi-extensions/replication v1.0.0 h1:fLcn4xhVO7Xt5t8ZIwDu57vAtL3LWbdYF94W9bpWS/Y=
 github.com/dell/dell-csi-extensions/replication v1.0.0/go.mod h1:DbHqsh4vpC+SajnrDSAwWE8n556GSSyzOAEBX7tcCUg=
-github.com/dell/gocsi v1.4.1-0.20211014153731-e18975a3a38c h1:aZb2rtCMt5I8T0eNbJ259NmIOroGavUUsp694d/tcBY=
-github.com/dell/gocsi v1.4.1-0.20211014153731-e18975a3a38c/go.mod h1:nIsIXXB5JpAvOQ0//gtPGULC2+NUddpi5qwpBeMhiLs=
 github.com/dell/gocsi v1.5.0 h1:qi2T6H6JHDo9sJEw24jo6Z88fJszBXfQc3lxOBaUijo=
 github.com/dell/gocsi v1.5.0/go.mod h1:nIsIXXB5JpAvOQ0//gtPGULC2+NUddpi5qwpBeMhiLs=
 github.com/dell/gofsutil v1.6.0 h1:u5PiMJIyecAWpSlPloov1/3LF5OWrcjJwoFF8dWkjcA=
 github.com/dell/gofsutil v1.6.0/go.mod h1:98Wpcg7emz4iGgY16fd4MKpnal2SX2hBiwP5ghHlvhg=
-github.com/dell/goisilon v1.6.1-0.20220110083433-83d13e163ea4 h1:qkft+buN2uucBlXNqnKFjEWvStb72HX+Ma/G5sIJ9vA=
-github.com/dell/goisilon v1.6.1-0.20220110083433-83d13e163ea4/go.mod h1:X6Xizkcr0K4soNlM26rK/KMF95VI/StxL1GHanHm1UQ=
+github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b h1:HiiqSaQkv+GnEQM3w/XRkqsK9PrhtTBpDvcvIa1w2dw=
+github.com/dell/goisilon v0.0.0-20220126122911-e1a58045d14b/go.mod h1:X6Xizkcr0K4soNlM26rK/KMF95VI/StxL1GHanHm1UQ=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=

diff --git a/service/replication.go b/service/replication.go
@@ -117,11 +117,6 @@ func (s *service) CreateRemoteVolume(ctx context.Context,
 	remoteVolume := getRemoteCSIVolume(ctx, remoteExportID, volName, accessZone, volumeSize, remoteClusterName)
 
 	// TODO: figure out what remote parameters we would need if any
-	// remoteParams := map[string]string{
-	// 	"remoteSystem": localSystem.Name,
-	// 	s.replicationContextPrefix + "managementAddress": remoteSystem.ManagementAddress,
-	// }
-	// remoteVolume.VolumeContext = remoteParams
 
 	return &csiext.CreateRemoteVolumeResponse{
 		RemoteVolume: remoteVolume,
@@ -245,8 +240,8 @@ func (s *service) DeleteStorageProtectionGroup(ctx context.Context,
 			return &csiext.DeleteStorageProtectionGroupResponse{}, nil
 		}
 		return nil, status.Errorf(codes.Internal, "Error: Unable to get Volume Group")
-	}	else if err != nil {
-			return nil, status.Errorf(codes.Internal, "Error: Unable to get Volume Group")
+	} else if err != nil {
+		return nil, status.Errorf(codes.Internal, "Error: Unable to get Volume Group")
 	}
 	childs, err := isiConfig.isiSvc.client.QueryVolumeChildren(ctx, strings.TrimPrefix(isiPath, isiConfig.IsiPath))
 	if err != nil {
@@ -260,15 +255,7 @@ func (s *service) DeleteStorageProtectionGroup(ctx context.Context,
 			return nil, status.Errorf(codes.Internal, "VG is not empty")
 		}
 	}
-	//// DELETE VG, DELETE PP IF NO VOLUMES
-	//members, err := isiConfig.isiSvc.GetSubDirectoryCount(ctx, isiPath, "")
-	//if err != nil {
-	//	return nil, err
-	//}
-	//if members != 0 {
-	//	log.Error("VG has members inside")
-	//	return nil, errors.New("volume Group is not empty")
-	//}
+
 	err = isiConfig.isiSvc.DeleteVolume(ctx, isiPath, "")
 	if err != nil {
 		return nil, err