From 8b144029559ca8d0bd5653868694df46fa8545f9 Mon Sep 17 00:00:00 2001
From: Chakravarthy Nelluri <nelcyguy@gmail.com>
Date: Wed, 13 Dec 2017 01:12:06 -0500
Subject: [PATCH] Add some unit tests & improve logging

---
 app/nfsplugin/main.go | 11 +++++++++++
 pkg/nfs/README.md     |  4 ++--
 pkg/nfs/driver.go     |  8 +++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/nfsplugin/main.go b/app/nfsplugin/main.go
index e2af08d8..6b68e9a0 100644
--- a/app/nfsplugin/main.go
+++ b/app/nfsplugin/main.go
@@ -17,6 +17,7 @@ limitations under the License.
 package main
 
 import (
+	"flag"
 	"fmt"
 	"os"
 
@@ -30,7 +31,14 @@ var (
 	nodeID   string
 )
 
+func init() {
+	flag.Set("logtostderr", "true")
+}
+
 func main() {
+
+	flag.CommandLine.Parse([]string{})
+
 	cmd := &cobra.Command{
 		Use:   "NFS",
 		Short: "CSI based NFS driver",
@@ -39,12 +47,15 @@ func main() {
 		},
 	}
 
+	cmd.Flags().AddGoFlagSet(flag.CommandLine)
+
 	cmd.PersistentFlags().StringVar(&nodeID, "nodeid", "", "node id")
 	cmd.MarkPersistentFlagRequired("nodeid")
 
 	cmd.PersistentFlags().StringVar(&endpoint, "endpoint", "", "CSI endpoint")
 	cmd.MarkPersistentFlagRequired("endpoint")
 
+	cmd.ParseFlags(os.Args[1:])
 	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "%s", err.Error())
 		os.Exit(1)
diff --git a/pkg/nfs/README.md b/pkg/nfs/README.md
index 06e284c3..bb90b9dd 100644
--- a/pkg/nfs/README.md
+++ b/pkg/nfs/README.md
@@ -30,7 +30,7 @@ Please update the NFS Server & share information in nginx.yaml file.
 
 ### Start NFS driver
 ```
-$ sudo ../_output/nfsdriver --endpoint tcp://127.0.0.1:10000 --nodeid CSINode
+$ sudo ../../_output/flexadapter --endpoint tcp://127.0.0.1:10000 --drivername simplenfs --driverpath ./examples/simplenfs-flexdriver/driver/nfs --nodeid CSINode -v=3
 ```
 
 ## Test
@@ -52,7 +52,7 @@ $ csc identity supportedversions --endpoint tcp://127.0.0.1:10000
 ```
 $ export NFS_SERVER="Your Server IP (Ex: 10.10.10.10)"
 $ export NFS_SHARE="Your NFS share"
-$ csc node publishvolume --endpoint tcp://127.0.0.1:10000 --target-path /mnt/nfs --attrib server=$NFS_SERVER --attrib exportPath=$NFS_SHARE nfstestvol
+$ csc node publishvolume --endpoint tcp://127.0.0.1:10000 --target-path /mnt/nfs --attrib server=$NFS_SERVER --attrib share=$NFS_SHARE nfstestvol
 nfstestvol
 ```
 
diff --git a/pkg/nfs/driver.go b/pkg/nfs/driver.go
index 634d9b90..94408f48 100644
--- a/pkg/nfs/driver.go
+++ b/pkg/nfs/driver.go
@@ -70,8 +70,10 @@ func NewNodeServer(d *driver) *nodeServer {
 }
 
 func (d *driver) Run() {
-	csicommon.Serve(d.endpoint,
+	s := csicommon.NewNonBlockingGRPCServer()
+	s.Start(d.endpoint,
 		csicommon.NewDefaultIdentityServer(d.csiDriver),
-			csicommon.NewDefaultControllerServer(d.csiDriver),
-				NewNodeServer(d))
+		csicommon.NewDefaultControllerServer(d.csiDriver),
+		NewNodeServer(d))
+	s.Wait()
 }