lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-05-06 21:52:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11011 from rainzm/pe/projectId

Browse Source 
fix(cloudproxy): correct fetch projectId from server for PE
This commit is contained in:
Zexi Li
2021-05-10 12:07:49 +08:00
committed by GitHub
parent 5400c4ed03 f906d15a5e
commit 0319f28da6
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/cloudproxy/models/server_util.go
View File

@@ -21,19 +21,18 @@ import (
"yunion.io/x/onecloud/pkg/httperrors"
"yunion.io/x/onecloud/pkg/mcclient"
"yunion.io/x/onecloud/pkg/mcclient/auth"
compute_models "yunion.io/x/onecloud/pkg/mcclient/models"
compute_modules "yunion.io/x/onecloud/pkg/mcclient/modules"
)
type serverInfo struct {
Server *compute_models.Server
Server *compute_apis.ServerDetails
// PrivateKey is the one corresponds to userCred when getting this
// serverInfo instance. It can be empty
PrivateKey string
}
func (si *serverInfo) GetNic() *compute_models.ServerNic {
func (si *serverInfo) GetNic() *compute_apis.GuestnetworkShortDesc {
nic := si.getVPCNic()
if nic != nil {
return nic
@@ -47,7 +46,7 @@ func (si *serverInfo) GetNic() *compute_models.ServerNic {
return nil
}
func (si *serverInfo) getVPCNic() *compute_models.ServerNic {
func (si *serverInfo) getVPCNic() *compute_apis.GuestnetworkShortDesc {
for _, nic := range si.Server.Nics {
if nic.IpAddr != "" && nic.VpcId != compute_apis.DEFAULT_VPC_ID {
return &nic
@@ -67,7 +66,7 @@ func getServerInfo(
return nil, httperrors.NewGeneralError(err)
}
server := &compute_models.Server{}
server := &compute_apis.ServerDetails{}
if err := serverJson.Unmarshal(server); err != nil {
return nil, httperrors.NewServerError("unmarshal server %s: %v", serverId, err)
}