-
-
Notifications
You must be signed in to change notification settings - Fork 406
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
As a first step to enhance ovn support, autogenerate types based on a ovn schema file leveraging github.com/ovn-org/libovsdb new functionalities. By autogenerting this structs we are able to: - Use the same struct for both skydive and ovn decoding (removing copies) - Inspect every table in the database without writing any code - Support any OVN version without writing any code - Automatically detect the intrisic "links" between tables Signed-off-by: Adrian Moreno <[email protected]>
- Loading branch information
Showing
11 changed files
with
410 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| OVN_VERSION ?= branch-20.12 | ||
| SCHEMA_REMOTE_FILE = https://raw.githubusercontent.com/ovn-org/ovn/$(OVN_VERSION)/ovn-nb.ovsschema | ||
| MODEL_DIR = topology/probes/ovn/ovnmodel/ | ||
| GEN_DIR = topology/probes/ovn/ovnmetagen | ||
| GEN_BIN = $(GEN_DIR)/ovnmetagen | ||
| SCHEMA_FILE = $(MODEL_DIR)/ovn-nb.ovsschema | ||
|
|
||
|
|
||
| $(SCHEMA_FILE): | ||
| curl -o $@ $(SCHEMA_REMOTE_FILE) | ||
|
|
||
| $(GEN_BIN): | ||
| go build -o $(GEN_DIR) ./$(GEN_DIR) | ||
|
|
||
| .PHONY: .ovnmodel | ||
| .ovnmodel: $(SCHEMA_FILE) $(GEN_BIN) | ||
| # TODO: add WITH_OVN flag | ||
| #ifeq ($(WITH_OVN), true) | ||
| go generate -tags "${BUILD_TAGS}" topology/probes/ovn/ovnmodel/gen.go | ||
| #endif | ||
|
|
||
| .PHONY: .ovnmodel.clean | ||
| .ovnmodel.clean: | ||
| @grep -r 'generated by ovnmetagen' $(MODEL_DIR) | cut -d: -f 1 | xargs rm -f | ||
| @rm -f $(SCHEMA_FILE) | ||
| @rm -f $(GEN_BIN) | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "flag" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "log" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/ovn-org/libovsdb/modelgen" | ||
| "github.com/ovn-org/libovsdb/ovsdb" | ||
| ) | ||
|
|
||
| func usage() { | ||
| fmt.Fprintf(os.Stderr, "Usage of ovnmetagen:\n") | ||
| fmt.Fprintf(os.Stderr, "\tovnmetagen [flags] OVS_SCHEMA\n") | ||
| fmt.Fprintf(os.Stderr, "Flags:\n") | ||
| flag.PrintDefaults() | ||
| } | ||
|
|
||
| var ( | ||
| outDirP = flag.String("o", ".", "Directory where the generated files shall be stored") | ||
| pkgNameP = flag.String("p", "ovsmodel", "Package name") | ||
| dryRun = flag.Bool("d", false, "Dry run") | ||
| ) | ||
|
|
||
| func main() { | ||
| log.SetFlags(0) | ||
| log.SetPrefix("ovnmetagen: ") | ||
| flag.Usage = usage | ||
| flag.Parse() | ||
| outDir := *outDirP | ||
| pkgName := *pkgNameP | ||
|
|
||
| outDir, err := filepath.Abs(outDir) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| if err := os.MkdirAll(outDir, 0755); err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| if len(flag.Args()) != 1 { | ||
| flag.Usage() | ||
| os.Exit(2) | ||
| } | ||
|
|
||
| schemaFile, err := os.Open(flag.Args()[0]) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| defer schemaFile.Close() | ||
|
|
||
| schemaBytes, err := ioutil.ReadAll(schemaFile) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| var dbSchema ovsdb.DatabaseSchema | ||
| if err := json.Unmarshal(schemaBytes, &dbSchema); err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| generator := modelgen.NewGenerator(*dryRun) | ||
|
|
||
| for name := range dbSchema.Tables { | ||
| templ, data := tableTemplate(pkgName, name, &dbSchema) | ||
| err := generator.Generate(modelgen.FileName(name), templ, data) | ||
| if err != nil { | ||
| log.Printf("Error creating table template: %s", name) | ||
| log.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| dbTempl, dbData := modelTemplate(pkgName, &dbSchema) | ||
| if err != nil { | ||
| log.Print("Error creating DBModel template") | ||
| log.Fatal(err) | ||
| } | ||
| err = generator.Generate("model.go", dbTempl, dbData) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
|
|
||
| linksTempl, lData := linksTemplate(pkgName, &dbSchema) | ||
| if err != nil { | ||
| log.Print("Error creating links template") | ||
| log.Fatal(err) | ||
| } | ||
| err = generator.Generate("links.go", linksTempl, lData) | ||
| if err != nil { | ||
| log.Fatal(err) | ||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.