@@ -22,10 +22,8 @@ import (
2222
2323 csi "github.com/container-storage-interface/spec/lib/go/csi"
2424 "github.com/golang/glog"
25- "github.com/opensds/nbp/csi/server/plugin"
26- "github.com/opensds/nbp/csi/server/plugin/opensds"
25+ plugin "github.com/opensds/nbp/csi/server/plugin/opensds"
2726 "github.com/opensds/nbp/csi/util"
28- "github.com/spf13/cobra"
2927 "google.golang.org/grpc"
3028 "google.golang.org/grpc/reflection"
3129
@@ -34,76 +32,45 @@ import (
3432 _ "github.com/opensds/opensds/contrib/connector/rbd"
3533)
3634
37- var (
38- csiEndpoint string
39- opensdsEndpoint string
40- opensdsAuthStrategy string
41- )
42-
43- func init () {
44- flag .Set ("alsologtostderr" , "true" )
45- }
46-
4735func main () {
48-
49- flag .CommandLine .Parse ([]string {})
36+ flag .Set ("alsologtostderr" , "true" )
5037 // Open OpenSDS dock service log file.
5138 util .InitLogs ()
5239 defer util .FlushLogs ()
5340
54- cmd := & cobra.Command {
55- Use : "OpenSDS" ,
56- Short : "CSI based OpenSDS driver" ,
57- Run : func (cmd * cobra.Command , args []string ) {
58- handle ()
59- },
60- }
41+ var csiEndpoint , opensdsEndpoint , opensdsAuthStrategy string
42+ // CSI endpoint
43+ flag .StringVar (& csiEndpoint , "csiEndpoint" , util .CSIDefaultEndpoint , "CSI Endpoint" )
6144
62- // the endpoint variable priority is flag, ENV and default.
63- cmd . Flags (). AddGoFlagSet ( flag . CommandLine )
45+ // opensds endpoint
46+ flag . StringVar ( & opensdsEndpoint , "opensdsEndpoint" , util . OpensdsDefaultEndpoint , "OpenSDS Endpoint" )
6447
65- csiEp := util .CSIDefaultEndpoint
66- opensdsEp := util .OpensdsDefaultEndpoint
67- if ep , ok := os .LookupEnv (util .CSIEndpoint ); ok {
68- csiEp = ep
69- }
70- if ep , ok := os .LookupEnv (util .OpensdsEndpoint ); ok {
71- opensdsEp = ep
72- }
73- cmd .PersistentFlags ().StringVar (& csiEndpoint , "csiEndpoint" , csiEp , "CSI Endpoint" )
74- cmd .PersistentFlags ().StringVar (& opensdsEndpoint , "opensdsEndpoint" , opensdsEp , "OpenSDS Endpoint" )
75- cmd .PersistentFlags ().StringVar (& opensdsAuthStrategy , "opensdsAuthStrategy" , "" , "OpenSDS Auth Strategy" )
48+ // opensds auth strategy
49+ flag .StringVar (& opensdsAuthStrategy , "opensdsAuthStrategy" , util .OpensdsDefaultAuthStrategy , "OpenSDS Auth Strategy" )
7650
77- cmd .ParseFlags (os .Args [1 :])
78- if err := cmd .Execute (); err != nil {
79- glog .Errorf ("failed to execute: %v" , err )
80- os .Exit (1 )
81- }
82-
83- os .Exit (0 )
84- }
85-
86- func handle () {
87-
88- // Set Env
89- os .Setenv (util .OpensdsEndpoint , opensdsEndpoint )
90- os .Setenv (util .OpensdsAuthStrategy , opensdsAuthStrategy )
51+ flag .Parse ()
9152
9253 // Get CSI Endpoint Listener
9354 lis , err := util .GetCSIEndPointListener (csiEndpoint )
9455 if err != nil {
9556 glog .Errorf ("failed to listen: %v" , err )
57+ os .Exit (1 )
58+ }
59+
60+ // Initialize the driver
61+ pluginServer , err := plugin .NewServer (opensdsEndpoint , opensdsAuthStrategy )
62+ if err != nil {
63+ glog .Errorf ("failed to initialize the driver: %v" , err )
64+ os .Exit (1 )
9665 }
9766
9867 // New Grpc Server
9968 s := grpc .NewServer ()
10069
10170 // Register CSI Service
102- var defaultplugin plugin.Service = & opensds.Plugin {}
103- conServer := & server {plugin : defaultplugin }
104- csi .RegisterIdentityServer (s , conServer )
105- csi .RegisterControllerServer (s , conServer )
106- csi .RegisterNodeServer (s , conServer )
71+ csi .RegisterIdentityServer (s , pluginServer )
72+ csi .RegisterControllerServer (s , pluginServer )
73+ csi .RegisterNodeServer (s , pluginServer )
10774
10875 // Register reflection Service
10976 reflection .Register (s )
0 commit comments