Disabling SDC dependency for NFS Volume Provisioning

go.mod

@@ -3,7 +3,9 @@ module github.com/dell/csi-vxflexos/v2
 // In order to run unit tests on Windows, you need a stubbed Windows implementation
 // of the gofsutil package. Use the following replace statements if necessary.
 
-go 1.22
+go 1.22.0
+
+toolchain go1.22.5
 
 require (
 	github.com/akutz/memconn v0.1.0
@@ -16,7 +18,7 @@ require (
 	github.com/dell/dell-csi-extensions/volumeGroupSnapshot v1.6.0
 	github.com/dell/gocsi v1.11.0
 	github.com/dell/gofsutil v1.16.1
-	github.com/dell/goscaleio v1.15.0
+	github.com/dell/goscaleio v1.16.1-0.20240923113203-f072f0cb0a88
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/google/uuid v1.6.0
 	github.com/gorilla/mux v1.8.0
@@ -73,7 +75,7 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.17.0 // indirect
 	golang.org/x/oauth2 v0.20.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
 	golang.org/x/term v0.21.0 // indirect
 	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect

go.sum

@@ -116,8 +116,10 @@ github.com/dell/gocsi v1.11.0 h1:P84VOPd1V55JQjx4tfd/6QOlVQRQkYUqmGqbzPKeyUQ=
 github.com/dell/gocsi v1.11.0/go.mod h1:LzGAsEIjBxVXJuabzsG3/MsdCOczxDE1IWOBxzXIUhw=
 github.com/dell/gofsutil v1.16.1 h1:BzdxMdIDgKzinlYyi5G3pi27Jw0cmtqRHM5UsIkoE+w=
 github.com/dell/gofsutil v1.16.1/go.mod h1:bZ43qAOqKzGJxCRvkTVD7GCFMNkK37ur84mmMuxQshE=
-github.com/dell/goscaleio v1.15.0 h1:DzI1ZlQhdIR+V4AKGOMwz1Viu2bAtj3N6kTyixB0Qg8=
-github.com/dell/goscaleio v1.15.0/go.mod h1:h7SCmReARG/szFWBMQGETGkZObknhS45lQipQbtdmJ8=
+github.com/dell/goscaleio v1.16.1-0.20240912175217-52d904077dc7 h1:X3CuTHtIPo8+3JZOl9z+mmoym5TTP2mYAIWKtSX/hoc=
+github.com/dell/goscaleio v1.16.1-0.20240912175217-52d904077dc7/go.mod h1:h7SCmReARG/szFWBMQGETGkZObknhS45lQipQbtdmJ8=
+github.com/dell/goscaleio v1.16.1-0.20240923113203-f072f0cb0a88 h1:+JewlsDL4XH/lupX7r4Z8M3D19MF9K2U8y33SCs3LGY=
+github.com/dell/goscaleio v1.16.1-0.20240923113203-f072f0cb0a88/go.mod h1:b2mbdhG3IHp8YfvDrj7jWHdJNkqyrUhWNDEvo4GVEUc=
 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/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
@@ -606,6 +608,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=

service/controller.go

@@ -23,6 +23,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/dell/csi-vxflexos/v2/k8sutils"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+
+	"sigs.k8s.io/yaml"
+
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
@@ -129,6 +134,8 @@ const (
 
 	sioReplicationGroupExists = "The Replication Consistency Group already exists"
 	sioReplicationPairExists  = "A Replication Pair for the specified local volume already exists"
+
+	DriverConfigParamsYaml = "driver-config-params.yaml"
 )
 
 // Extra metadata field names for propagating to goscaleio and beyond.
@@ -322,6 +329,7 @@ func (s *service) CreateVolume(
 			Log.Printf("Size %d is less than 3GB, rounding to 3GB", size/bytesInGiB)
 			size = minNfsSize
 		}
+
 		contentSource := req.GetVolumeContentSource()
 		if contentSource != nil {
 			snapshotSource := contentSource.GetSnapshot()
@@ -1166,6 +1174,45 @@ func (s *service) DeleteVolume(
 	return &csi.DeleteVolumeResponse{}, nil
 }
 
+func (s *service) findNetworkInterfaceIPs() ([]string, error) {
+	if K8sClientset == nil {
+		err := k8sutils.CreateKubeClientSet()
+		if err != nil {
+			Log.Errorf("Failed to create Kubernetes clientset: %v", err)
+			return []string{}, err
+		}
+		K8sClientset = k8sutils.Clientset
+	}
+
+	// Get the ConfigMap
+	configMap, err := K8sClientset.CoreV1().ConfigMaps(DriverNamespace).Get(context.TODO(), DriverConfigMap, metav1.GetOptions{})
+	if err != nil {
+		Log.Errorf("Failed to get the ConfigMap: %v", err)
+		return []string{}, err
+	}
+
+	var configData map[string]interface{}
+	var allNetworkInterfaceIPs []string
+
+	if configParamsYaml, ok := configMap.Data[DriverConfigParamsYaml]; ok {
+		err := yaml.Unmarshal([]byte(configParamsYaml), &configData)
+		if err != nil {
+			Log.Errorf("Failed to unmarshal the ConfigMap params: %v", err)
+			return []string{}, err
+		}
+
+		if interfaceNames, ok := configData["interfaceNames"].(map[string]interface{}); ok {
+			for _, ipAddressList := range interfaceNames {
+
+				ipAddresses := strings.Split(ipAddressList.(string), ",")
+				allNetworkInterfaceIPs = append(allNetworkInterfaceIPs, ipAddresses...)
+			}
+			return allNetworkInterfaceIPs, nil
+		}
+	}
+	return []string{}, fmt.Errorf("failed to get the Network Interface IPs")
+}
+
 func (s *service) ControllerPublishVolume(
 	ctx context.Context,
 	req *csi.ControllerPublishVolumeRequest) (
@@ -1241,15 +1288,24 @@ func (s *service) ControllerPublishVolume(
 				err.Error())
 		}
 
-		sdcIPs, err := s.getSDCIPs(nodeID, systemID)
-		if err != nil {
-			return nil, status.Errorf(codes.NotFound, "%s", err.Error())
-		} else if len(sdcIPs) == 0 {
-			return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
+		var ipAddresses []string
+
+		ipAddresses, err = s.findNetworkInterfaceIPs()
+		Log.Printf("ControllerPublish - No network interfaces found, trying to get SDC IPs")
+		if err != nil || len(ipAddresses) == 0 {
+
+			// get SDC IPs if Network Interface IPs not found
+			ipAddresses, err = s.getSDCIPs(nodeID, systemID)
+			if err != nil {
+				return nil, status.Errorf(codes.NotFound, "%s", err.Error())
+			} else if len(ipAddresses) == 0 {
+				return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
+			}
 		}
+		Log.Printf("ControllerPublish - ipAddresses %v", ipAddresses)
 
 		externalAccess := s.opts.ExternalAccess
-		publishContext["host"] = sdcIPs[0]
+		publishContext["host"] = ipAddresses[0]
 
 		fsc := req.GetVolumeCapability()
 		if fsc == nil {
@@ -1267,7 +1323,7 @@ func (s *service) ControllerPublishVolume(
 				errUnknownAccessMode)
 		}
 		// Export for NFS
-		resp, err := s.exportFilesystem(ctx, req, adminClient, fs, sdcIPs, externalAccess, nodeID, publishContext, am)
+		resp, err := s.exportFilesystem(ctx, req, adminClient, fs, ipAddresses, externalAccess, nodeID, publishContext, am)
 		return resp, err
 	}
 	volID := getVolumeIDFromCsiVolumeID(csiVolID)
@@ -1564,15 +1620,20 @@ func (s *service) ControllerUnpublishVolume(
 				err.Error())
 		}
 
-		sdcIPs, err := s.getSDCIPs(nodeID, systemID)
-		if err != nil {
-			return nil, status.Errorf(codes.NotFound, "%s", err.Error())
-		} else if len(sdcIPs) == 0 {
-			return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
+		var ipAddresses []string
+		ipAddresses, err = s.findNetworkInterfaceIPs()
+		if err != nil || len(ipAddresses) == 0 {
+
+			ipAddresses, err = s.getSDCIPs(nodeID, systemID)
+			if err != nil {
+				return nil, status.Errorf(codes.NotFound, "%s", err.Error())
+			} else if len(ipAddresses) == 0 {
+				return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
+			}
 		}
 
 		// unexport for NFS
-		err = s.unexportFilesystem(ctx, req, adminClient, fs, req.GetVolumeId(), sdcIPs, nodeID)
+		err = s.unexportFilesystem(ctx, req, adminClient, fs, req.GetVolumeId(), ipAddresses, nodeID)
 		if err != nil {
 			return nil, err
 		}

service/features/array-config/config

@@ -6,7 +6,7 @@
       "insecure": true,
       "isDefault": true,
       "systemID": "14dbbf5617523654",
-      "nasName": "dummy-name"
+      "nasName": "dummy-nas-server"
    },
    {
       "endpoint": "http://127.0.0.2",
@@ -16,6 +16,6 @@
       "isDefault": false,
       "systemID": "15dbbf5617523655",
       "AllSystemNames" : "15dbbf5617523655-previous-name",
-      "nasName": "dummy-name"
+      "nasName": "dummy-nas-server"
    }
 ]

service/features/array-config/config.2

@@ -6,7 +6,7 @@
       "insecure": true,
       "isDefault": true,
       "systemID": "14dbbf5617523654"
-      "nasName": "dummy-name"
+      "nasName": "dummy-nas-server"
    },
    {
       "endpoint": "http://127.0.0.2",
@@ -15,7 +15,7 @@
       "insecure": true,
       "isDefault": false,
       "systemID": "15dbbf5617523655"
-      "nasName": "dummy-name"
+      "nasName": "dummy-nas-server"
    },
    {
       "username": "admin",
@@ -24,6 +24,6 @@
       "endpoint": "https://1.2.3.4",
       "insecure": true,
       "isDefault": false
-      "nasName": "dummy-name"
+      "nasName": "dummy-nas-server"
    }
 ]

service/features/controller_publish_unpublish.feature

@@ -42,6 +42,18 @@ Feature: VxFlex OS CSI interface
     And I call UnpublishVolume nfs
     And no error was received
     Then a valid UnpublishVolumeResponse is returned
+
+  Scenario: a Basic NFS controller Publish and unpublish no error with SDC dependency
+    Given a VxFlexOS service
+    When I specify CreateVolumeMountRequest "nfs"
+    And I call CreateVolume "volume1"
+    Then a valid CreateVolumeResponse is returned
+    And I induce SDC dependency
+    And I call NFS PublishVolume with "single-writer"
+    Then a valid PublishVolumeResponse is returned
+    And I call UnpublishVolume nfs
+    And no error was received
+    Then a valid UnpublishVolumeResponse is returned
 
     Scenario: a Basic NFS controller Publish and unpublish NFS export not found error
     Given a VxFlexOS service
@@ -117,7 +129,7 @@ Feature: VxFlex OS CSI interface
     Then a valid PublishVolumeResponse is returned
     And I call NFS PublishVolume with "single-node-multi-writer"
     Then a valid PublishVolumeResponse is returned
-    
+
     Scenario: a Basic NFS controller Publish incompatible access mode error
     Given a VxFlexOS service
     When I specify CreateVolumeMountRequest "nfs"
@@ -259,7 +271,7 @@ Feature: VxFlex OS CSI interface
     And a valid volume
     When I call Probe
     And I call PublishVolume with <access>
-    Then the error contains "Expecting this volume id only on default system.  Aborting operation"
+    Then the error contains "expecting this volume id only on default system. aborting operation"
 
     Examples:
       | access                      |

service/features/csi_extension.feature

@@ -111,7 +111,7 @@ Examples:
     When I call Probe
     And I induce error "LegacyVolumeConflictError"
     And I call CreateVolumeSnapshotGroup
-    Then the error contains "Expecting this volume id only on default system"
+    Then the error contains "expecting this volume id only on default system"
 
   @vg
   Scenario: Snapshot a block volume consistency group with wrong system

service/features/replication.feature

@@ -31,7 +31,7 @@ Scenario Outline: Test CreateRemoteVolume
   | "sourcevol" | "PeerMdmError"               | "PeerMdmError"                      |
   | "sourcevol" | "CreateVolumeError"          | "create volume induced error"       |
   | "sourcevol" | "BadVolIDError"              | "failed to provide"                 |
-  | "sourcevol" | "BadRemoteSystemIDError"     | "System 15dbbf5617523655 not found" |
+  | "sourcevol" | "BadRemoteSystemIDError"     | "system 15dbbf5617523655 not found" |
   | "sourcevol" | "ProbePrimaryError"          | "PodmonControllerProbeError"        |
   | "sourcevol" | "ProbeSecondaryError"        | "PodmonControllerProbeError"        |