feature: supprot configuration vtap group name

Author: askyrie

server/controller/genesis/grpc/server.go

@@ -153,6 +153,7 @@ func (g *SynchronizerServer) GenerateCache() {
 				g.workloadResourceEnabledCache.SetDefault(fmt.Sprintf("%d-", orgID), true)
 			}
 			g.workloadResourceEnabledCache.SetDefault(key, true)
+			g.workloadResourceEnabledCache.SetDefault(fmt.Sprintf("%d-%s", orgID, group.Name), true)
 		}
 	}
 }

server/controller/trisolaris/services/grpc/agentsynchronize/sync_push.go

@@ -378,9 +378,9 @@ func (e *AgentEvent) generateNoAgentCacheDynamicConfig() *api.DynamicConfig {
 }
 
 func (e *AgentEvent) generateNoAgentCacheUserConfig(groupID string, orgID int) *koanf.Koanf {
-	vtapConfig := trisolaris.GetORGVTapInfo(orgID).GetVTapConfigFromShortID(groupID)
+	vtapConfig := trisolaris.GetORGVTapInfo(orgID).GetVTapConfigByNameOrShortUUID(groupID)
 	if vtapConfig == nil {
-		log.Warningf("not found vtap group short id (%s) config", groupID, logger.NewORGPrefix(orgID))
+		log.Warningf("vtap group config (name or short_uuid: %s) not found", groupID, logger.NewORGPrefix(orgID))
 		return koanf.New(".")
 	}
 	return vtapConfig.GetUserConfig()

server/controller/trisolaris/vtap/vtap.go

@@ -68,7 +68,7 @@ type VTapInfo struct {
 	lcuuidToVPCID                  map[string]int
 	hostIDToVPCID                  map[int]int
 	hypervNetworkHostIds           mapset.Set
-	vtapGroupShortIDToLcuuid       map[string]string
+	vtapGroupNameOrShortIDToLcuuid map[string]string
 	vtapGroupLcuuidToShortID       map[string]string
 	vtapGroupLcuuidToConfiguration map[string]*VTapConfig
 	vtapGroupLcuuidToLocalConfig   map[string]string
@@ -137,7 +137,7 @@ func NewVTapInfo(db *gorm.DB, metaData *metadata.MetaData, cfg *config.Config, o
 		lcuuidToVPCID:                  make(map[string]int),
 		hostIDToVPCID:                  make(map[int]int),
 		hypervNetworkHostIds:           mapset.NewSet(),
-		vtapGroupShortIDToLcuuid:       make(map[string]string),
+		vtapGroupNameOrShortIDToLcuuid: make(map[string]string),
 		vtapGroupLcuuidToShortID:       make(map[string]string),
 		vtapGroupLcuuidToConfiguration: make(map[string]*VTapConfig),
 		vtapGroupLcuuidToLocalConfig:   make(map[string]string),
@@ -252,14 +252,15 @@ func (v *VTapInfo) loadVTapGroup() {
 		return
 	}
 
-	vtapGroupShortIDToLcuuid := make(map[string]string)
+	vtapGroupNameOrShortIDToLcuuid := make(map[string]string)
 	vtapGroupLcuuidToShortID := make(map[string]string)
 	for _, vtapGroup := range vtapGroups {
-		vtapGroupShortIDToLcuuid[vtapGroup.ShortUUID] = vtapGroup.Lcuuid
+		vtapGroupNameOrShortIDToLcuuid[vtapGroup.Name] = vtapGroup.Lcuuid
+		vtapGroupNameOrShortIDToLcuuid[vtapGroup.ShortUUID] = vtapGroup.Lcuuid
 		vtapGroupLcuuidToShortID[vtapGroup.Lcuuid] = vtapGroup.ShortUUID
 	}
 
-	v.vtapGroupShortIDToLcuuid = vtapGroupShortIDToLcuuid
+	v.vtapGroupNameOrShortIDToLcuuid = vtapGroupNameOrShortIDToLcuuid
 	v.vtapGroupLcuuidToShortID = vtapGroupLcuuidToShortID
 }
 
@@ -504,11 +505,11 @@ func (v *VTapInfo) getAgentConfigs() {
 	v.vtapGroupLcuuidToConfiguration = vtapGroupLcuuidToConfiguration
 }
 
-func (v *VTapInfo) GetVTapConfigFromShortID(shortID string) *VTapConfig {
+func (v *VTapInfo) GetVTapConfigByNameOrShortUUID(nameOrShortUUID string) *VTapConfig {
 	if v == nil {
 		return nil
 	}
-	lcuuid, ok := v.vtapGroupShortIDToLcuuid[shortID]
+	lcuuid, ok := v.vtapGroupNameOrShortIDToLcuuid[nameOrShortUUID]
 	if !ok {
 		return nil
 	}
@@ -527,7 +528,7 @@ func (v *VTapInfo) GetVTapLocalConfigByShortID(shortID string) string {
 	if v == nil {
 		return ""
 	}
-	lcuuid, ok := v.vtapGroupShortIDToLcuuid[shortID]
+	lcuuid, ok := v.vtapGroupNameOrShortIDToLcuuid[shortID]
 	if !ok {
 		return ""
 	}

server/controller/trisolaris/vtap/vtap_discovery.go

@@ -33,16 +33,16 @@ import (
 )
 
 type VTapRegister struct {
-	tapMode                         int
-	vTapGroupID                     string
-	defaultVTapGroup                string
-	defaultVTapGroupLicenseFuntions string
-	vTapAutoRegister                bool
-	agentUniqueIdentifier           int
-	teamID                          int
-	vTapInfo                        *VTapInfo
-	registerBy                      string
-	groupLicenseFunctions           string
+	tapMode                          int
+	vTapGroupID                      string
+	defaultVTapGroup                 string
+	defaultVTapGroupLicenseFunctions string
+	vTapAutoRegister                 bool
+	agentUniqueIdentifier            int
+	teamID                           int
+	vTapInfo                         *VTapInfo
+	registerBy                       string
+	groupLicenseFunctions            string
 	VTapLKData
 	ORGID
 }
@@ -126,12 +126,12 @@ func (r *VTapRegister) setRegisterBy(registerBy string) {
 }
 
 func (r *VTapRegister) getVTapGroupLcuuid(db *gorm.DB) string {
-	r.groupLicenseFunctions = r.defaultVTapGroupLicenseFuntions
+	r.groupLicenseFunctions = r.defaultVTapGroupLicenseFunctions
 	if r.vTapGroupID != "" {
 		vtapGroup := &models.VTapGroup{}
-		ret := db.Where("short_uuid = ?", r.vTapGroupID).First(vtapGroup)
+		ret := db.Where("name = ?", r.vTapGroupID).Or("short_uuid = ?", r.vTapGroupID).First(vtapGroup)
 		if ret.Error != nil {
-			log.Error(r.Logf("vtap group(short_uuid=%s) not found", r.vTapGroupID))
+			log.Error(r.Logf("vtap group (name or short_uuid: %s) not found", r.vTapGroupID))
 			return r.defaultVTapGroup
 		} else {
 			r.groupLicenseFunctions = vtapGroup.LicenseFunctions
@@ -935,15 +935,15 @@ func (r *VTapRegister) registerVTap(done func()) {
 		log.Error(r.Log(err.Error()))
 		return
 	}
-	vtapConfig := r.vTapInfo.GetVTapConfigFromShortID(r.vTapGroupID)
+	vtapConfig := r.vTapInfo.GetVTapConfigByNameOrShortUUID(r.vTapGroupID)
 	if vtapConfig != nil {
 		r.tapMode = vtapConfig.GetConfigTapMode()
 	} else {
 		r.tapMode = DefaultTapMode
 	}
 	r.region = v.getRegion()
 	r.defaultVTapGroup = v.getDefaultVTapGroup()
-	r.defaultVTapGroupLicenseFuntions = v.getDefaultVTapGroupLicenseFunctions()
+	r.defaultVTapGroupLicenseFunctions = v.getDefaultVTapGroupLicenseFunctions()
 	r.vTapAutoRegister = v.getVTapAutoRegister()
 	log.Infof(r.Logf("register vtap: %s", r))
 	var vtap *models.VTap