lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 01:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): guestnetworksecgroup list add network info (#24393)

Browse Source
This commit is contained in:
wanyaoqi
2026-03-11 19:31:52 +08:00
committed by GitHub
parent 5dd913b40f
commit 8543f3735d
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/apis/compute/secgroup.go
View File

@@ -361,6 +361,8 @@ type GuestnetworksecgroupDetails struct {
Ifname string `json:"ifname"`
IpAddr string `json:"ip_addr"`
Ip6Addr string `json:"ip_6_addr"`
NetworkId string `json:"network_id"`
NetworkName string `json:"network_name"`
Admin bool `json:"admin"`
}

7
pkg/compute/models/guestnetworksecgroups.go
View File

@@ -214,6 +214,10 @@ func (manager *SGuestnetworksecgroupManager) FetchCustomizeColumns(
rows[i].IpAddr = gn.IpAddr
rows[i].Ip6Addr = gn.Ip6Addr
rows[i].Ifname = gn.Ifname
if network, _ := gn.GetNetwork(); network != nil {
rows[i].NetworkId = gn.NetworkId
rows[i].NetworkName = network.Name
}
}
}
@@ -463,9 +467,6 @@ func (self *SGuest) PerformSetNetworkSecgroup(
if !utils.IsInStringArray(self.Status, []string{api.VM_READY, api.VM_RUNNING, api.VM_SUSPEND}) {
return nil, httperrors.NewInputParameterError("Cannot set security rules in status %s", self.Status)
}
if len(input.SecgroupIds) == 0 {
return nil, httperrors.NewMissingParameterError("secgroup_ids")
}
driver, _ := self.GetDriver()
maxCount := driver.GetMaxSecurityGroupCount()