Merge pull request libopenstorage#2433 from libopenstorage/PWX-36749_…

…fbda_nfs_endpoints [PWX-36749] Added pure_nfs_endpoint to PureFileSpec volume spec
twang-ps · Apr 16, 2024 · ea7b5ba · ea7b5ba
2 parents e80fd7f + 96aaf79
commit ea7b5ba
Show file tree

Hide file tree

Showing 7 changed files with 5,630 additions and 5,573 deletions.
diff --git a/SDK_CHANGELOG.md b/SDK_CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Releases
 
+### v0.182.0 - (04/16/2024)
+
+* Added NFS Endpoint in volume spec
+
 ### v0.181.0 - (03/20/2024)
 
 * Add servers and APIs for defrag and schedule services

diff --git a/api/api.go b/api/api.go
@@ -108,6 +108,7 @@ const (
 	SpecBackendPureBlock                    = "pure_block"
 	SpecBackendPureFile                     = "pure_file"
 	SpecPureFileExportRules                 = "pure_export_rules"
+	SpecPureNFSEnpoint                      = "pure_nfs_endpoint"
 	SpecIoThrottleRdIOPS                    = "io_throttle_rd_iops"
 	SpecIoThrottleWrIOPS                    = "io_throttle_wr_iops"
 	SpecIoThrottleRdBW                      = "io_throttle_rd_bw"

diff --git a/api/api.pb.go b/api/api.pb.go
diff --git a/api/api.proto b/api/api.proto
@@ -415,6 +415,7 @@ message PureBlockSpec {
 message PureFileSpec {
   string export_rules = 1;
   string full_vol_name = 2;
+  string nfs_endpoint = 3;
 }
 
 // ProxySpec defines how this volume will reflect an external data source.
@@ -5849,7 +5850,7 @@ message SdkVersion {
     // SDK version major value of this specification
     Major = 0;
     // SDK version minor value of this specification
-    Minor = 181;
+    Minor = 182;
     // SDK version patch value of this specification
     Patch = 0;
   }

diff --git a/api/server/sdk/api/api.swagger.json b/api/server/sdk/api/api.swagger.json
diff --git a/api/spec/spec_handler.go b/api/spec/spec_handler.go
@@ -2,6 +2,7 @@ package spec
 
 import (
 	"fmt"
+	"net"
 	"regexp"
 	"strconv"
 	"strings"
@@ -648,6 +649,17 @@ func (d *specHandler) UpdateSpecFromOpts(opts map[string]string, spec *api.Volum
 				spec.ProxySpec.PureFileSpec = &api.PureFileSpec{}
 			}
 			spec.ProxySpec.PureFileSpec.ExportRules = v
+		case api.SpecPureNFSEnpoint:
+			if spec.ProxySpec == nil {
+				spec.ProxySpec = &api.ProxySpec{}
+			}
+			if spec.ProxySpec.PureFileSpec == nil {
+				spec.ProxySpec.PureFileSpec = &api.PureFileSpec{}
+			}
+			if net.ParseIP(v) == nil {
+				return nil, nil, nil, fmt.Errorf("invalid Pure NFS endpoint: %v", v)
+			}
+			spec.ProxySpec.PureFileSpec.NfsEndpoint = v
 		case api.SpecIoThrottleRdIOPS:
 			if spec.IoThrottle == nil {
 				spec.IoThrottle = &api.IoThrottle{}

diff --git a/api/spec/spec_handler_test.go b/api/spec/spec_handler_test.go
@@ -514,6 +514,32 @@ func TestPureBackendSpec(t *testing.T) {
 	require.Error(t, err, "Failed to parse backend parameter")
 }
 
+func TestPureNFSEndpoint(t *testing.T) {
+	nfsEndpoint := "10.68.101.80"
+	s := NewSpecHandler()
+	spec, _, _, err := s.SpecFromOpts(map[string]string{
+		api.SpecPureNFSEnpoint: nfsEndpoint,
+	})
+	require.NoError(t, err)
+	proxySpec := spec.GetProxySpec()
+	require.NotNil(t, proxySpec)
+	require.Equal(t, proxySpec.GetPureFileSpec().GetNfsEndpoint(), nfsEndpoint)
+
+	nfsEndpoint = ""
+	_, _, _, err = s.SpecFromOpts(map[string]string{
+		api.SpecPureNFSEnpoint: nfsEndpoint,
+	})
+	require.Error(t, err, "Failed to parse nfs endpoint parameter")
+	require.ErrorContains(t, err, "invalid Pure NFS endpoint")
+
+	nfsEndpoint = "abc"
+	_, _, _, err = s.SpecFromOpts(map[string]string{
+		api.SpecPureNFSEnpoint: nfsEndpoint,
+	})
+	require.Error(t, err, "Failed to parse nfs endpoint parameter")
+	require.ErrorContains(t, err, "invalid Pure NFS endpoint")
+}
+
 func TestXattr(t *testing.T) {
 	testSpecOptString(t, api.SpecCowOnDemand, "true")