From abdbe0d64d929f503d1862b5a1f1cd9361103707 Mon Sep 17 00:00:00 2001 From: zhengya Date: Thu, 21 Dec 2023 16:47:16 +0800 Subject: [PATCH] [CONTROLLER/DB] adds npb direction --- server/controller/db/mysql/migration/rawsql/init.sql | 1 + .../controller/db/mysql/migration/rawsql/issu/6.4.1.12.sql | 5 +++++ server/controller/db/mysql/migration/version.go | 2 +- server/controller/db/mysql/model.go | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 server/controller/db/mysql/migration/rawsql/issu/6.4.1.12.sql diff --git a/server/controller/db/mysql/migration/rawsql/init.sql b/server/controller/db/mysql/migration/rawsql/init.sql index a104239e9f8..4bec2fe6b87 100644 --- a/server/controller/db/mysql/migration/rawsql/init.sql +++ b/server/controller/db/mysql/migration/rawsql/init.sql @@ -1112,6 +1112,7 @@ CREATE TABLE IF NOT EXISTS npb_policy ( name CHAR(64), state INTEGER DEFAULT 1 COMMENT '0-disable; 1-enable', business_id INTEGER NOT NULL, + direction TINYINT(1) DEFAULT 1 COMMENT '1-all; 2-forward; 3-backward;', vni INTEGER, npb_tunnel_id INTEGER, distribute TINYINT(1) DEFAULT 1 COMMENT '0-drop, 1-distribute', diff --git a/server/controller/db/mysql/migration/rawsql/issu/6.4.1.12.sql b/server/controller/db/mysql/migration/rawsql/issu/6.4.1.12.sql new file mode 100644 index 00000000000..f9bc45f7b6c --- /dev/null +++ b/server/controller/db/mysql/migration/rawsql/issu/6.4.1.12.sql @@ -0,0 +1,5 @@ +ALTER TABLE npb_policy ADD COLUMN direction TINYINT(1) DEFAULT 1 COMMENT '1-all; 2-forward; 3-backward;' AFTER business_id; + +-- update db_version to latest, remember update DB_VERSION_EXPECT in migrate/version.go +UPDATE db_version SET version='6.4.1.12'; +-- modify end diff --git a/server/controller/db/mysql/migration/version.go b/server/controller/db/mysql/migration/version.go index 3046720492e..2069e3a55f7 100644 --- a/server/controller/db/mysql/migration/version.go +++ b/server/controller/db/mysql/migration/version.go @@ -18,5 +18,5 @@ package migration const ( DB_VERSION_TABLE = "db_version" - DB_VERSION_EXPECTED = "6.4.1.11" + DB_VERSION_EXPECTED = "6.4.1.12" ) diff --git a/server/controller/db/mysql/model.go b/server/controller/db/mysql/model.go index 7fcd635fe94..516dee6cf7c 100644 --- a/server/controller/db/mysql/model.go +++ b/server/controller/db/mysql/model.go @@ -436,6 +436,7 @@ type NpbPolicy struct { Name string `gorm:"column:name;type:char(64);default:null" json:"NAME"` State int `gorm:"column:state;type:int;default:null;default:1" json:"STATE"` // 0-disable; 1-enable BusinessID int `gorm:"column:business_id;type:int;not null" json:"BUSINESS_ID"` + Direction int `gorm:"column:direction;type:int;default:1" json:"DIRECTION"` // 1-two way; 2-server to client Vni int `gorm:"column:vni;type:int;default:null" json:"VNI"` NpbTunnelID int `gorm:"column:npb_tunnel_id;type:int;default:null" json:"NPB_TUNNEL_ID"` Distribute int `gorm:"column:distribute;type:int;default:null" json:"distribute"` // 0-drop, 1-distribute