Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V66 npb vtap #9002

Merged
merged 2 commits into from
Jan 22, 2025
+191 −46
Merged

V66 npb vtap #9002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3fb0b0
feat: adds columns to npb_policy table
ZhengYa-0110 Jan 14, 2025
b4cb13f
feat: support vtap_group_ids in npb_policy
SongZhen0704 Jan 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions server/controller/common/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,11 @@ const (
NPB_POLICY_FLOW_DISTRIBUTE = 1
)

const (
POLICY_VTAP_TYPE_VTAP = 1
POLICY_VTAP_TYPE_VTAP_GROUP = 2
)

const (
DEFAULT_ENCRYPTION_PASSWORD = "******"
DEFAULT_ALL_MATCH_REGEX = ".*"
Expand Down
2 changes: 2 additions & 0 deletions server/controller/db/mysql/migrator/schema/rawsql/init.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,9 @@ CREATE TABLE IF NOT EXISTS npb_policy (
payload_slice INTEGER DEFAULT NULL,
acl_id INTEGER,
policy_acl_group_id INTEGER,
vtap_type TINYINT(1) COMMENT '1: vtap; 2: vtap_group',
vtap_ids TEXT COMMENT 'separated by ,',
vtap_group_ids TEXT COMMENT 'separated by ,',
created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP NOT NULL ON UPDATE CURRENT_TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
lcuuid CHAR(64)
Expand Down
44 changes: 44 additions & 0 deletions server/controller/db/mysql/migrator/schema/rawsql/issu/6.6.1.22.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
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('npb_policy', 'vtap_type', "TINYINT(1) COMMENT '1-vtap; 2-vtap_group'", 'policy_acl_group_id');
CALL AddColumnIfNotExists('npb_policy', 'vtap_group_ids', "TEXT COMMENT 'separated by ,'", 'vtap_ids');

DROP PROCEDURE AddColumnIfNotExists;

START TRANSACTION;

UPDATE npb_policy n
JOIN acl a ON n.acl_id = a.id
SET n.vtap_type = 1
WHERE a.tap_type = 3;

COMMIT;

-- update db_version to latest, remeber update DB_VERSION_EXPECT in migrate/init.go
UPDATE db_version SET version='6.6.1.22';
-- modify end

2 changes: 1 addition & 1 deletion server/controller/db/mysql/migrator/schema/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package schema

const (
DB_VERSION_TABLE = "db_version"
DB_VERSION_EXPECTED = "6.6.1.21"
DB_VERSION_EXPECTED = "6.6.1.22"
)

const (
Expand Down
4 changes: 3 additions & 1 deletion server/controller/db/mysql/model/model.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,9 @@ type NpbPolicy struct {
PayloadSlice *int `gorm:"column:payload_slice;type:int;default:null" json:"PAYLOAD_SLICE"`
ACLID int `gorm:"column:acl_id;type:int;default:null" json:"ACL_ID"`
PolicyACLGroupID int `gorm:"column:policy_acl_group_id;type:int;default:null" json:"POLICY_ACL_GROUP_ID"`
VtapIDs string `gorm:"column:vtap_ids;type:text;default:null" json:"VTAP_IDS"` // separated by ,
VtapType int `gorm:"column:vtap_type;type:type:tinyint(1);default:null" json:"VTAP_TYPE"` // 1: vtap; 2: vtap_group
VtapIDs string `gorm:"column:vtap_ids;type:text" json:"VTAP_IDS"` // separated by ,
VtapGroupIDs string `gorm:"column:vtap_group_ids;type:text" json:"VTAP_GROUP_IDS"` // separated by ,
CreatedAt time.Time `gorm:"column:created_at;type:timestamp;not null;default:CURRENT_TIMESTAMP" json:"CREATED_AT"`
UpdatedAt time.Time `gorm:"column:updated_at;type:timestamp;not null;default:CURRENT_TIMESTAMP" json:"UPDATED_AT"`
Lcuuid string `gorm:"column:lcuuid;type:char(64);default:null" json:"LCUUID"`
Expand Down
20 changes: 16 additions & 4 deletions server/controller/trisolaris/dbcache/db_data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,10 @@ type DBDataCache struct {
processes []*models.Process
vips []*models.VIP

podNSs []*models.PodNamespace
vtaps []*models.VTap
chDevices []*models.ChDevice
podNSs []*models.PodNamespace
vtaps []*models.VTap
vtapGroups []*models.VTapGroup
chDevices []*models.ChDevice

config *config.Config

Expand Down Expand Up @@ -286,6 +287,10 @@ func (d *DBDataCache) GetVTapsIDAndName() []*models.VTap {
return d.vtaps
}

func (d *DBDataCache) GetVTapGroupsIDAndLcuuid() []*models.VTapGroup {
return d.vtapGroups
}

func (d *DBDataCache) GetChDevicesIDTypeAndName() []*models.ChDevice {
return d.chDevices
}
Expand Down Expand Up @@ -623,13 +628,20 @@ func (d *DBDataCache) GetDataCacheFromDB(db *gorm.DB) {
log.Error(d.Log(err.Error()))
}

vtaps, err := dbmgr.DBMgr[models.VTap](db).GetFields([]string{"id", "name", "launch_server_id", "type"})
vtaps, err := dbmgr.DBMgr[models.VTap](db).GetFields([]string{"id", "name", "launch_server_id", "type", "vtap_group_lcuuid"})
if err == nil {
d.vtaps = vtaps
} else {
log.Error(d.Log(err.Error()))
}

vtapGroups, err := dbmgr.DBMgr[models.VTapGroup](db).GetFields([]string{"id", "lcuuid"})
if err == nil {
d.vtapGroups = vtapGroups
} else {
log.Error(d.Log(err.Error()))
}

chDevices, err := dbmgr.DBMgr[models.ChDevice](db).GetFields([]string{"devicetype", "deviceid", "name"})
if err == nil {
d.chDevices = chDevices
Expand Down
80 changes: 60 additions & 20 deletions server/controller/trisolaris/metadata/agentmetadata/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,24 @@ import (
)

type PolicyRawData struct {
idToNpbTunnel map[int]*models.NpbTunnel
idToACL map[int]*models.ACL
aclIDToNpbPolices map[int][]*models.NpbPolicy
aclIDToPcapPolices map[int][]*models.PcapPolicy
idToNpbPolicy map[int]*models.NpbPolicy
idToPcapPolicy map[int]*models.PcapPolicy
vtapGroupIDToAgentIDs map[int][]int
idToNpbTunnel map[int]*models.NpbTunnel
idToACL map[int]*models.ACL
aclIDToNpbPolices map[int][]*models.NpbPolicy
aclIDToPcapPolices map[int][]*models.PcapPolicy
idToNpbPolicy map[int]*models.NpbPolicy
idToPcapPolicy map[int]*models.PcapPolicy
}

func newPolicyRawData() *PolicyRawData {
return &PolicyRawData{
idToNpbTunnel: make(map[int]*models.NpbTunnel),
idToACL: make(map[int]*models.ACL),
aclIDToNpbPolices: make(map[int][]*models.NpbPolicy),
aclIDToPcapPolices: make(map[int][]*models.PcapPolicy),
idToNpbPolicy: make(map[int]*models.NpbPolicy),
idToPcapPolicy: make(map[int]*models.PcapPolicy),
vtapGroupIDToAgentIDs: make(map[int][]int),
idToNpbTunnel: make(map[int]*models.NpbTunnel),
idToACL: make(map[int]*models.ACL),
aclIDToNpbPolices: make(map[int][]*models.NpbPolicy),
aclIDToPcapPolices: make(map[int][]*models.PcapPolicy),
idToNpbPolicy: make(map[int]*models.NpbPolicy),
idToPcapPolicy: make(map[int]*models.PcapPolicy),
}
}

Expand Down Expand Up @@ -351,8 +353,23 @@ func (op *PolicyDataOP) generateRawData() {
acls := dbDataCache.GetACLs()
npbPolicies := dbDataCache.GetNpbPolicies()
pcapPolicies := dbDataCache.GetPcapPolicies()
vtaps := dbDataCache.GetVTapsIDAndName()
vtapGroups := dbDataCache.GetVTapGroupsIDAndLcuuid()

rawData := newPolicyRawData()
vtapGroupLcuuidToID := map[string]int{}
for _, vtapGroup := range vtapGroups {
vtapGroupLcuuidToID[vtapGroup.Lcuuid] = vtapGroup.ID
}
for _, vtap := range vtaps {
vtapGroupID, ok := vtapGroupLcuuidToID[vtap.VtapGroupLcuuid]
if !ok {
log.Warning(op.Logf("agent(%s) group lcuuid(%s) not found group id", vtap.Name, vtap.VtapGroupLcuuid))
continue
}
rawData.vtapGroupIDToAgentIDs[vtapGroupID] = append(rawData.vtapGroupIDToAgentIDs[vtapGroupID], vtap.ID)
}

for _, npbTunnel := range npbTunnels {
rawData.idToNpbTunnel[npbTunnel.ID] = npbTunnel
}
Expand Down Expand Up @@ -600,16 +617,39 @@ func (op *PolicyDataOP) generateProtoActions(acl *models.ACL) (map[int][]*agent.
NpbAclGroupId: proto.Uint32(uint32(npbPolicy.PolicyACLGroupID)),
Direction: &direction,
}
if len(npbPolicy.VtapIDs) == 0 {
allAgentNpbActions = append(allAgentNpbActions, npbAction)

if npbPolicy.VtapType == POLICY_VTAP_TYPE_VTAP {
if len(npbPolicy.VtapIDs) == 0 {
allAgentNpbActions = append(allAgentNpbActions, npbAction)
} else {
for _, agentIDStr := range strings.Split(npbPolicy.VtapIDs, ",") {
agentIDInt, err := strconv.Atoi(agentIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, agentIDs: %s", err, npbPolicy.VtapIDs))
continue
}
agentIDToNpbActions[agentIDInt] = append(agentIDToNpbActions[agentIDInt], npbAction)
}
}
} else {
for _, agentIDStr := range strings.Split(npbPolicy.VtapIDs, ",") {
agentIDInt, err := strconv.Atoi(agentIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, agentIDs: %s", err, npbPolicy.VtapIDs))
continue
if len(npbPolicy.VtapGroupIDs) == 0 {
allAgentNpbActions = append(allAgentNpbActions, npbAction)
} else {
for _, vtapGroupIDStr := range strings.Split(npbPolicy.VtapGroupIDs, ",") {
vtapGroupIDInt, err := strconv.Atoi(vtapGroupIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, vtapGroupIDs: %s", err, npbPolicy.VtapGroupIDs))
continue
}
agentIDs, ok := rawData.vtapGroupIDToAgentIDs[vtapGroupIDInt]
if !ok {
log.Errorf(op.Logf("not found agent in vtap group id(%d)", vtapGroupIDInt))
continue
}
for agentID := range agentIDs {
agentIDToNpbActions[agentID] = append(agentIDToNpbActions[agentID], npbAction)
}
}
agentIDToNpbActions[agentIDInt] = append(agentIDToNpbActions[agentIDInt], npbAction)
}
}
}
Expand Down
80 changes: 60 additions & 20 deletions server/controller/trisolaris/metadata/policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,24 @@ import (
)

type PolicyRawData struct {
idToNpbTunnel map[int]*models.NpbTunnel
idToACL map[int]*models.ACL
aclIDToNpbPolices map[int][]*models.NpbPolicy
aclIDToPcapPolices map[int][]*models.PcapPolicy
idToNpbPolicy map[int]*models.NpbPolicy
idToPcapPolicy map[int]*models.PcapPolicy
vtapGroupIDToVtapIDs map[int][]int
idToNpbTunnel map[int]*models.NpbTunnel
idToACL map[int]*models.ACL
aclIDToNpbPolices map[int][]*models.NpbPolicy
aclIDToPcapPolices map[int][]*models.PcapPolicy
idToNpbPolicy map[int]*models.NpbPolicy
idToPcapPolicy map[int]*models.PcapPolicy
}

func newPolicyRawData() *PolicyRawData {
return &PolicyRawData{
idToNpbTunnel: make(map[int]*models.NpbTunnel),
idToACL: make(map[int]*models.ACL),
aclIDToNpbPolices: make(map[int][]*models.NpbPolicy),
aclIDToPcapPolices: make(map[int][]*models.PcapPolicy),
idToNpbPolicy: make(map[int]*models.NpbPolicy),
idToPcapPolicy: make(map[int]*models.PcapPolicy),
vtapGroupIDToVtapIDs: make(map[int][]int),
idToNpbTunnel: make(map[int]*models.NpbTunnel),
idToACL: make(map[int]*models.ACL),
aclIDToNpbPolices: make(map[int][]*models.NpbPolicy),
aclIDToPcapPolices: make(map[int][]*models.PcapPolicy),
idToNpbPolicy: make(map[int]*models.NpbPolicy),
idToPcapPolicy: make(map[int]*models.PcapPolicy),
}
}

Expand Down Expand Up @@ -374,8 +376,23 @@ func (op *PolicyDataOP) generateRawData() {
acls := dbDataCache.GetACLs()
npbPolicies := dbDataCache.GetNpbPolicies()
pcapPolicies := dbDataCache.GetPcapPolicies()
vtaps := dbDataCache.GetVTapsIDAndName()
vtapGroups := dbDataCache.GetVTapGroupsIDAndLcuuid()

rawData := newPolicyRawData()
vtapGroupLcuuidToID := map[string]int{}
for _, vtapGroup := range vtapGroups {
vtapGroupLcuuidToID[vtapGroup.Lcuuid] = vtapGroup.ID
}
for _, vtap := range vtaps {
vtapGroupID, ok := vtapGroupLcuuidToID[vtap.VtapGroupLcuuid]
if !ok {
log.Warning(op.Logf("vtap(%s) group lcuuid(%s) not found group id", vtap.Name, vtap.VtapGroupLcuuid))
continue
}
rawData.vtapGroupIDToVtapIDs[vtapGroupID] = append(rawData.vtapGroupIDToVtapIDs[vtapGroupID], vtap.ID)
}

for _, npbTunnel := range npbTunnels {
rawData.idToNpbTunnel[npbTunnel.ID] = npbTunnel
}
Expand Down Expand Up @@ -623,16 +640,39 @@ func (op *PolicyDataOP) generateProtoActions(acl *models.ACL) (map[int][]*triden
NpbAclGroupId: proto.Uint32(uint32(npbPolicy.PolicyACLGroupID)),
Direction: &direction,
}
if len(npbPolicy.VtapIDs) == 0 {
allVTapNpbActions = append(allVTapNpbActions, npbAction)

if npbPolicy.VtapType == POLICY_VTAP_TYPE_VTAP {
if len(npbPolicy.VtapIDs) == 0 {
allVTapNpbActions = append(allVTapNpbActions, npbAction)
} else {
for _, vtapIDStr := range strings.Split(npbPolicy.VtapIDs, ",") {
vtapIDInt, err := strconv.Atoi(vtapIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, vtapIDs: %s", err, npbPolicy.VtapIDs))
continue
}
vtapIDToNpbActions[vtapIDInt] = append(vtapIDToNpbActions[vtapIDInt], npbAction)
}
}
} else {
for _, vtapIDStr := range strings.Split(npbPolicy.VtapIDs, ",") {
vtapIDInt, err := strconv.Atoi(vtapIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, vtapIDs: %s", err, npbPolicy.VtapIDs))
continue
if len(npbPolicy.VtapGroupIDs) == 0 {
allVTapNpbActions = append(allVTapNpbActions, npbAction)
} else {
for _, vtapGroupIDStr := range strings.Split(npbPolicy.VtapGroupIDs, ",") {
vtapGroupIDInt, err := strconv.Atoi(vtapGroupIDStr)
if err != nil {
log.Errorf(op.Logf("err: %s, vtapGroupIDs: %s", err, npbPolicy.VtapGroupIDs))
continue
}
vtapIDs, ok := rawData.vtapGroupIDToVtapIDs[vtapGroupIDInt]
if !ok {
log.Errorf(op.Logf("not found vtap in vtap group id(%d)", vtapGroupIDInt))
continue
}
for _, vtapID := range vtapIDs {
vtapIDToNpbActions[vtapID] = append(vtapIDToNpbActions[vtapID], npbAction)
}
}
vtapIDToNpbActions[vtapIDInt] = append(vtapIDToNpbActions[vtapIDInt], npbAction)
}
}
}
Expand Down
Loading