modelgen: generate constants instead of variables for enums

Signed-off-by: zhangzujian <[email protected]>
ovn-org · Nov 20, 2024 · a1e06d8 · a1e06d8
1 parent ce19516
commit a1e06d8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/modelgen/table.go b/modelgen/table.go
@@ -217,7 +217,7 @@ type (
 {{- end }}
 )
 
-var (
+const (
 {{ range  index . "Enums" }}
 {{- $e := . }}
 {{- range .Sets }}

diff --git a/modelgen/table_test.go b/modelgen/table_test.go
@@ -64,7 +64,7 @@ type (
 	AtomicTableProtocol  = string
 )
 
-var (
+const (
 	AtomicTableEventTypeEmptyLbBackends AtomicTableEventType = "empty_lb_backends"
 	AtomicTableProtocolTCP              AtomicTableProtocol  = "tcp"
 	AtomicTableProtocolUDP              AtomicTableProtocol  = "udp"
@@ -128,7 +128,7 @@ type (
 	AtomicTableProtocol  = string
 )
 
-var (
+const (
 	AtomicTableEventTypeEmptyLbBackends AtomicTableEventType = "empty_lb_backends"
 	AtomicTableProtocolTCP              AtomicTableProtocol  = "tcp"
 	AtomicTableProtocolUDP              AtomicTableProtocol  = "udp"
@@ -172,7 +172,7 @@ type (
 	AtomicTableProtocol  = string
 )
 
-var (
+const (
 	AtomicTableEventTypeEmptyLbBackends AtomicTableEventType = "empty_lb_backends"
 	AtomicTableProtocolTCP              AtomicTableProtocol  = "tcp"
 	AtomicTableProtocolUDP              AtomicTableProtocol  = "udp"
@@ -330,7 +330,7 @@ type (
 	AtomicTableProtocol  = string
 )
 
-var (
+const (
 	AtomicTableEventTypeEmptyLbBackends AtomicTableEventType = "empty_lb_backends"
 	AtomicTableProtocolTCP              AtomicTableProtocol  = "tcp"
 	AtomicTableProtocolUDP              AtomicTableProtocol  = "udp"
@@ -589,7 +589,7 @@ type (
 	AtomicTableProtocol  = string
 )
 
-var (
+const (
 	AtomicTableEventTypeEmptyLbBackends AtomicTableEventType = "empty_lb_backends"
 	AtomicTableProtocolTCP              AtomicTableProtocol  = "tcp"
 	AtomicTableProtocolUDP              AtomicTableProtocol  = "udp"
@@ -870,15 +870,15 @@ func buildRandStr() *string {
 }
 
 func buildTestBridge() *vswitchd.Bridge {
-	return &vswitchd.Bridge{
+	bridge := &vswitchd.Bridge{
 		UUID:                *buildRandStr(),
 		AutoAttach:          buildRandStr(),
 		Controller:          []string{*buildRandStr(), *buildRandStr()},
 		DatapathID:          buildRandStr(),
 		DatapathType:        *buildRandStr(),
 		DatapathVersion:     *buildRandStr(),
 		ExternalIDs:         map[string]string{*buildRandStr(): *buildRandStr(), *buildRandStr(): *buildRandStr()},
-		FailMode:            &vswitchd.BridgeFailModeSecure,
+		FailMode:            new(string),
 		FloodVLANs:          []int{0, 1, 2, 3, 4, 5, 6, 7, 8, 9},
 		FlowTables:          map[int]string{1: *buildRandStr(), 2: *buildRandStr()},
 		IPFIX:               buildRandStr(),
@@ -895,6 +895,8 @@ func buildTestBridge() *vswitchd.Bridge {
 		Status:              map[string]string{*buildRandStr(): *buildRandStr(), *buildRandStr(): *buildRandStr()},
 		STPEnable:           false,
 	}
+	*bridge.FailMode = vswitchd.BridgeFailModeSecure
+	return bridge
 }
 
 func buildTestInterface() *vswitchd.Interface {

diff --git a/ovsdb/serverdb/database.go b/ovsdb/serverdb/database.go