lywsvip/cloudpods
1
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-07-01 01:36:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): optimized openstack change config

Browse Source
This commit is contained in:
Qu Xuan
2020-12-09 11:45:49 +08:00
parent 516f5ab0d3
commit 20ca72cd43
2 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/multicloud/openstack/flavor.go
View File

@@ -84,40 +84,42 @@ func (region *SRegion) GetFlavor(flavorId string) (*SFlavor, error) {
}
func (region *SRegion) SyncFlavor(name string, cpu, memoryMb, diskGB int) (string, error) {
return region.syncFlavor(name, cpu, memoryMb, diskGB)
flavor, err := region.syncFlavor(name, cpu, memoryMb, diskGB)
if err != nil {
return "", errors.Wrapf(err, "syncFlavor")
}
return flavor.Id, nil
}
func (region *SRegion) syncFlavor(name string, cpu, memoryMb, diskGB int) (string, error) {
func (region *SRegion) syncFlavor(name string, cpu, memoryMb, diskGB int) (*SFlavor, error) {
flavors, err := region.GetFlavors()
if err != nil {
return "", err
return nil, errors.Wrapf(err, "GetFlavors")
}
if cpu == 0 && memoryMb == 0 {
return "", fmt.Errorf("failed to find instance type %s", name)
return nil, fmt.Errorf("failed to find instance type %s", name)
}
match := false
for _, flavor := range flavors {
for i := range flavors {
flavor := flavors[i]
flavorName := flavor.GetName()
if (len(name) == 0 || flavorName == name || flavorName == fmt.Sprintf("%s-%d", name, diskGB)) && flavor.GetCpuCoreCount() == cpu && flavor.GetMemorySizeMB() == memoryMb {
if diskGB <= flavor.GetSysDiskMaxSizeGB() {
return flavor.Id, nil
}
match = true
if (len(name) == 0 || flavorName == name || flavorName == fmt.Sprintf("%s-%d", name, diskGB)) &&
flavor.GetCpuCoreCount() == cpu &&
flavor.GetMemorySizeMB() == memoryMb &&
diskGB <= flavor.GetSysDiskMaxSizeGB() {
return &flavor, nil
}
}
if len(name) == 0 {
name = fmt.Sprintf("ecs.g1.c%dm%d", cpu, memoryMb/1024)
}
if match {
name = fmt.Sprintf("%s-%d", name, diskGB)
}
name = fmt.Sprintf("%s-%d", name, diskGB)
flavor, err := region.CreateFlavor(name, cpu, memoryMb, diskGB)
if err != nil {
return "", errors.Wrap(err, "CreateFlavor")
return nil, errors.Wrap(err, "CreateFlavor")
}
return flavor.Id, nil
return flavor, nil
}
func (region *SRegion) CreateISku(name string, vCpu int, memoryMb int) error {

7
pkg/multicloud/openstack/instance.go
View File

@@ -451,11 +451,14 @@ func (instance *SInstance) RebuildRoot(ctx context.Context, desc *cloudprovider.
func (instance *SInstance) ChangeConfig(ctx context.Context, config *cloudprovider.SManagedVMChangeConfig) error {
if (len(config.InstanceType) > 0 && instance.GetInstanceType() != config.InstanceType) || instance.GetVcpuCount() != config.Cpu || instance.GetVmemSizeMB() != config.MemoryMB {
flavorId, err := instance.host.zone.region.syncFlavor(config.InstanceType, config.Cpu, config.MemoryMB, 40)
flavor, err := instance.host.zone.region.syncFlavor(config.InstanceType, config.Cpu, config.MemoryMB, 40)
if err != nil {
return errors.Wrapf(err, "syncFlavor(%s)", config.InstanceType)
}
return instance.host.zone.region.ChangeConfig(instance, flavorId)
if flavor.Name == instance.Flavor.Name {
return nil
}
return instance.host.zone.region.ChangeConfig(instance, flavor.Id)
}
return nil
}