diff options
author | Ondrej Fabry <ofabry@cisco.com> | 2020-07-17 10:36:28 +0200 |
---|---|---|
committer | Ondrej Fabry <ofabry@cisco.com> | 2020-07-17 11:43:41 +0200 |
commit | d1f24d37bd447b64e402298bb8eb2479681facf9 (patch) | |
tree | a3fc21ba730a91d8a402c7a5bf9c614e3677c4fc /binapigen/vppapi/parser.go | |
parent | 1548c7e12531e3d055567d761c580a1c7ff0ac40 (diff) |
Improve binapi generator
- simplified Size/Marshal/Unmarshal methods
- replace struc in unions with custom marshal/unmarshal
- fix imports in generated files
- fix mock adapter
- generate rpc service using low-level stream API (dumps generate control ping or stream msg..)
- move examples/binapi to binapi and generate all API for latest release
- add binapigen.Plugin for developing custom generator plugins
- optionally generate HTTP handlers (REST API) for RPC services
- add govpp program for browsing VPP API
Change-Id: I092e9ed2b0c17972b3476463c3d4b14dd76ed42b
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
Diffstat (limited to 'binapigen/vppapi/parser.go')
-rw-r--r-- | binapigen/vppapi/parser.go | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/binapigen/vppapi/parser.go b/binapigen/vppapi/parser.go deleted file mode 100644 index 312dd0e..0000000 --- a/binapigen/vppapi/parser.go +++ /dev/null @@ -1,111 +0,0 @@ -// Copyright (c) 2020 Cisco and/or its affiliates. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at: -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package vppapi - -import ( - "fmt" - "io/ioutil" - "path/filepath" - "strings" - - "github.com/sirupsen/logrus" -) - -const ( - DefaultAPIDir = "/usr/share/vpp/api" -) - -const apifileSuffixJson = ".api.json" - -// FindFiles returns all input files located in specified directory -func FindFiles(dir string, deep int) (paths []string, err error) { - entries, err := ioutil.ReadDir(dir) - if err != nil { - return nil, fmt.Errorf("reading directory %s failed: %v", dir, err) - } - for _, e := range entries { - if e.IsDir() && deep > 0 { - nestedDir := filepath.Join(dir, e.Name()) - if nested, err := FindFiles(nestedDir, deep-1); err != nil { - return nil, err - } else { - paths = append(paths, nested...) - } - } else if strings.HasSuffix(e.Name(), apifileSuffixJson) { - paths = append(paths, filepath.Join(dir, e.Name())) - } - } - return paths, nil -} - -func Parse() ([]*File, error) { - return ParseDir(DefaultAPIDir) -} - -func ParseDir(apidir string) ([]*File, error) { - files, err := FindFiles(apidir, 1) - if err != nil { - return nil, err - } - - logrus.Infof("found %d files in API dir %q", len(files), apidir) - - var modules []*File - - for _, file := range files { - module, err := ParseFile(file) - if err != nil { - return nil, err - } - modules = append(modules, module) - } - - return modules, nil -} - -// ParseFile parses API file contents and returns File. -func ParseFile(apifile string) (*File, error) { - if !strings.HasSuffix(apifile, apifileSuffixJson) { - return nil, fmt.Errorf("unsupported file format: %q", apifile) - } - - data, err := ioutil.ReadFile(apifile) - if err != nil { - return nil, fmt.Errorf("reading file %s failed: %v", apifile, err) - } - - base := filepath.Base(apifile) - name := base[:strings.Index(base, ".")] - - logf("parsing file %q", base) - - module, err := ParseRaw(data) - if err != nil { - return nil, fmt.Errorf("parsing file %s failed: %v", base, err) - } - module.Name = name - module.Path = apifile - - return module, nil -} - -func ParseRaw(data []byte) (file *File, err error) { - file, err = parseJSON(data) - if err != nil { - return nil, err - } - - return file, nil -} |