Skip to content

Commit

Permalink
feat: adds epc_id to vinterface table
Browse files Browse the repository at this point in the history
  • Loading branch information
ZhengYa-0110 committed Jan 26, 2025
1 parent 50abcea commit cb3a9c2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 1 deletion.
2 changes: 1 addition & 1 deletion server/controller/db/metadb/migrator/schema/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ const (
RAW_SQL_ROOT_DIR = "/etc/metadb/schema/rawsql"

DB_VERSION_TABLE = "db_version"
DB_VERSION_EXPECTED = "7.0.1.5"
DB_VERSION_EXPECTED = "7.0.1.6"
)
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,7 @@ CREATE TABLE IF NOT EXISTS vinterface (
deviceid INTEGER COMMENT 'unknown: Senseless ID, vm: vm ID, vgw/NSP-vgateway: vnet ID, third-party-device: third_party_device ID, vmwaf: vmwaf ID, host-device: host_device ID, network-device: network_device ID',
netns_id INTEGER UNSIGNED DEFAULT 0,
vtap_id INTEGER DEFAULT 0,
epc_id INTEGER DEFAULT 0,
sub_domain CHAR(64) DEFAULT '',
domain CHAR(64) DEFAULT '',
region CHAR(64) DEFAULT '',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
DROP PROCEDURE IF EXISTS AddColumnIfNotExists;

CREATE PROCEDURE AddColumnIfNotExists(
IN tableName VARCHAR(255),
IN colName VARCHAR(255),
IN colType VARCHAR(255),
IN afterCol VARCHAR(255)
)
BEGIN
DECLARE column_count INT;

SELECT COUNT(*)
INTO column_count
FROM information_schema.columns
WHERE TABLE_SCHEMA = DATABASE()
AND TABLE_NAME = tableName
AND column_name = colName;

IF column_count = 0 THEN
SET @sql = CONCAT('ALTER TABLE ', tableName, ' ADD COLUMN ', colName, ' ', colType, ' AFTER ', afterCol);
PREPARE stmt FROM @sql;
EXECUTE stmt;
DEALLOCATE PREPARE stmt;
END IF;
END;

CALL AddColumnIfNotExists('vinterface', 'epc_id', "INTEGER DEFAULT 0,", 'vtap_id');

DROP PROCEDURE AddColumnIfNotExists;

UPDATE db_version SET version='7.0.1.6';
1 change: 1 addition & 0 deletions server/controller/db/metadb/model/platform_rsc_model.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,7 @@ type VInterface struct {
DeviceID int `gorm:"column:deviceid;type:int;default:null" json:"DEVICE_ID" mapstructure:"DEVICE_ID"` // unknown: Senseless ID, vm: vm ID, vgw/NSP-vgateway: vnet ID, third-party-device: third_party_device ID, vmwaf: vmwaf ID, host-device: host_device ID, network-device: network_device ID
NetnsID uint32 `gorm:"column:netns_id;type:int unsigned;default:0" json:"NETNS_ID" mapstructure:"NETNS_ID"` // used to associate processes with cloud and container resources
VtapID uint32 `gorm:"column:vtap_id;type:int;default:0" json:"VTAP_ID" mapstructure:"VTAP_ID"`
VPCID int `gorm:"column:epc_id;type:int;default:0" json:"VPC_ID" mapstructure:"VPC_ID"`
SubDomain string `gorm:"column:sub_domain;type:char(64);default:''" json:"SUB_DOMAIN" mapstructure:"SUB_DOMAIN"`
Domain string `gorm:"column:domain;type:char(64);not null" json:"DOMAIN" mapstructure:"DOMAIN"`
Region string `gorm:"column:region;type:char(64);default:''" json:"REGION" mapstructure:"REGION"`
Expand Down

0 comments on commit cb3a9c2

Please # to comment.