opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13067 from ioito/hotfix/qx-vpc-topology-owner-status

Browse Source 
fix(region): add owner status for vpc topology
This commit is contained in:
Zexi Li
2021-12-28 19:48:09 +08:00
committed by GitHub
parent 3de7e2e1f5 0b67893d92
commit 4e18752fa9
5 changed files with 81 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/compute/wires.go
+1
View File
@@ -32,4 +32,5 @@ func init() {
cmd.Perform("change-owner-candidate-domains", new(options.WireOptions))
cmd.PerformWithKeyword("merge", "merge-from", new(options.WireMergeOptions))
cmd.Perform("merge-network", new(options.WireOptions))
cmd.Get("topology", &options.WireOptions{})
}
pkg/apis/compute/network_const.go
+1
View File
@@ -87,6 +87,7 @@ type SNetworkUsedAddress struct {
MacAddr string
Owner string
OwnerId string
OwnerStatus string
OwnerType string
AssociateId string
AssociateType string
pkg/apis/compute/wire.go
+3
View File
@@ -115,3 +115,6 @@ type WireMergeFromInput struct {
type WireMergeNetworkInput struct {
}
type WireTopologyInput struct {
}
pkg/compute/models/networks_used_addresses_query.go
+9
View File
@@ -62,6 +62,7 @@ func (manager *SGuestnetworkManager) usedAddressQuery(args *usedAddressQueryArgs
baseq.Field("mac_addr"),
sqlchemy.NewStringField(GuestManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -93,6 +94,7 @@ func (manager *SHostnetworkManager) usedAddressQuery(args *usedAddressQueryArgs)
baseq.Field("mac_addr"),
sqlchemy.NewStringField(HostManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -123,6 +125,7 @@ func (manager *SReservedipManager) usedAddressQuery(args *usedAddressQueryArgs)
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(ReservedipManager.KeywordPlural()).Label("owner_type"),
baseq.Field("id").Label("owner_id"),
baseq.Field("status").Label("owner_status"),
baseq.Field("notes").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -152,6 +155,7 @@ func (manager *SGroupnetworkManager) usedAddressQuery(args *usedAddressQueryArgs
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(GroupManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -183,6 +187,7 @@ func (manager *SLoadbalancernetworkManager) usedAddressQuery(args *usedAddressQu
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(LoadbalancerManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -214,6 +219,7 @@ func (manager *SElasticipManager) usedAddressQuery(args *usedAddressQueryArgs) *
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(ElasticipManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
ownerq.Field("associate_id"),
ownerq.Field("associate_type"),
@@ -245,6 +251,7 @@ func (manager *SNetworkinterfacenetworkManager) usedAddressQuery(args *usedAddre
ownerq.Field("mac").Label("mac_addr"),
sqlchemy.NewStringField(NetworkInterfaceManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
ownerq.Field("associate_id"),
ownerq.Field("associate_type"),
@@ -276,6 +283,7 @@ func (manager *SDBInstanceManager) usedAddressQuery(args *usedAddressQueryArgs)
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(DBInstanceManager.KeywordPlural()).Label("owner_type"),
ownerq.Field("id").Label("owner_id"),
ownerq.Field("status").Label("owner_status"),
ownerq.Field("name").Label("owner"),
sqlchemy.NewStringField("").Label("associate_id"),
sqlchemy.NewStringField("").Label("associate_type"),
@@ -306,6 +314,7 @@ func (manager *SNetworkAddressManager) usedAddressQuery(args *usedAddressQueryAr
sqlchemy.NewStringField("").Label("mac_addr"),
sqlchemy.NewStringField(NetworkAddressManager.KeywordPlural()).Label("owner_type"),
baseq.Field("id").Label("owner_id"),
sqlchemy.NewStringField("available").Label("owner_status"),
baseq.Field("id").Label("owner"),
baseq.Field("parent_id").Label("associate_id"),
baseq.Field("parent_type").Label("associate_type"),
pkg/compute/models/wires.go
+67
View File
@@ -18,6 +18,7 @@ import (
"context"
"database/sql"
"fmt"
"sort"
"yunion.io/x/jsonutils"
"yunion.io/x/log"
@@ -1502,3 +1503,69 @@ func (manager *SWireManager) ListItemExportKeys(ctx context.Context,
}
return q, nil
}
func (self *SWire) GetDetailsTopology(ctx context.Context, userCred mcclient.TokenCredential, input *api.WireTopologyInput) (*api.WireTopologyOutput, error) {
ret := &api.WireTopologyOutput{
Name: self.Name,
Status: self.Status,
Bandwidth: self.Bandwidth,
Networks: []api.NetworkTopologyOutput{},
Hosts: []api.HostTopologyOutput{},
}
if len(self.ZoneId) > 0 {
zone, _ := self.GetZone()
if zone != nil {
ret.Zone = zone.Name
}
}
hosts, err := self.GetHosts()
if err != nil {
return nil, errors.Wrapf(err, "GetHosts for wire %s", self.Id)
}
for i := range hosts {
hns := hosts[i].GetBaremetalnetworks()
host := api.HostTopologyOutput{
Name: hosts[i].Name,
Status: hosts[i].Status,
HostStatus: hosts[i].HostStatus,
HostType: hosts[i].HostType,
Networks: []api.HostnetworkTopologyOutput{},
}
for j := range hns {
host.Networks = append(host.Networks, api.HostnetworkTopologyOutput{
IpAddr: hns[j].IpAddr,
MacAddr: hns[j].MacAddr,
})
}
ret.Hosts = append(ret.Hosts, host)
}
networks, err := self.GetNetworks(nil, rbacutils.ScopeSystem)
if err != nil {
return nil, errors.Wrapf(err, "GetNetworks")
}
for j := range networks {
network := api.NetworkTopologyOutput{
Name: networks[j].Name,
Status: networks[j].Status,
GuestIpStart: networks[j].GuestIpStart,
GuestIpEnd: networks[j].GuestIpEnd,
GuestIpMask: networks[j].GuestIpMask,
ServerType: networks[j].ServerType,
VlanId: networks[j].VlanId,
Address: []api.SNetworkUsedAddress{},
}
netAddrs := make([]api.SNetworkUsedAddress, 0)
q := networks[j].getUsedAddressQuery(userCred, rbacutils.ScopeDomain, false)
err = q.All(&netAddrs)
if err != nil {
return nil, errors.Wrapf(err, "q.All")
}
sort.Sort(SNetworkUsedAddressList(netAddrs))
network.Address = netAddrs
ret.Networks = append(ret.Networks, network)
}
return ret, nil
}