Skip to content

Commit 86ab99b

Browse files
authored
fix(region): guestnetworksecgroup list add network info (#24394)
1 parent bf838b8 commit 86ab99b

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

pkg/apis/compute/secgroup.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ type GuestnetworksecgroupDetails struct {
361361
Ifname string `json:"ifname"`
362362
IpAddr string `json:"ip_addr"`
363363
Ip6Addr string `json:"ip_6_addr"`
364+
NetworkId string `json:"network_id"`
365+
NetworkName string `json:"network_name"`
364366

365367
Admin bool `json:"admin"`
366368
}

pkg/compute/models/guestnetworksecgroups.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,10 @@ func (manager *SGuestnetworksecgroupManager) FetchCustomizeColumns(
217217
rows[i].IpAddr = gn.IpAddr
218218
rows[i].Ip6Addr = gn.Ip6Addr
219219
rows[i].Ifname = gn.Ifname
220+
if network, _ := gn.GetNetwork(); network != nil {
221+
rows[i].NetworkId = gn.NetworkId
222+
rows[i].NetworkName = network.Name
223+
}
220224
}
221225

222226
}
@@ -466,9 +470,6 @@ func (self *SGuest) PerformSetNetworkSecgroup(
466470
if !utils.IsInStringArray(self.Status, []string{api.VM_READY, api.VM_RUNNING, api.VM_SUSPEND}) {
467471
return nil, httperrors.NewInputParameterError("Cannot set security rules in status %s", self.Status)
468472
}
469-
if len(input.SecgroupIds) == 0 {
470-
return nil, httperrors.NewMissingParameterError("secgroup_ids")
471-
}
472473

473474
driver, _ := self.GetDriver()
474475
maxCount := driver.GetMaxSecurityGroupCount()

0 commit comments

Comments
 (0)