fix: log change bandwidth event (#23712)

Co-authored-by: Qiu Jian <[email protected]>

Author: swordqiu

pkg/apis/compute/guestnetwork.go

@@ -51,6 +51,9 @@ type GuestnetworkShortDesc struct {
 	IpAddr string `json:"ip_addr"`
 	// 是否为外网网卡
 	IsExit bool `json:"is_exit"`
+	// 网卡类型
+	// 可能值：exit | internal | unused
+	NicType string `json:"nic_type"`
 	// IPv6地址
 	Ip6Addr string `json:"ip6_addr"`
 	// Mac地址
@@ -59,6 +62,8 @@ type GuestnetworkShortDesc struct {
 	TeamWith string `json:"team_with"`
 	// 所属Vpc
 	VpcId string `json:"vpc_id"`
+	// 所属主机
+	GuestId string `json:"guest_id"`
 	// 所属Network
 	NetworkId string `json:"network_id"`
 	// 附属IP

pkg/apis/compute/networkaddress.go

@@ -27,18 +27,20 @@ var NetworkAddressTypes = choices.NewChoices(
 	NetworkAddressTypeSubIP,
 )
 
+type TNetworkAddressParentType string
+
 const (
-	NetworkAddressParentTypeGuestnetwork = "guestnetwork"
+	NetworkAddressParentTypeGuestnetwork = TNetworkAddressParentType("guestnetwork")
 )
 
 var NetworkAddressParentTypes = choices.NewChoices(
-	NetworkAddressParentTypeGuestnetwork,
+	string(NetworkAddressParentTypeGuestnetwork),
 )
 
 type NetworkAddressCreateInput struct {
 	apis.StandaloneAnonResourceCreateInput
 
-	ParentType        string
+	ParentType        TNetworkAddressParentType
 	ParentId          int64
 	GuestId           string
 	GuestnetworkIndex int8

pkg/cloudcommon/db/opslog_const.go

@@ -252,6 +252,7 @@ const (
 	ACT_GUEST_CPUSET_REMOVE      = "guest_cpuset_remove"
 	ACT_GUEST_CPUSET_REMOVE_FAIL = "guest_cpuset_remove_fail"
 
+	ACT_CHANGE_IPADDR    = "change_ipaddr"
 	ACT_CHANGE_BANDWIDTH = "eip_change_bandwidth"
 	ACT_EIP_CONVERT_FAIL = "eip_convert_fail"
 

pkg/compute/models/guest_actions.go

@@ -2942,11 +2942,14 @@ func (self *SGuest) PerformChangeIpaddr(
 
 	notes := gn.GetShortDesc(ctx)
 	if gn != nil {
-		notes.Add(jsonutils.NewString(gn.IpAddr), "prev_ip")
-	}
-	if ngn != nil {
-		notes.Add(jsonutils.NewString(ngn.IpAddr), "ip")
+		if gn.IpAddr != ngn.IpAddr {
+			notes.Add(jsonutils.NewString(gn.IpAddr), "prev_ip")
+		}
+		if gn.Ip6Addr != ngn.Ip6Addr {
+			notes.Add(jsonutils.NewString(gn.Ip6Addr), "prev_ip6")
+		}
 	}
+	db.OpsLog.LogEvent(self, db.ACT_CHANGE_IPADDR, notes, userCred)
 	logclient.AddActionLogWithContext(ctx, self, logclient.ACT_VM_CHANGE_NIC, notes, userCred, true)
 
 	restartNetwork := (input.RestartNetwork != nil && *input.RestartNetwork)
@@ -3328,15 +3331,18 @@ func (guest *SGuest) PerformChangeBandwidth(
 	}
 
 	if guestnic.BwLimit != int(bandwidth) {
-		diff, err := db.Update(guestnic, func() error {
+		oldBw := guestnic.BwLimit
+		_, err := db.Update(guestnic, func() error {
 			guestnic.BwLimit = int(bandwidth)
 			return nil
 		})
 		if err != nil {
 			return nil, err
 		}
-		db.OpsLog.LogEvent(guest, db.ACT_CHANGE_BANDWIDTH, diff, userCred)
-		logclient.AddActionLogWithContext(ctx, guest, logclient.ACT_VM_CHANGE_BANDWIDTH, diff, userCred, true)
+		eventDesc := guestnic.GetShortDesc(ctx)
+		eventDesc.Add(jsonutils.NewInt(int64(oldBw)), "old_bw_limit_mbps")
+		db.OpsLog.LogEvent(guest, db.ACT_CHANGE_BANDWIDTH, eventDesc, userCred)
+		logclient.AddActionLogWithContext(ctx, guest, logclient.ACT_VM_CHANGE_BANDWIDTH, eventDesc, userCred, true)
 		if guest.Status == api.VM_READY || (input.NoSync != nil && *input.NoSync) {
 			// if no sync, just update db
 			return nil, nil

pkg/compute/models/guest_queries.go

@@ -560,9 +560,7 @@ func fetchGuestNICs(ctx context.Context, guestIds []string, virtual tristate.Tri
 	netq := NetworkManager.Query().SubQuery()
 	wirq := WireManager.Query().SubQuery()
 
-	subIPQ := NetworkAddressManager.Query("parent_id").Equals("parent_type", api.NetworkAddressParentTypeGuestnetwork)
-	subIPQ = subIPQ.AppendField(sqlchemy.GROUP_CONCAT("sub_ips", subIPQ.Field("ip_addr")))
-	subIPQ = subIPQ.GroupBy(subIPQ.Field("parent_id"))
+	subIPQ := NetworkAddressManager.fetchSubIpsQuery(api.NetworkAddressParentTypeGuestnetwork)
 	subIP := subIPQ.SubQuery()
 
 	gnwq := GuestnetworkManager.Query()

pkg/compute/models/guestnetworks.go

@@ -1275,6 +1275,13 @@ func (gn *SGuestnetwork) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
 	if len(gn.IpAddr) > 0 {
 		desc.IpAddr = gn.IpAddr
 		desc.IsExit = gn.IsExit()
+		if desc.IsExit {
+			desc.NicType = "exit"
+		} else {
+			desc.NicType = "internal"
+		}
+	} else {
+		desc.NicType = "unused"
 	}
 	if len(gn.Ip6Addr) > 0 {
 		desc.Ip6Addr = gn.Ip6Addr
@@ -1287,9 +1294,33 @@ func (gn *SGuestnetwork) GetShortDesc(ctx context.Context) *jsonutils.JSONDict {
 	desc.Ifname = gn.Ifname
 	desc.IsDefault = gn.IsDefault
 	desc.ChargeType = gn.ChargeType
+	desc.GuestId = gn.GuestId
+	desc.NetworkId = gn.NetworkId
+	wire, _ := gn.GetWire()
+	if wire != nil {
+		desc.VpcId = wire.VpcId
+	}
+	desc.PortMappings = gn.PortMappings
+	desc.SubIps = gn.GetSubIps()
 	return jsonutils.Marshal(desc).(*jsonutils.JSONDict)
 }
 
+func (gn *SGuestnetwork) GetWire() (*SWire, error) {
+	net, err := gn.GetNetwork()
+	if err != nil {
+		return nil, errors.Wrap(err, "GetNetwork")
+	}
+	return net.GetWire()
+}
+
+func (gn *SGuestnetwork) GetVpc() (*SVpc, error) {
+	net, err := gn.GetNetwork()
+	if err != nil {
+		return nil, errors.Wrap(err, "GetNetwork")
+	}
+	return net.GetVpc()
+}
+
 func (gn *SGuestnetwork) ToNetworkConfig() *api.NetworkConfig {
 	net, err := gn.GetNetwork()
 	if err != nil {
@@ -1464,3 +1495,17 @@ func (guest *SGuest) IsStrictIpv6() (bool, error) {
 	}
 	return cnt > 0, nil
 }
+
+func (gn *SGuestnetwork) GetSubIps() string {
+	subIPQ := NetworkAddressManager.fetchSubIpsQuery(api.NetworkAddressParentTypeGuestnetwork)
+	subIPQ = subIPQ.Equals("parent_id", gn.RowId)
+	result := struct {
+		SubIps string `json:"sub_ips"`
+	}{}
+	err := subIPQ.First(&result)
+	if err != nil {
+		log.Errorf("Guestnetwork %s/%s/%s GetSubIps fail %s", gn.GuestId, gn.NetworkId, gn.MacAddr, err)
+		return ""
+	}
+	return result.SubIps
+}

pkg/compute/models/networkaddresses.go

@@ -64,9 +64,9 @@ func init() {
 type SNetworkAddress struct {
 	db.SStandaloneAnonResourceBase
 
-	Type       string `width:"16" charset:"ascii" list:"user" create:"required"`
-	ParentType string `width:"16" charset:"ascii" list:"user" create:"required"`
-	ParentId   string `width:"16" charset:"ascii" list:"user" create:"optional"`
+	Type       string                        `width:"16" charset:"ascii" list:"user" create:"required"`
+	ParentType api.TNetworkAddressParentType `width:"16" charset:"ascii" list:"user" create:"required"`
+	ParentId   string                        `width:"16" charset:"ascii" list:"user" create:"optional"`
 	SNetworkResourceBase
 	IpAddr string `width:"16" charset:"ascii" list:"user" create:"optional"`
 
@@ -78,9 +78,9 @@ func (man *SNetworkAddressManager) InitializeData() error {
 	return nil
 }
 
-func (man *SNetworkAddressManager) queryByParentTypeId(typ string, id string) *sqlchemy.SQuery {
+func (man *SNetworkAddressManager) queryByParentTypeId(typ api.TNetworkAddressParentType, id string) *sqlchemy.SQuery {
 	q := NetworkAddressManager.Query().
-		Equals("parent_type", typ).
+		Equals("parent_type", string(typ)).
 		Equals("parent_id", id)
 	return q
 }
@@ -90,7 +90,7 @@ func (man *SNetworkAddressManager) queryByGuestnetworkId(rowid int64) *sqlchemy.
 	return man.queryByParentTypeId(api.NetworkAddressParentTypeGuestnetwork, id)
 }
 
-func (man *SNetworkAddressManager) fetchByParentTypeId(typ string, id string) ([]SNetworkAddress, error) {
+func (man *SNetworkAddressManager) fetchByParentTypeId(typ api.TNetworkAddressParentType, id string) ([]SNetworkAddress, error) {
 	var (
 		q   = man.queryByParentTypeId(typ, id)
 		nas []SNetworkAddress
@@ -691,3 +691,10 @@ func (g *SGuest) getICloudNic(ctx context.Context, gn *SGuestnetwork) (cloudprov
 	}
 	return nil, errors.Wrapf(errors.ErrNotFound, "no nic of ip %s mac %s", gn.IpAddr, gn.MacAddr)
 }
+
+func (manager *SNetworkAddressManager) fetchSubIpsQuery(parentType api.TNetworkAddressParentType) *sqlchemy.SQuery {
+	subIPQ := manager.Query("parent_id").Equals("parent_type", string(parentType))
+	subIPQ = subIPQ.AppendField(sqlchemy.GROUP_CONCAT("sub_ips", subIPQ.Field("ip_addr")))
+	subIPQ = subIPQ.GroupBy(subIPQ.Field("parent_id"))
+	return subIPQ
+}