default graph output in dot language to stdout

t1anz0ng · Aug 24, 2022 · 8806f00 · 8806f00
1 parent 60b872c
commit 8806f00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/cmd/iftree/main.go b/cmd/iftree/main.go
@@ -26,7 +26,7 @@ var (
 
 	oNotBridgedVeths = pflag.BoolP("all", "a", true, "show all veths, including not bridged.")
 	oGraph           = pflag.BoolP("graph", "g", false, "output in png by defaul")
-	oGraphType       = pflag.StringP("gtype", "T", "png", `graph output type, "jpg", "png", "svg", "dot"(graphviz dot language(https://graphviz.org/doc/info/lang.html)`)
+	oGraphType       = pflag.StringP("gtype", "T", "dot", `graph output type, "jpg", "png", "svg", "dot"(graphviz dot language(https://graphviz.org/doc/info/lang.html)`)
 	oGraphName       = pflag.StringP("output", "O", "output", "graph output name/path")
 
 	oTable = pflag.BoolP("table", "t", false, "output in table")

diff --git a/pkg/formatter/graph.go b/pkg/formatter/graph.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/awalterschulze/gographviz"
+	graph "github.com/awalterschulze/gographviz"
 	graphviz "github.com/goccy/go-graphviz"
 	log "github.com/sirupsen/logrus"
 
@@ -15,14 +15,14 @@ import (
 
 func GraphInDOT(m map[string][]pkg.Node, vpairs, los []pkg.Node, bm map[string]*net.IP) (string, error) {
 
-	root := gographviz.NewEscape()
+	root := graph.NewEscape()
 	if err := root.SetName("G"); err != nil {
 		return "", err
 	}
 	root.AddAttr("G", "layout", "fdp")    //nolint:errcheck
 	root.AddAttr("G", "splines", "ortho") //nolint:errcheck
 	root.AddAttr("G", "ratio", "0.7")     //nolint:errcheck
-	subGraphM := make(map[string]*gographviz.SubGraph)
+	subGraphM := make(map[string]*graph.SubGraph)
 
 	for bridge, v := range m {
 		labels := []string{bridge}
@@ -45,7 +45,7 @@ func GraphInDOT(m map[string][]pkg.Node, vpairs, los []pkg.Node, bm map[string]*
 				sub, ok := subGraphM[vp.NetNsName]
 				if !ok {
 					// init subgraph for netns
-					sub = gographviz.NewSubGraph(fmt.Sprintf("cluster%s%c", bridge, 'A'+i))
+					sub = graph.NewSubGraph(fmt.Sprintf("cluster%s%c", bridge, 'A'+i))
 					subGraphM[vp.NetNsName] = sub
 					attr := map[string]string{
 						"label":   fmt.Sprintf("NetNS\n%s", vp.NetNsName),