diff options
Diffstat (limited to 'cmd/govpp/main.go')
| -rw-r--r-- | cmd/govpp/main.go | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/cmd/govpp/main.go b/cmd/govpp/main.go index f1ad5d8..6deca09 100644 --- a/cmd/govpp/main.go +++ b/cmd/govpp/main.go @@ -28,11 +28,12 @@ import ( "strings" "text/tabwriter" - "git.fd.io/govpp.git" - "git.fd.io/govpp.git/adapter/socketclient" - "git.fd.io/govpp.git/binapi/vpe" - "git.fd.io/govpp.git/binapigen" - "git.fd.io/govpp.git/binapigen/vppapi" + "go.fd.io/govpp" + "go.fd.io/govpp/adapter/socketclient" + "go.fd.io/govpp/binapi/vlib" + "go.fd.io/govpp/binapi/vpe" + "go.fd.io/govpp/binapigen" + "go.fd.io/govpp/binapigen/vppapi" ) func main() { @@ -122,8 +123,8 @@ func showVPPAPI(out io.Writer, apifiles []*vppapi.File) { } imports := fmt.Sprintf("%d apis, %2d types", len(apifile.Imports), len(importedTypes)) path := strings.TrimPrefix(apifile.Path, vppapi.DefaultDir+"/") - types := fmt.Sprintf("%2d enum, %2d alias, %2d struct, %2d union, %2d msg", - len(apifile.EnumTypes), len(apifile.AliasTypes), len(apifile.StructTypes), len(apifile.UnionTypes), len(apifile.Messages)) + types := fmt.Sprintf("%2d enum, %2d enumflag, %2d alias, %2d struct, %2d union, %2d msg", + len(apifile.EnumTypes), len(apifile.EnumflagTypes), len(apifile.AliasTypes), len(apifile.StructTypes), len(apifile.UnionTypes), len(apifile.Messages)) fmt.Fprintf(w, " %s\t%s\t%s\t%s\t%v\t%s\t\n", apifile.Name, strings.Join(options, " "), apifile.CRC, path, imports, types) } @@ -154,8 +155,8 @@ func sendCLI(args []string) { log.Fatal(err) } - client := vpe.NewServiceClient(conn) - reply, err := client.CliInband(context.Background(), &vpe.CliInband{ + client := vlib.NewServiceClient(conn) + reply, err := client.CliInband(context.Background(), &vlib.CliInband{ Cmd: cmd, }) if err != nil { @@ -174,7 +175,7 @@ func runServer(apifiles []*vppapi.File, addr string) { } vpeRPC := vpe.NewServiceClient(conn) - c := vpe.RESTHandler(vpeRPC) + c := vpe.HTTPHandler(vpeRPC) http.Handle("/", c) |