[PWX-36749] Bumped up SDK version and added NFS

endpoint IP format validation Signed-off-by: Vinayak Shinde <[email protected]>
twang-ps · Apr 16, 2024 · 96aaf79 · 96aaf79
1 parent e006f0e
commit 96aaf79
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 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.pb.go b/api/api.pb.go
diff --git a/api/api.proto b/api/api.proto
@@ -5850,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"
@@ -655,6 +656,9 @@ func (d *specHandler) UpdateSpecFromOpts(opts map[string]string, spec *api.Volum
 			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 {

diff --git a/api/spec/spec_handler_test.go b/api/spec/spec_handler_test.go
@@ -523,7 +523,21 @@ func TestPureNFSEndpoint(t *testing.T) {
 	require.NoError(t, err)
 	proxySpec := spec.GetProxySpec()
 	require.NotNil(t, proxySpec)
-	require.Equal(t, proxySpec.GetPureFileSpec().GetNFSEndpoint(), nfsEndpoint)
+	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) {