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

halfcrazy · halfcrazy · commit 5e3aade9379d · 2023-09-28T09:25:47.000+08:00
https://github.com/ovn-org/ovn/blob/686caaf66d5be811c655ea2938b082564d5f5f75/ovn-sb.ovsschema#L383 Signed-off-by: Yan Zhu <hackzhuyan@gmail.com>
diff --git a/cache/cache_test.go b/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"
 }
 
diff --git a/client/api.go b/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()
 	if table == "" {
 		return "", &ErrWrongType{reflect.TypeOf(m), "Model not found in Database Model"}
 	}
diff --git a/client/api_test_model.go b/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"
 }
 
diff --git a/client/client_test.go b/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"
 }
 
diff --git a/cmd/stress/stress.go b/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"
 }
 
diff --git a/model/model.go b/model/model.go
@@ -24,7 +24,7 @@ import (
 //		LoadBalancers []string          `ovsdb:"load_balancer"`
 //	}
 type Model interface {
-	Table() string
+	GetTableName() string
 }
 
 type CloneableModel interface {
diff --git a/model/model_test.go b/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)
+}
diff --git a/modelgen/table.go b/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" . }}
diff --git a/modelgen/table_test.go b/modelgen/table_test.go
@@ -81,7 +81,7 @@ type AtomicTable struct {
 	Str       string               ` + "`" + `ovsdb:"str"` + "`" + `
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 `,
@@ -108,7 +108,7 @@ type AtomicTable struct {
 	Str       string  ` + "`" + `ovsdb:"str"` + "`" + `
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 `,
@@ -160,7 +160,7 @@ type AtomicTable struct {
 	OtherStr       string
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 `,
@@ -201,7 +201,7 @@ type AtomicTable struct {
 	Str       string               ` + "`" + `ovsdb:"str"` + "`" + `
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 
@@ -370,7 +370,7 @@ type AtomicTable struct {
 	OtherStr       string
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 
@@ -503,7 +503,7 @@ type AtomicTable struct {
 	Str       string  ` + "`" + `ovsdb:"str"` + "`" + `
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 
@@ -630,7 +630,7 @@ type AtomicTable struct {
 	Str       string               ` + "`" + `ovsdb:"str"` + "`" + `
 }
 
-func (a *AtomicTable) Table() string {
+func (a *AtomicTable) GetTableName() string {
 	return AtomicTableTable
 }
 
@@ -1020,3 +1020,12 @@ func BenchmarkDeepEqual(b *testing.B) {
 		})
 	}
 }
+
+func TestGetTableName(t *testing.T) {
+	bridge := &vswitchd.Bridge{}
+	func(bridge interface{}) {
+		b, ok := bridge.(model.Model)
+		assert.True(t, ok, "is not a model")
+		assert.Equal(t, b.GetTableName(), "Bridge")
+	}(bridge)
+}
diff --git a/ovsdb/serverdb/database.go b/ovsdb/serverdb/database.go
diff --git a/test/ovs/ovs_integration_test.go b/test/ovs/ovs_integration_test.go
@@ -166,7 +166,7 @@ type bridgeType struct {
 	DatapathID     *string           `ovsdb:"datapath_id"`
 }
 
-func (b *bridgeType) Table() string {
+func (b *bridgeType) GetTableName() string {
 	return "Bridge"
 }
 
@@ -192,7 +192,7 @@ type ovsType struct {
 	SystemVersion   *string           `ovsdb:"system_version"`
 }
 
-func (o *ovsType) Table() string {
+func (o *ovsType) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -202,7 +202,7 @@ type ipfixType struct {
 	Targets []string `ovsdb:"targets"`
 }
 
-func (i *ipfixType) Table() string {
+func (i *ipfixType) GetTableName() string {
 	return "IPFIX"
 }
 
@@ -212,7 +212,7 @@ type queueType struct {
 	DSCP *int   `ovsdb:"dscp"`
 }
 
-func (q *queueType) Table() string {
+func (q *queueType) GetTableName() string {
 	return "Queue"
 }
 
diff --git a/test/test_data.go b/test/test_data.go
@@ -144,7 +144,7 @@ type BridgeType struct {
 	Status       map[string]string `ovsdb:"status"`
 }
 
-func (b *BridgeType) Table() string {
+func (b *BridgeType) GetTableName() string {
 	return "Bridge"
 }
 
@@ -154,7 +154,7 @@ type OvsType struct {
 	Bridges []string `ovsdb:"bridges"`
 }
 
-func (o *OvsType) Table() string {
+func (o *OvsType) GetTableName() string {
 	return "Open_vSwitch"
 }
 
@@ -166,7 +166,7 @@ type FlowSampleCollectorSetType struct {
 	IPFIX       *string           // `ovsdb:"ipfix"`
 }
 
-func (f *FlowSampleCollectorSetType) Table() string {
+func (f *FlowSampleCollectorSetType) GetTableName() string {
 	return "FlowSampleCollectorSet"
 }
 

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ type testModel struct {`
`24`	`24`	Datapath *string `ovsdb:"datapath"`
`25`	`25`	`}`
`26`	`26`
`27`		`-func (t *testModel) Table() string {`
	`27`	`+func (t *testModel) GetTableName() string {`
`28`	`28`	`return "Open_vSwitch"`
`29`	`29`	`}`
`30`	`30`
`@@ -379,7 +379,7 @@ type testModel1 struct {`
`379`	`379`	Bar map[string]string `ovsdb:"bar"`
`380`	`380`	`}`
`381`	`381`
`382`		`-func (t *testModel1) Table() string {`
	`382`	`+func (t *testModel1) GetTableName() string {`
`383`	`383`	`return "Open_vSwitch"`
`384`	`384`	`}`
`385`	`385`
`@@ -807,7 +807,7 @@ type testModel2 struct {`
`807`	`807`	Baz string `ovsdb:"baz"`
`808`	`808`	`}`
`809`	`809`
`810`		`-func (t *testModel2) Table() string {`
	`810`	`+func (t *testModel2) GetTableName() string {`
`811`	`811`	`return "Open_vSwitch"`
`812`	`812`	`}`
`813`	`813`
`@@ -1058,7 +1058,7 @@ type testModel3 struct {`
`1058`	`1058`	Bar map[string]string `ovsdb:"bar"`
`1059`	`1059`	`}`
`1060`	`1060`
`1061`		`-func (t *testModel3) Table() string {`
	`1061`	`+func (t *testModel3) GetTableName() string {`
`1062`	`1062`	`return "Open_vSwitch"`
`1063`	`1063`	`}`
`1064`	`1064`
`@@ -1922,7 +1922,7 @@ type badModel struct {`
`1922`	`1922`	Baz string `ovsdb:"baz"`
`1923`	`1923`	`}`
`1924`	`1924`
`1925`		`-func (b *badModel) Table() string {`
	`1925`	`+func (b *badModel) GetTableName() string {`
`1926`	`1926`	`return "bad"`
`1927`	`1927`	`}`
`1928`	`1928`
`@@ -2156,7 +2156,7 @@ type testModel4 struct {`
`2156`	`2156`	Baz map[string]string `ovsdb:"baz"`
`2157`	`2157`	`}`
`2158`	`2158`
`2159`		`-func (t *testModel4) Table() string {`
	`2159`	`+func (t *testModel4) GetTableName() string {`
`2160`	`2160`	`return "Open_vSwitch"`
`2161`	`2161`	`}`
`2162`	`2162`
`@@ -2331,7 +2331,7 @@ type rowsByConditionTestModel struct {`
`2331`	`2331`	Empty string `ovsdb:"empty"`
`2332`	`2332`	`}`
`2333`	`2333`
`2334`		`-func (r *rowsByConditionTestModel) Table() string {`
	`2334`	`+func (r *rowsByConditionTestModel) GetTableName() string {`
`2335`	`2335`	`return "Open_vSwitch"`
`2336`	`2336`	`}`
`2337`	`2337`
`@@ -2747,7 +2747,7 @@ type testDBModel struct {`
`2747`	`2747`	Set []string `ovsdb:"set"`
`2748`	`2748`	`}`
`2749`	`2749`
`2750`		`-func (t *testDBModel) Table() string {`
	`2750`	`+func (t *testDBModel) GetTableName() string {`
`2751`	`2751`	`return "Open_vSwitch"`
`2752`	`2752`	`}`
`2753`	`2753`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ func (a api) Wait(untilConFun ovsdb.WaitCondition, timeout *int, model model.Mod`
`549`	`549`	`// getTableFromModel returns the table name from a Model object after performing`
`550`	`550`	`// type verifications on the model`
`551`	`551`	`func (a api) getTableFromModel(m model.Model) (string, error) {`
`552`		`- table := m.Table()`
	`552`	`+ table := m.GetTableName()`
`553`	`553`	`if table == "" {`
`554`	`554`	`return "", &ErrWrongType{reflect.TypeOf(m), "Model not found in Database Model"}`
`555`	`555`	`}`
Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,12 @@ type testLogicalSwitch struct {`
`123`	`123`	Acls []string `ovsdb:"acls"`
`124`	`124`	`}`
`125`	`125`
`126`		`-// Table returns the table name. It's part of the Model interface`
`127`		`-func (*testLogicalSwitch) Table() string {`
	`126`	`+// GetTableName returns the table name. It's part of the Model interface`
	`127`	`+func (*testLogicalSwitch) GetTableName() string {`
`128`	`128`	`return "Logical_Switch"`
`129`	`129`	`}`
`130`	`130`
`131`		`-//LogicalSwitchPort struct defines an object in Logical_Switch_Port table`
	`131`	`+// LogicalSwitchPort struct defines an object in Logical_Switch_Port table`
`132`	`132`	`type testLogicalSwitchPort struct {`
`133`	`133`	UUID string `ovsdb:"_uuid"`
`134`	`134`	Up *bool `ovsdb:"up"`
`@@ -148,8 +148,8 @@ type testLogicalSwitchPort struct {`
`148`	`148`	ParentName *string `ovsdb:"parent_name"`
`149`	`149`	`}`
`150`	`150`
`151`		`-// Table returns the table name. It's part of the Model interface`
`152`		`-func (*testLogicalSwitchPort) Table() string {`
	`151`	`+// GetTableName returns the table name. It's part of the Model interface`
	`152`	`+func (*testLogicalSwitchPort) GetTableName() string {`
`153`	`153`	`return "Logical_Switch_Port"`
`154`	`154`	`}`
`155`	`155`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ type Bridge struct {`
`81`	`81`	STPEnable bool `ovsdb:"stp_enable"`
`82`	`82`	`}`
`83`	`83`
`84`		`-func (b *Bridge) Table() string {`
	`84`	`+func (b *Bridge) GetTableName() string {`
`85`	`85`	`return "Bridge"`
`86`	`86`	`}`
`87`	`87`
`@@ -107,7 +107,7 @@ type OpenvSwitch struct {`
`107`	`107`	SystemVersion *string `ovsdb:"system_version"`
`108`	`108`	`}`
`109`	`109`
`110`		`-func (o *OpenvSwitch) Table() string {`
	`110`	`+func (o *OpenvSwitch) GetTableName() string {`
`111`	`111`	`return "Open_vSwitch"`
`112`	`112`	`}`
`113`	`113`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type bridgeType struct {`
`29`	`29`	Status map[string]string `ovsdb:"status"`
`30`	`30`	`}`
`31`	`31`
`32`		`-func (b *bridgeType) Table() string {`
	`32`	`+func (b *bridgeType) GetTableName() string {`
`33`	`33`	`return "Bridge"`
`34`	`34`	`}`
`35`	`35`
`@@ -39,7 +39,7 @@ type ovsType struct {`
`39`	`39`	Bridges []string `ovsdb:"bridges"`
`40`	`40`	`}`
`41`	`41`
`42`		`-func (o *ovsType) Table() string {`
	`42`	`+func (o *ovsType) GetTableName() string {`
`43`	`43`	`return "Open_vSwitch"`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	// LoadBalancers []string `ovsdb:"load_balancer"`
`25`	`25`	`// }`
`26`	`26`	`type Model interface {`
`27`		`- Table() string`
	`27`	`+ GetTableName() string`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`type CloneableModel interface {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type modelA struct {`
`14`	`14`	UUID string `ovsdb:"_uuid"`
`15`	`15`	`}`
`16`	`16`
`17`		`-func (m *modelA) Table() string {`
	`17`	`+func (m *modelA) GetTableName() string {`
`18`	`18`	`return "A"`
`19`	`19`	`}`
`20`	`20`
`@@ -24,15 +24,15 @@ type modelB struct {`
`24`	`24`	Bar string `ovsdb:"baz"`
`25`	`25`	`}`
`26`	`26`
`27`		`-func (m *modelB) Table() string {`
	`27`	`+func (m *modelB) GetTableName() string {`
`28`	`28`	`return "B"`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`type modelInvalid struct {`
`32`	`32`	`Foo string`
`33`	`33`	`}`
`34`	`34`
`35`		`-func (m *modelInvalid) Table() string {`
	`35`	`+func (m *modelInvalid) GetTableName() string {`
`36`	`36`	`return "Invalid"`
`37`	`37`	`}`
`38`	`38`
`@@ -107,7 +107,7 @@ type testTable struct {`
`107`	`107`	AMap map[string]string `ovsdb:"aMap"`
`108`	`108`	`}`
`109`	`109`
`110`		`-func (t *testTable) Table() string {`
	`110`	`+func (t *testTable) GetTableName() string {`
`111`	`111`	`return "TestTable"`
`112`	`112`	`}`
`113`	`113`
`@@ -454,3 +454,12 @@ func TestEqualViaComparable(t *testing.T) {`
`454`	`454`	`a.UID = "baz"`
`455`	`455`	`assert.False(t, Equal(a, b))`
`456`	`456`	`}`
	`457`	`+`
	`458`	`+func TestGetTableName(t *testing.T) {`
	`459`	`+ a := &testTable{}`
	`460`	`+ func(a interface{}) {`
	`461`	`+ m, ok := a.(Model)`
	`462`	`+ assert.True(t, ok, "is not a model")`
	`463`	`+ assert.Equal(t, m.GetTableName(), "TestTable")`
	`464`	`+ }(a)`
	`465`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ type {{ index . "StructName" }} struct {`
`246`	`246`	`{{ end }}`
`247`	`247`	`{{ template "extraFields" . }}`
`248`	`248`	`}`
`249`		`-func (a *{{ index . "StructName" }}) Table() string {`
	`249`	`+func (a *{{ index . "StructName" }}) GetTableName() string {`
`250`	`250`	`return {{ index . "StructName" }}Table`
`251`	`251`	`}`
`252`	`252`	`{{ template "postStructDefinitions" . }}`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ type AtomicTable struct {`
`81`	`81`	Str string ` + "`" + `ovsdb:"str"` + "`" + `
`82`	`82`	`}`
`83`	`83`
`84`		`-func (a *AtomicTable) Table() string {`
	`84`	`+func (a *AtomicTable) GetTableName() string {`
`85`	`85`	`return AtomicTableTable`
`86`	`86`	`}`
`87`	`87`	`,
`@@ -108,7 +108,7 @@ type AtomicTable struct {`
`108`	`108`	Str string ` + "`" + `ovsdb:"str"` + "`" + `
`109`	`109`	`}`
`110`	`110`
`111`		`-func (a *AtomicTable) Table() string {`
	`111`	`+func (a *AtomicTable) GetTableName() string {`
`112`	`112`	`return AtomicTableTable`
`113`	`113`	`}`
`114`	`114`	`,
`@@ -160,7 +160,7 @@ type AtomicTable struct {`
`160`	`160`	`OtherStr string`
`161`	`161`	`}`
`162`	`162`
`163`		`-func (a *AtomicTable) Table() string {`
	`163`	`+func (a *AtomicTable) GetTableName() string {`
`164`	`164`	`return AtomicTableTable`
`165`	`165`	`}`
`166`	`166`	`,
`@@ -201,7 +201,7 @@ type AtomicTable struct {`
`201`	`201`	Str string ` + "`" + `ovsdb:"str"` + "`" + `
`202`	`202`	`}`
`203`	`203`
`204`		`-func (a *AtomicTable) Table() string {`
	`204`	`+func (a *AtomicTable) GetTableName() string {`
`205`	`205`	`return AtomicTableTable`
`206`	`206`	`}`
`207`	`207`
`@@ -370,7 +370,7 @@ type AtomicTable struct {`
`370`	`370`	`OtherStr string`
`371`	`371`	`}`
`372`	`372`
`373`		`-func (a *AtomicTable) Table() string {`
	`373`	`+func (a *AtomicTable) GetTableName() string {`
`374`	`374`	`return AtomicTableTable`
`375`	`375`	`}`
`376`	`376`
`@@ -503,7 +503,7 @@ type AtomicTable struct {`
`503`	`503`	Str string ` + "`" + `ovsdb:"str"` + "`" + `
`504`	`504`	`}`
`505`	`505`
`506`		`-func (a *AtomicTable) Table() string {`
	`506`	`+func (a *AtomicTable) GetTableName() string {`
`507`	`507`	`return AtomicTableTable`
`508`	`508`	`}`
`509`	`509`
`@@ -630,7 +630,7 @@ type AtomicTable struct {`
`630`	`630`	Str string ` + "`" + `ovsdb:"str"` + "`" + `
`631`	`631`	`}`
`632`	`632`
`633`		`-func (a *AtomicTable) Table() string {`
	`633`	`+func (a *AtomicTable) GetTableName() string {`
`634`	`634`	`return AtomicTableTable`
`635`	`635`	`}`
`636`	`636`
`@@ -1020,3 +1020,12 @@ func BenchmarkDeepEqual(b *testing.B) {`
`1020`	`1020`	`})`
`1021`	`1021`	`}`
`1022`	`1022`	`}`
	`1023`	`+`
	`1024`	`+func TestGetTableName(t *testing.T) {`
	`1025`	`+ bridge := &vswitchd.Bridge{}`
	`1026`	`+ func(bridge interface{}) {`
	`1027`	`+ b, ok := bridge.(model.Model)`
	`1028`	`+ assert.True(t, ok, "is not a model")`
	`1029`	`+ assert.Equal(t, b.GetTableName(), "Bridge")`
	`1030`	`+ }(bridge)`
	`1031`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ type bridgeType struct {`
`166`	`166`	DatapathID *string `ovsdb:"datapath_id"`
`167`	`167`	`}`
`168`	`168`
`169`		`-func (b *bridgeType) Table() string {`
	`169`	`+func (b *bridgeType) GetTableName() string {`
`170`	`170`	`return "Bridge"`
`171`	`171`	`}`
`172`	`172`
`@@ -192,7 +192,7 @@ type ovsType struct {`
`192`	`192`	SystemVersion *string `ovsdb:"system_version"`
`193`	`193`	`}`
`194`	`194`
`195`		`-func (o *ovsType) Table() string {`
	`195`	`+func (o *ovsType) GetTableName() string {`
`196`	`196`	`return "Open_vSwitch"`
`197`	`197`	`}`
`198`	`198`
`@@ -202,7 +202,7 @@ type ipfixType struct {`
`202`	`202`	Targets []string `ovsdb:"targets"`
`203`	`203`	`}`
`204`	`204`
`205`		`-func (i *ipfixType) Table() string {`
	`205`	`+func (i *ipfixType) GetTableName() string {`
`206`	`206`	`return "IPFIX"`
`207`	`207`	`}`
`208`	`208`
`@@ -212,7 +212,7 @@ type queueType struct {`
`212`	`212`	DSCP *int `ovsdb:"dscp"`
`213`	`213`	`}`
`214`	`214`
`215`		`-func (q *queueType) Table() string {`
	`215`	`+func (q *queueType) GetTableName() string {`
`216`	`216`	`return "Queue"`
`217`	`217`	`}`
`218`	`218`