[Controller] vinterface add vtap id

deepflowio · Jul 11, 2023 · 4de2643 · 4de2643
1 parent 0b09d16
commit 4de2643
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 1 deletion.
diff --git a/server/controller/cloud/common/utils.go b/server/controller/cloud/common/utils.go
@@ -495,6 +495,7 @@ func GetHostNics(hosts []model.Host, domainName, uuidGenerate, portNameRegex str
 			retVInterfaces = append(retVInterfaces, model.VInterface{
 				Lcuuid:        vinterfaceLcuuid,
 				NetnsID:       vinterface.NetnsID,
+				VTapID:        vinterface.VtapID,
 				Type:          common.VIF_TYPE_LAN,
 				Mac:           vinterface.Mac,
 				DeviceType:    common.VIF_DEVICE_TYPE_HOST,

diff --git a/server/controller/cloud/kubernetes_gather/vinterface_and_ip.go b/server/controller/cloud/kubernetes_gather/vinterface_and_ip.go
@@ -165,6 +165,7 @@ func (k *KubernetesGather) getVInterfacesAndIPs() (nodeSubnets, podSubnets []mod
 				Mac:           vMAC,
 				TapMac:        vTAPMAC,
 				NetnsID:       vItem.NetnsID,
+				VTapID:        vItem.VtapID,
 				DeviceType:    common.VIF_DEVICE_TYPE_POD,
 				DeviceLcuuid:  podLcuuid,
 				NetworkLcuuid: k.podNetworkLcuuidCIDRs.networkLcuuid,

diff --git a/server/controller/cloud/model/model.go b/server/controller/cloud/model/model.go
@@ -148,6 +148,7 @@ type VInterface struct {
 	VPCLcuuid       string `json:"vpc_lcuuid"` // TODO not used
 	RegionLcuuid    string `json:"region_lcuuid" binding:"required"`
 	NetnsID         uint32 `json:"netns_id"`
+	VTapID          uint32 `json:"vtap_id" binding:"required"`
 	SubDomainLcuuid string `json:"sub_domain_lcuuid"`
 }
 

diff --git a/server/controller/db/mysql/migration/rawsql/init.sql b/server/controller/db/mysql/migration/rawsql/init.sql
@@ -325,6 +325,7 @@ CREATE TABLE IF NOT EXISTS vinterface (
     devicetype          INTEGER COMMENT 'Type 0.unknown 1.vm 2.vgw 3.third-party-device 4.vmwaf 5.NSP-vgateway 6.host-device 7.network-device 9.DHCP-port 10.pod 11.pod_service 12. redis_instance 13. rds_instance 14. pod_node 15. load_balance 16. nat_gateway',
     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,
     sub_domain          CHAR(64) DEFAULT '',
     domain              CHAR(64) DEFAULT '',
     region              CHAR(64) DEFAULT '',

diff --git a/server/controller/db/mysql/migration/rawsql/issu/6.3.1.23.sql b/server/controller/db/mysql/migration/rawsql/issu/6.3.1.23.sql
@@ -0,0 +1,3 @@
+ALTER TABLE vinterface ADD COLUMN vtap_id INTEGER AFTER netns_id;
+
+UPDATE db_version SET version='6.3.1.23';
diff --git 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.3.1.22"
+	DB_VERSION_EXPECTED = "6.3.1.23"
 )
diff --git a/server/controller/db/mysql/model.go b/server/controller/db/mysql/model.go
@@ -360,6 +360,7 @@ type VInterface struct {
 	DeviceType   int       `gorm:"column:devicetype;type:int;default:null" json:"DEVICETYPE"`   // Type 0.unknown 1.vm 2.vgw 3.third-party-device 4.vmwaf 5.NSP-vgateway 6.host-device 7.network-device 9.DHCP-port 10.pod 11.pod_service 12. redis_instance 13. rds_instance 14. pod_node 15. load_balance 16. nat_gateway
 	DeviceID     int       `gorm:"column:deviceid;type:int;default:null" json:"DEVICEID"`       // 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"` // used to associate processes with cloud and container resources
+	VtapID       uint32    `gorm:"column:vtap_id;type:int" json:"VTAP_ID"`
 	SubDomain    string    `gorm:"column:sub_domain;type:char(64);default:''" json:"SUB_DOMAIN"`
 	Domain       string    `gorm:"column:domain;type:char(64);not null" json:"DOMAIN"`
 	Region       string    `gorm:"column:region;type:char(64);default:''" json:"REGION"`

diff --git a/server/controller/recorder/cache/vinterface.go b/server/controller/recorder/cache/vinterface.go
@@ -52,6 +52,8 @@ type VInterface struct {
 	Name            string `json:"name"`
 	Type            int    `json:"type"`
 	TapMac          string `json:"tap_mac"`
+	NetnsID         uint32 `json:"netns_id"`
+	VtapID          uint32 `json:"vtap_id"`
 	NetworkLcuuid   string `json:"network_lcuuid"`
 	RegionLcuuid    string `json:"region_lcuuid"`
 	SubDomainLcuuid string `json:"sub_domain_lcuuid"`
@@ -61,6 +63,8 @@ func (v *VInterface) Update(cloudItem *cloudmodel.VInterface) {
 	v.Name = cloudItem.Name
 	v.Type = cloudItem.Type
 	v.TapMac = cloudItem.TapMac
+	v.NetnsID = cloudItem.NetnsID
+	v.VtapID = cloudItem.VTapID
 	v.NetworkLcuuid = cloudItem.NetworkLcuuid
 	v.RegionLcuuid = cloudItem.RegionLcuuid
 	v.SubDomainLcuuid = cloudItem.SubDomainLcuuid

diff --git a/server/controller/recorder/updater/vinterface.go b/server/controller/recorder/updater/vinterface.go
@@ -92,6 +92,7 @@ func (i *VInterface) generateDBItemToAdd(cloudItem *cloudmodel.VInterface) (*mys
 		Domain:     i.cache.DomainLcuuid,
 		Region:     cloudItem.RegionLcuuid,
 		NetnsID:    cloudItem.NetnsID,
+		VtapID:     cloudItem.VTapID,
 	}
 	dbItem.Lcuuid = cloudItem.Lcuuid
 	return dbItem, true
@@ -131,6 +132,12 @@ func (i *VInterface) generateUpdateInfo(diffBase *cache.VInterface, cloudItem *c
 	if diffBase.Type != cloudItem.Type {
 		updateInfo["iftype"] = cloudItem.Type
 	}
+	if diffBase.NetnsID != cloudItem.NetnsID {
+		updateInfo["netns_id"] = cloudItem.NetnsID
+	}
+	if diffBase.VtapID != cloudItem.VTapID {
+		updateInfo["vtap_id"] = cloudItem.VTapID
+	}
 	return updateInfo, len(updateInfo) > 0
 }