opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 22:32:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8758 from ioito/hotfix/qx-server-create-params

Browse Source 
fix: public ip and duration for create params
This commit is contained in:
yunion-ci-robot
2020-11-12 19:34:02 +08:00
committed by GitHub
parent 83e97c11c9 d7ab5fdd14
commit bb6882fb99
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+13 -4
View File
@@ -5119,6 +5119,9 @@ func (self *SGuest) ToCreateInput(userCred mcclient.TokenCredential) *api.Server
userInput.KeypairId = genInput.KeypairId
userInput.EipBw = genInput.EipBw
userInput.EipChargeType = genInput.EipChargeType
userInput.PublicIpBw = genInput.PublicIpBw
userInput.PublicIpChargeType = genInput.PublicIpChargeType
userInput.AutoRenew = genInput.AutoRenew
// cloned server should belongs to the project creating it
userInput.ProjectId = userCred.GetProjectId()
userInput.ProjectDomainId = userCred.GetProjectDomainId()
@@ -5144,7 +5147,6 @@ func (self *SGuest) ToCreateInput(userCred mcclient.TokenCredential) *api.Server
userInput.Description = ""
userInput.BillingType = ""
userInput.BillingCycle = ""
userInput.Duration = ""
return userInput
}
@@ -5176,6 +5178,7 @@ func (self *SGuest) toCreateInput() *api.ServerCreateInput {
r.Disks = self.ToDisksConfig()
r.Networks = self.ToNetworksConfig()
r.IsolatedDevices = self.ToIsolatedDevicesConfig()
r.AutoRenew = self.AutoRenew
if keypair := self.getKeypair(); keypair != nil {
r.KeypairId = keypair.Id
@@ -5183,9 +5186,15 @@ func (self *SGuest) toCreateInput() *api.ServerCreateInput {
if host := self.GetHost(); host != nil {
r.ResourceType = host.ResourceType
}
if eip, _ := self.GetEipOrPublicIp(); eip != nil && eip.Mode == api.EIP_MODE_STANDALONE_EIP {
r.EipBw = eip.Bandwidth
r.EipChargeType = eip.ChargeType
if eip, _ := self.GetEipOrPublicIp(); eip != nil {
switch eip.Mode {
case api.EIP_MODE_STANDALONE_EIP:
r.EipBw = eip.Bandwidth
r.EipChargeType = eip.ChargeType
case api.EIP_MODE_INSTANCE_PUBLICIP:
r.PublicIpBw = eip.Bandwidth
r.PublicIpChargeType = eip.ChargeType
}
}
if zone := self.getZone(); zone != nil {
r.PreferRegion = zone.GetRegion().GetId()