Refactor netplugin CLI

This commit refactors netplugin CLI, it uses "github.com/urfave/cli"
now in order to provide configuration from CLI and environment vars,
and provides easy way to load from config files too.
In details, this commit introduced:
1. New configs for netmode and fwdmode settings, which needs to
match what in etcd;
2. Improved validation for all CLI/ENV inputs before
starting netplugin;
3. Removed requirement of running as root user, as long as the running
user has privilege to run ovs and most networking related CLIs, is good
enough;
4. Option "-cluster-store" has been reworked, replaced by "--etcd-endpoints"
and "--consul-endpoints", so that it will be easy to enable https endpoints
and adding more than one endpoints for HA;
5. Option "-config" which reads configuration from stdin has been removed,
it will soon be replaced by reading configuration from a real file instead;
6. Option "-debug" has been replaced by "--log-level", this will allow user
to set loglevel to higher level if doesn't want to use INFO level;
7. Option "-syslog" has been replaced by "--use-syslog" and "--syslog-url",
this will make it more clear on syslog settings and endpoint.
8. Removed Option "-net-driver", because netplugin currently only supports
OVS, will add it back when there are second backend type.
9. Rework state driver and objdb client, make them more flexible to support
multi-endpoints model of etcd and consul, and http/https as URL schema.
10. Updated testing cases in react of all above changes.

Signed-off-by: Wei Tie <[email protected]>

Author: Wei Tie

core/error.go

@@ -17,7 +17,6 @@ package core
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"runtime"
 	"strings"
@@ -38,17 +37,12 @@ type Error struct {
 // Error() allows *core.Error to present the `error` interface.
 func (e *Error) Error() string {
 	var ret string
+	ret = e.desc + "\n"
 
-	if os.Getenv("CONTIV_TRACE") != "" {
-		ret = e.desc + "\n"
-
-		for _, stack := range e.stack {
-			ret += fmt.Sprintf("%s [%s %d]\n", stack.fun, stack.file, stack.line)
-		}
-	} else {
-		ret = fmt.Sprintf("%s [%s %s %d]", e.desc, e.stack[0].fun, e.stack[0].file, e.stack[0].line)
+	// TODO: use github.com/pkg/errors
+	for _, stack := range e.stack {
+		ret += fmt.Sprintf("%s [%s %d]\n", stack.fun, stack.file, stack.line)
 	}
-
 	return ret
 }
 

core/error_test.go

@@ -2,7 +2,6 @@ package core
 
 import (
 	"fmt"
-	"os"
 	"strings"
 	"testing"
 )
@@ -12,12 +11,11 @@ func TestErrorStringFormat(t *testing.T) {
 	e := Errorf("%s", refStr)
 
 	fileName := "error_test.go"
-	lineNum := 12 // line number where error was formed
+	lineNum := 11 // line number where error was formed
 	funcName := "github.com/contiv/netplugin/core.TestErrorStringFormat"
 
-	expectedStr := fmt.Sprintf("%s [%s %s %d]", refStr, funcName, fileName, lineNum)
-
-	if e.Error() != expectedStr {
+	expectedStr := fmt.Sprintf("%s [%s %d]", funcName, fileName, lineNum)
+	if errMsg := strings.Split(e.Error(), "\n"); errMsg[0] != refStr || errMsg[1] != expectedStr {
 		t.Fatalf("error string mismatch. Expected: %q, got %q", expectedStr,
 			e.Error())
 	}
@@ -35,17 +33,6 @@ func TestErrorStackTrace(t *testing.T) {
 		t.Fatal("Description did not match provided")
 	}
 
-	fileName := "error_test.go"
-	lineNum := 27 // line number where error was formed
-	funcName := "github.com/contiv/netplugin/core.getError"
-
-	expectedStr := fmt.Sprintf("%s [%s %s %d]", msg, funcName, fileName, lineNum)
-
-	if e.Error() != expectedStr {
-		t.Fatalf("Error message yielded an incorrect result with CONTIV_TRACE unset: %s", e.Error())
-	}
-
-	os.Setenv("CONTIV_TRACE", "1")
 	if e.Error() == "an error\n" {
 		t.Fatal("Error message did not yield stack trace with CONTIV_TRACE set")
 	}

netplugin/agent/agent.go

@@ -50,7 +50,7 @@ func NewAgent(pluginConfig *plugin.Config) *Agent {
 	netPlugin := &plugin.NetPlugin{}
 
 	// init cluster state
-	err := cluster.Init(opts.DbURL)
+	err := cluster.Init(pluginConfig.Drivers.State, []string{opts.DbURL})
 	if err != nil {
 		log.Fatalf("Error initializing cluster. Err: %v", err)
 	}

netplugin/cluster/cluster.go

@@ -321,11 +321,11 @@ func GetLocalAddr() (string, error) {
 }
 
 // Init initializes the cluster module
-func Init(storeURL string) error {
+func Init(storeDriver string, storeURLs []string) error {
 	var err error
 
 	// Create an objdb client
-	ObjdbClient, err = objdb.NewClient(storeURL)
+	ObjdbClient, err = objdb.InitClient(storeDriver, storeURLs)
 
 	return err
 }