opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-28 03:23:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

region: save server create params into metadata

Browse Source
This commit is contained in:
Zexi Li
2019-04-03 00:49:52 +08:00
committed by Yousong Zhou
parent 6841d16b87
commit 45fdebf2ea
2 changed files with 88 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guest_actions.go
+19 -18
View File
@@ -330,8 +330,11 @@ func (self *SGuest) PerformClone(ctx context.Context, userCred mcclient.TokenCre
return nil, httperrors.NewBadRequestError("Guest hypervisor %s does not support clone", self.Hypervisor)
}
cloneInput := new(api.ServerCloneInput)
err := data.Unmarshal(cloneInput)
if !utils.IsInStringArray(self.Status, []string{VM_RUNNING, VM_READY}) {
return nil, httperrors.NewInvalidStatusError("Cannot clone VM in status %s", self.Status)
}
cloneInput, err := cmdline.FetchServerCreateInputByJSON(data)
if err != nil {
return nil, httperrors.NewInputParameterError("Unmarshal input error %s", err)
}
@@ -343,7 +346,7 @@ func (self *SGuest) PerformClone(ctx context.Context, userCred mcclient.TokenCre
return nil, err
}
createInput := self.ToCreateInput()
createInput := self.ToCreateInput(userCred)
createInput.Name = cloneInput.Name
createInput.AutoStart = cloneInput.AutoStart
@@ -354,27 +357,25 @@ func (self *SGuest) PerformClone(ctx context.Context, userCred mcclient.TokenCre
return nil, err
}
dataDict := jsonutils.Marshal(createInput)
model, err := db.NewModelObject(GuestManager)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
err = dataDict.Unmarshal(model)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
err = model.CustomizeCreate(ctx, userCred, self.ProjectId, query, dataDict)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
err = GuestManager.TableSpec().Insert(model)
dataDict := createInput.JSON(createInput)
model, err := db.DoCreate(GuestManager, ctx, userCred, query, dataDict, createInput.Project)
if err != nil {
return nil, httperrors.NewGeneralError(err)
}
func() {
lockman.LockObject(ctx, model)
defer lockman.ReleaseObject(ctx, model)
model.PostCreate(ctx, userCred, createInput.Project, query, dataDict)
}()
db.OpsLog.LogEvent(model, db.ACT_CREATE, model.GetShortDesc(ctx), userCred)
logclient.AddActionLogWithContext(ctx, model, logclient.ACT_CREATE, "", userCred, true)
pendingUsage := getGuestResourceRequirements(ctx, userCred, createInput, 1, false)
if task, err := taskman.TaskManager.NewTask(ctx, "GuestCloneTask", model, userCred,
createInput.JSON(createInput), "", "", &pendingUsage); err != nil {
dataDict, "", "", &pendingUsage); err != nil {
log.Errorf(err.Error())
return nil, err
} else {
pkg/compute/models/guests.go
+69 -10
View File
@@ -168,7 +168,12 @@ const (
HYPERVISOR_DEFAULT = HYPERVISOR_KVM
)
const VM_AWS_DEFAULT_LOGIN_USER = "ec2user"
const (
VM_AWS_DEFAULT_LOGIN_USER = "ec2user"
VM_METADATA_APP_TAGS = "app_tags"
VM_METADATA_CREATE_PARAMS = "create_params"
)
var VM_RUNNING_STATUS = api.VM_RUNNING_STATUS
var VM_CREATING_STATUS = api.VM_CREATING_STATUS
@@ -1228,6 +1233,7 @@ func (guest *SGuest) PostCreate(ctx context.Context, userCred mcclient.TokenCred
}
}
guest.setApptags(ctx, appTags, userCred)
guest.SetCreateParams(ctx, userCred, data)
osProfileJson, _ := data.Get("__os_profile__")
if osProfileJson != nil {
guest.setOSProfile(ctx, userCred, osProfileJson)
@@ -1240,12 +1246,27 @@ func (guest *SGuest) PostCreate(ctx context.Context, userCred mcclient.TokenCred
}
func (guest *SGuest) setApptags(ctx context.Context, appTags []string, userCred mcclient.TokenCredential) {
err := guest.SetMetadata(ctx, "app_tags", strings.Join(appTags, ","), userCred)
err := guest.SetMetadata(ctx, VM_METADATA_APP_TAGS, strings.Join(appTags, ","), userCred)
if err != nil {
log.Errorln(err)
}
}
func (guest *SGuest) SetCreateParams(ctx context.Context, userCred mcclient.TokenCredential, data jsonutils.JSONObject) {
// delete deploy files info
data.(*jsonutils.JSONDict).Remove("deploy_configs")
err := guest.SetMetadata(ctx, VM_METADATA_CREATE_PARAMS, data.String(), userCred)
if err != nil {
log.Errorf("Server %s SetCreateParams: %v", guest.Name, err)
}
}
func (guest *SGuest) GetCreateParams(userCred mcclient.TokenCredential) (*api.ServerCreateInput, error) {
input := new(api.ServerCreateInput)
err := guest.GetMetadataJson(VM_METADATA_CREATE_PARAMS, userCred).Unmarshal(input)
return input, err
}
func (manager *SGuestManager) OnCreateComplete(ctx context.Context, items []db.IModel, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) {
input := new(api.ServerCreateInput)
data.Unmarshal(input)
@@ -3983,7 +4004,7 @@ func (self *SGuest) getDefaultStorageType() string {
}
func (self *SGuest) GetApptags() []string {
tagsStr := self.GetMetadata("app_tags", nil)
tagsStr := self.GetMetadata(VM_METADATA_APP_TAGS, nil)
if len(tagsStr) > 0 {
return strings.Split(tagsStr, ",")
}
@@ -4110,11 +4131,44 @@ func (guest *SGuest) GetDynamicConditionInput() *jsonutils.JSONDict {
return guest.ToSchedDesc().ToConditionInput()
}
func (self *SGuest) ToCreateInput() *api.ServerCreateInput {
func (self *SGuest) ToCreateInput(userCred mcclient.TokenCredential) *api.ServerCreateInput {
genInput := self.toCreateInput()
userInput, err := self.GetCreateParams(userCred)
if err != nil {
return genInput
}
// fill missing create params like schedtags
for idx, disk := range genInput.Disks {
if idx < len(userInput.Disks) {
disk.Schedtags = userInput.Disks[idx].Schedtags
userInput.Disks[idx] = disk
} else {
userInput.Disks = append(userInput.Disks, disk)
}
}
for idx, net := range genInput.Networks {
if idx < len(userInput.Networks) {
userInput.Networks[idx] = net
} else {
userInput.Networks = append(userInput.Networks, net)
}
}
for idx, dev := range genInput.IsolatedDevices {
if idx < len(userInput.IsolatedDevices) {
userInput.IsolatedDevices[idx] = dev
} else {
userInput.IsolatedDevices = append(userInput.IsolatedDevices, dev)
}
}
userInput.KeypairId = genInput.KeypairId
userInput.Project = genInput.Project
return userInput
}
func (self *SGuest) toCreateInput() *api.ServerCreateInput {
r := new(api.ServerCreateInput)
r.VmemSize = self.VmemSize
r.VcpuCount = int(self.VcpuCount)
r.KeypairId = self.KeypairId
if guestCdrom := self.getCdrom(); guestCdrom != nil {
r.Cdrom = guestCdrom.ImageId
}
@@ -4133,9 +4187,7 @@ func (self *SGuest) ToCreateInput() *api.ServerCreateInput {
r.SecgroupId = self.SecgrpId
r.ServerConfigs = new(api.ServerConfigs)
host := self.GetHost()
r.Hypervisor = self.Hypervisor
r.ResourceType = host.ResourceType
r.InstanceType = self.InstanceType
r.Project = self.ProjectId
r.Count = 1
@@ -4143,9 +4195,16 @@ func (self *SGuest) ToCreateInput() *api.ServerCreateInput {
r.Networks = self.ToNetworksConfig()
r.IsolatedDevices = self.ToIsolatedDevicesConfig()
zone := self.getZone()
r.PreferRegion = zone.GetRegion().GetId()
r.PreferZone = zone.GetId()
if keypair := self.getKeypair(); keypair != nil {
r.KeypairId = keypair.Id
}
if host := self.GetHost(); host != nil {
r.ResourceType = host.ResourceType
}
if zone := self.getZone(); zone != nil {
r.PreferRegion = zone.GetRegion().GetId()
r.PreferZone = zone.GetId()
}
return r
}