kubernetes-csi/csi-driver-nfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #18 from chakri-nelluri/test

Browse Source 
Add some unit tests & improve logging
This commit is contained in:
Chakravarthy Nelluri 2017-12-13 12:33:22 -05:00 committed by GitHub
commit 4de6602a9c
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/nfsplugin/main.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package main package main
import ( import (
"flag"
"fmt" "fmt"
"os" "os"
@ -30,7 +31,14 @@ var (
nodeID string nodeID string
) )
func init() {
flag.Set("logtostderr", "true")
}
func main() { func main() {
flag.CommandLine.Parse([]string{})
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "NFS", Use: "NFS",
Short: "CSI based NFS driver", Short: "CSI based NFS driver",
@ -39,12 +47,15 @@ func main() {
}, },
} }
cmd.Flags().AddGoFlagSet(flag.CommandLine)
cmd.PersistentFlags().StringVar(&nodeID, "nodeid", "", "node id") cmd.PersistentFlags().StringVar(&nodeID, "nodeid", "", "node id")
cmd.MarkPersistentFlagRequired("nodeid") cmd.MarkPersistentFlagRequired("nodeid")
cmd.PersistentFlags().StringVar(&endpoint, "endpoint", "", "CSI endpoint") cmd.PersistentFlags().StringVar(&endpoint, "endpoint", "", "CSI endpoint")
cmd.MarkPersistentFlagRequired("endpoint") cmd.MarkPersistentFlagRequired("endpoint")
cmd.ParseFlags(os.Args[1:])
if err := cmd.Execute(); err != nil { if err := cmd.Execute(); err != nil {
fmt.Fprintf(os.Stderr, "%s", err.Error()) fmt.Fprintf(os.Stderr, "%s", err.Error())
os.Exit(1) os.Exit(1)

4
pkg/nfs/README.md
View File

@ -30,7 +30,7 @@ Please update the NFS Server & share information in nginx.yaml file.
### Start NFS driver ### 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 ## 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_SERVER="Your Server IP (Ex: 10.10.10.10)"
$ export NFS_SHARE="Your NFS share" $ 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 nfstestvol
``` ```

8
pkg/nfs/driver.go
View File

@ -70,8 +70,10 @@ func NewNodeServer(d *driver) *nodeServer {
} }
func (d *driver) Run() { func (d *driver) Run() {
csicommon.Serve(d.endpoint, s := csicommon.NewNonBlockingGRPCServer()
s.Start(d.endpoint,
csicommon.NewDefaultIdentityServer(d.csiDriver), csicommon.NewDefaultIdentityServer(d.csiDriver),
csicommon.NewDefaultControllerServer(d.csiDriver), csicommon.NewDefaultControllerServer(d.csiDriver),
NewNodeServer(d)) NewNodeServer(d))
s.Wait()
} }