[PWX-36749] Added pure_nfs_endpoint to PureFileSpec volume spec

Signed-off-by: Vinayak Shinde <[email protected]>
libopenstorage · Apr 15, 2024 · e006f0e · e006f0e
1 parent e80fd7f
commit e006f0e
Show file tree

Hide file tree

Showing 6 changed files with 5,603 additions and 5,568 deletions.
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.

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
@@ -648,6 +648,14 @@ 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{}
+			}
+			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,18 @@ 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)
+}
+
 func TestXattr(t *testing.T) {
 	testSpecOptString(t, api.SpecCowOnDemand, "true")