rename model.Model interface's Table func name, avoid conflict with sb

https://github.com/ovn-org/ovn/blob/686caaf66d5be811c655ea2938b082564d5f5f75/ovn-sb.ovsschema#L383

Signed-off-by: Yan Zhu <[email protected]>

.gitignore

@@ -60,4 +60,19 @@ Temporary Items
 *.cov
 example/vswitchd/ovs.ovsschema
 example/vswitchd/*.go
-!example/vswitchd/gen.go
+!example/vswitchd/gen.go
+example/vtep/vtep.ovsschema
+example/vtep/*.go
+!example/vtep/gen.go
+example/nb/ovn-nb.ovsschema
+example/nb/*.go
+!example/nb/gen.go
+example/sb/ovn-sb.ovsschema
+example/sb/*.go
+!example/sb/gen.go
+example/icnb/ovn-ic-nb.ovsschema
+example/icnb/*.go
+!example/icnb/gen.go
+example/icsb/ovn-ic-sb.ovsschema
+example/icsb/*.go
+!example/icsb/gen.go

Makefile

@@ -1,4 +1,5 @@
-OVS_VERSION ?= v2.16.0
+OVS_VERSION ?= v2.17.7
+OVN_VERSION ?= v22.03.4
 
 .PHONY: all
 all: lint build test integration-test coverage
@@ -9,12 +10,12 @@ modelgen:
 	@go build -v -o ./bin ./cmd/modelgen
 
 .PHONY: prebuild
-prebuild: modelgen ovsdb/serverdb/_server.ovsschema example/vswitchd/ovs.ovsschema
+prebuild: modelgen ovsdb/serverdb/_server.ovsschema example/vswitchd/ovs.ovsschema example/vtep/vtep.ovsschema example/nb/ovn-nb.ovsschema example/sb/ovn-sb.ovsschema example/icnb/ovn-ic-nb.ovsschema example/icsb/ovn-ic-sb.ovsschema
 	@echo "+ $@"
 	@go generate -v ./...
 
 .PHONY: build
-build: prebuild 
+build: prebuild
 	@echo "+ $@"
 	@go build -v ./...
 
@@ -56,3 +57,18 @@ ovsdb/serverdb/_server.ovsschema:
 
 example/vswitchd/ovs.ovsschema:
 	@curl -sSL https://raw.githubusercontent.com/openvswitch/ovs/${OVS_VERSION}/vswitchd/vswitch.ovsschema -o $@
+
+example/vtep/vtep.ovsschema:
+	@curl -sSL https://raw.githubusercontent.com/openvswitch/ovs/${OVS_VERSION}/vtep/vtep.ovsschema -o $@
+
+example/nb/ovn-nb.ovsschema:
+	@curl -sSL https://raw.githubusercontent.com/ovn-org/ovn/${OVN_VERSION}/ovn-nb.ovsschema -o $@
+
+example/sb/ovn-sb.ovsschema:
+	@curl -sSL https://raw.githubusercontent.com/ovn-org/ovn/${OVN_VERSION}/ovn-sb.ovsschema -o $@
+
+example/icnb/ovn-ic-nb.ovsschema:
+	@curl -sSL https://raw.githubusercontent.com/ovn-org/ovn/${OVN_VERSION}/ovn-ic-nb.ovsschema -o $@
+
+example/icsb/ovn-ic-sb.ovsschema:
+	@curl -sSL https://raw.githubusercontent.com/ovn-org/ovn/${OVN_VERSION}/ovn-ic-sb.ovsschema -o $@

cache/cache_test.go

@@ -24,7 +24,7 @@ type testModel struct {
 	Datapath *string  `ovsdb:"datapath"`
 }
 
-func (t *testModel) Table() string {
+func (t *testModel) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -379,7 +379,7 @@ type testModel1 struct {
 	Bar  map[string]string `ovsdb:"bar"`
 }
 
-func (t *testModel1) Table() string {
+func (t *testModel1) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -807,7 +807,7 @@ type testModel2 struct {
 	Baz  string            `ovsdb:"baz"`
 }
 
-func (t *testModel2) Table() string {
+func (t *testModel2) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -1058,7 +1058,7 @@ type testModel3 struct {
 	Bar  map[string]string `ovsdb:"bar"`
 }
 
-func (t *testModel3) Table() string {
+func (t *testModel3) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -1922,7 +1922,7 @@ type badModel struct {
 	Baz  string `ovsdb:"baz"`
 }
 
-func (b *badModel) Table() string {
+func (b *badModel) GetTableName() string {
 	return "bad"
 }
 
@@ -2156,7 +2156,7 @@ type testModel4 struct {
 	Baz  map[string]string `ovsdb:"baz"`
 }
 
-func (t *testModel4) Table() string {
+func (t *testModel4) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -2331,7 +2331,7 @@ type rowsByConditionTestModel struct {
 	Empty  string            `ovsdb:"empty"`
 }
 
-func (r *rowsByConditionTestModel) Table() string {
+func (r *rowsByConditionTestModel) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -2747,7 +2747,7 @@ type testDBModel struct {
 	Set  []string `ovsdb:"set"`
 }
 
-func (t *testDBModel) Table() string {
+func (t *testDBModel) GetTableName() string {
 	return "Open_vSwitch"
 }
 

client/api.go

@@ -549,7 +549,7 @@ func (a api) Wait(untilConFun ovsdb.WaitCondition, timeout *int, model model.Mod
 // getTableFromModel returns the table name from a Model object after performing
 // type verifications on the model
 func (a api) getTableFromModel(m model.Model) (string, error) {
-	table := m.Table()
+	table := m.GetTableName()
 	_, found := a.cache.DatabaseModel().Types()[table]
 	if table == "" || !found {
 		return "", &ErrWrongType{reflect.TypeOf(m), "Model not found in Database Model"}

client/api_test_model.go

@@ -123,12 +123,12 @@ type testLogicalSwitch struct {
 	Acls             []string          `ovsdb:"acls"`
 }
 
-// Table returns the table name. It's part of the Model interface
-func (*testLogicalSwitch) Table() string {
+// GetTableName returns the table name. It's part of the Model interface
+func (*testLogicalSwitch) GetTableName() string {
 	return "Logical_Switch"
 }
 
-//LogicalSwitchPort struct defines an object in Logical_Switch_Port table
+// LogicalSwitchPort struct defines an object in Logical_Switch_Port table
 type testLogicalSwitchPort struct {
 	UUID             string            `ovsdb:"_uuid"`
 	Up               *bool             `ovsdb:"up"`
@@ -148,8 +148,8 @@ type testLogicalSwitchPort struct {
 	ParentName       *string           `ovsdb:"parent_name"`
 }
 
-// Table returns the table name. It's part of the Model interface
-func (*testLogicalSwitchPort) Table() string {
+// GetTableName returns the table name. It's part of the Model interface
+func (*testLogicalSwitchPort) GetTableName() string {
 	return "Logical_Switch_Port"
 }
 

client/client_test.go

@@ -81,7 +81,7 @@ type Bridge struct {
 	STPEnable           bool              `ovsdb:"stp_enable"`
 }
 
-func (b *Bridge) Table() string {
+func (b *Bridge) GetTableName() string {
 	return "Bridge"
 }
 
@@ -107,7 +107,7 @@ type OpenvSwitch struct {
 	SystemVersion   *string           `ovsdb:"system_version"`
 }
 
-func (o *OpenvSwitch) Table() string {
+func (o *OpenvSwitch) GetTableName() string {
 	return "Open_vSwitch"
 }
 

cmd/stress/stress.go

@@ -29,7 +29,7 @@ type bridgeType struct {
 	Status      map[string]string `ovsdb:"status"`
 }
 
-func (b *bridgeType) Table() string {
+func (b *bridgeType) GetTableName() string {
 	return "Bridge"
 }
 
@@ -39,7 +39,7 @@ type ovsType struct {
 	Bridges []string `ovsdb:"bridges"`
 }
 
-func (o *ovsType) Table() string {
+func (o *ovsType) GetTableName() string {
 	return "Open_vSwitch"
 }
 

example/icnb/gen.go

@@ -0,0 +1,3 @@
+package icnb
+
+//go:generate ../../bin/modelgen --extended -p icnb -o . ovn-ic-nb.ovsschema

example/icsb/gen.go

@@ -0,0 +1,3 @@
+package icsb
+
+//go:generate ../../bin/modelgen --extended -p icsb -o . ovn-ic-sb.ovsschema

example/nb/gen.go

@@ -0,0 +1,3 @@
+package nb
+
+//go:generate ../../bin/modelgen --extended -p nb -o . ovn-nb.ovsschema

example/sb/gen.go

@@ -0,0 +1,3 @@
+package sb
+
+//go:generate ../../bin/modelgen --extended -p sb -o . ovn-sb.ovsschema

example/vtep/gen.go

@@ -0,0 +1,3 @@
+package vtep
+
+//go:generate ../../bin/modelgen --extended -p vtep -o . vtep.ovsschema

model/model.go

@@ -24,7 +24,7 @@ import (
 //		LoadBalancers []string          `ovsdb:"load_balancer"`
 //	}
 type Model interface {
-	Table() string
+	GetTableName() string
 }
 
 type CloneableModel interface {

model/model_test.go

@@ -14,7 +14,7 @@ type modelA struct {
 	UUID string `ovsdb:"_uuid"`
 }
 
-func (m *modelA) Table() string {
+func (m *modelA) GetTableName() string {
 	return "A"
 }
 
@@ -24,15 +24,15 @@ type modelB struct {
 	Bar string `ovsdb:"baz"`
 }
 
-func (m *modelB) Table() string {
+func (m *modelB) GetTableName() string {
 	return "B"
 }
 
 type modelInvalid struct {
 	Foo string
 }
 
-func (m *modelInvalid) Table() string {
+func (m *modelInvalid) GetTableName() string {
 	return "Invalid"
 }
 
@@ -107,7 +107,7 @@ type testTable struct {
 	AMap    map[string]string `ovsdb:"aMap"`
 }
 
-func (t *testTable) Table() string {
+func (t *testTable) GetTableName() string {
 	return "TestTable"
 }
 
@@ -454,3 +454,12 @@ func TestEqualViaComparable(t *testing.T) {
 	a.UID = "baz"
 	assert.False(t, Equal(a, b))
 }
+
+func TestGetTableName(t *testing.T) {
+	a := &testTable{}
+	func(a interface{}) {
+		m, ok := a.(Model)
+		assert.True(t, ok, "is not a model")
+		assert.Equal(t, m.GetTableName(), "TestTable")
+	}(a)
+}

modelgen/table.go

@@ -246,7 +246,7 @@ type {{ index . "StructName" }} struct {
 {{ end }}
 {{ template "extraFields" . }}
 }
-func (a *{{ index . "StructName" }}) Table() string {
+func (a *{{ index . "StructName" }}) GetTableName() string {
 	return {{ index . "StructName" }}Table
 }
 {{ template "postStructDefinitions" . }}