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

修正：1. 由于系统盘大小设置单位未转换，导致阿里云创建主机失败 2.

Browse Source 
伪删除阿里云主机后，detach了系统盘，导致主机恢复后无系统盘 3.
修正一些格式错误 4. 补充一些climc命令
This commit is contained in:
Qiu Jian
2018-07-31 00:42:18 +08:00
parent 46dab16451
commit fcee2de326
98 changed files with 564 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/aliyun.go
+1 -1
View File
@@ -101,7 +101,7 @@ func (self *SAliyunGuestDriver) GetJsonDescAtHost(ctx context.Context, guest *mo
imageId := disk.GetTemplateId()
scimg := models.StoragecachedimageManager.GetStoragecachedimage(cache.Id, imageId)
config.ExternalImageId = scimg.ExternalId
config.SysDiskSize = disk.DiskSize
config.SysDiskSize = disk.DiskSize / 1024 // MB => GB
} else {
config.DataDisks[i-1] = disk.DiskSize / 1024 // MB => GB
}
pkg/compute/models/cloudregions.go
+8 -1
View File
@@ -305,8 +305,15 @@ func (manager *SCloudregionManager) ListItemFilter(ctx context.Context, q *sqlch
q = q.Equals("provider", manager.Provider)
}
if jsonutils.QueryBoolean(query, "usable", false) {
networks := NetworkManager.Query().SubQuery()
wires := WireManager.Query().SubQuery()
vpcs := VpcManager.Query().SubQuery()
sq := vpcs.Query(sqlchemy.DISTINCT("cloudregion_id", vpcs.Field("cloudregion_id"))).Equals("status", VPC_STATUS_AVAILABLE)
sq := vpcs.Query(sqlchemy.DISTINCT("cloudregion_id", vpcs.Field("cloudregion_id")))
sq = sq.Join(wires, sqlchemy.Equals(vpcs.Field("id"), wires.Field("vpc_id")))
sq = sq.Join(networks, sqlchemy.Equals(wires.Field("id"), networks.Field("wire_id")))
sq = sq.Filter(sqlchemy.Equals(networks.Field("status"), NETWORK_STATUS_AVAILABLE))
q = q.Filter(sqlchemy.In(q.Field("id"), sq.SubQuery()))
}
return q, nil
pkg/compute/models/guestdrivers.go
+3 -2
View File
@@ -2,11 +2,12 @@ package models
import (
"context"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
)
type IGuestDriver interface {
pkg/compute/models/guests.go
+1 -1
View File
@@ -1942,7 +1942,7 @@ func (self *SGuest) DoPendingDelete(ctx context.Context, userCred mcclient.Token
for _, guestdisk := range self.GetDisks() {
disk := guestdisk.GetDisk()
storage := disk.GetStorage()
if utils.IsInStringArray(storage.StorageType, sysutils.LOCAL_STORAGE_TYPES) {
if utils.IsInStringArray(storage.StorageType, sysutils.LOCAL_STORAGE_TYPES) || disk.DiskType == DISK_TYPE_SYS || disk.DiskType == DISK_TYPE_SWAP {
disk.DoPendingDelete(ctx, userCred)
} else {
self.detachDisk(ctx, disk, userCred)
pkg/compute/models/hosts.go
+7 -8
View File
@@ -3,26 +3,26 @@ package models
import (
"context"
"fmt"
"net/http"
"net/url"
"strconv"
"net/http"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/auth"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/pkg/util/netutils"
"github.com/yunionio/pkg/util/regutils"
"github.com/yunionio/pkg/util/sysutils"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
const (
@@ -147,7 +147,6 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
}
var scopeQuery *sqlchemy.SSubQuery
schedTagStr := jsonutils.GetAnyString(query, []string{"schedtag", "schedtag_id"})
if len(schedTagStr) > 0 {
schedTag, _ := SchedtagManager.FetchByIdOrName("", schedTagStr)
@@ -158,7 +157,7 @@ func (manager *SHostManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
scopeQuery = hostschedtags.Query(hostschedtags.Field("host_id")).Equals("schedtag_id", schedTag.GetId()).SubQuery()
}
wireStr :=jsonutils.GetAnyString(query, []string{"wire", "wire_id"})
wireStr := jsonutils.GetAnyString(query, []string{"wire", "wire_id"})
if len(wireStr) > 0 {
wire, _ := WireManager.FetchByIdOrName("", wireStr)
if wire == nil {
pkg/compute/models/hostschedtags.go
+2 -1
View File
@@ -2,10 +2,11 @@ package models
import (
"context"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
)
type SHostschedtagManager struct {
pkg/compute/models/hoststorages.go
+4 -3
View File
@@ -3,12 +3,13 @@ package models
import (
"context"
"fmt"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/sqlchemy"
)
type SHoststorageManager struct {
pkg/compute/models/hostwires.go
+3 -2
View File
@@ -2,10 +2,11 @@ package models
import (
"context"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/sqlchemy"
)
pkg/compute/models/initdb.go
+1 -1
View File
@@ -1,8 +1,8 @@
package models
import (
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
)
func InitDB() error {
pkg/compute/models/isolated_devices.go
+3 -3
View File
@@ -5,14 +5,14 @@ import (
"fmt"
"strings"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/util/regutils"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
const (
pkg/compute/models/keypairs.go
+3 -2
View File
@@ -2,10 +2,11 @@ package models
import (
"context"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/sqlchemy"
)
pkg/compute/models/netinterfaces.go
+2 -1
View File
@@ -3,10 +3,11 @@ package models
import (
"context"
"database/sql"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/util/regutils"
)
pkg/compute/models/networks.go
+4 -4
View File
@@ -6,21 +6,21 @@ import (
"fmt"
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/pkg/util/fileutils"
"github.com/yunionio/pkg/util/netutils"
"github.com/yunionio/pkg/util/regutils"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
const (
pkg/compute/models/quotas.go
+2 -1
View File
@@ -3,9 +3,10 @@ package models
import (
"errors"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/jsonutils"
"github.com/yunionio/pkg/tristate"
)
pkg/compute/models/reservedips.go
+3 -2
View File
@@ -3,11 +3,12 @@ package models
import (
"context"
"fmt"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/sqlchemy"
)
pkg/compute/models/schedtags.go
+4 -3
View File
@@ -4,13 +4,14 @@ import (
"context"
"database/sql"
"strings"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
type SchedStrategyType string
pkg/compute/models/secgrouprules.go
+3 -3
View File
@@ -6,14 +6,14 @@ import (
"strconv"
"strings"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/util/secrules"
"github.com/yunionio/pkg/util/stringutils"
"github.com/yunionio/sqlchemy"
)
type SSecurityGroupRuleManager struct {
pkg/compute/models/secgroups.go
+2 -2
View File
@@ -4,11 +4,11 @@ import (
"context"
"strings"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/sqlchemy"
)
pkg/compute/models/storagecachedimages.go
+5 -4
View File
@@ -4,14 +4,15 @@ import (
"context"
"fmt"
"time"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/sqlchemy"
)
const (
pkg/compute/models/storagecaches.go
+6 -6
View File
@@ -3,14 +3,15 @@ package models
import (
"context"
"database/sql"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/sqlchemy"
)
type SStoragecacheManager struct {
@@ -165,7 +166,7 @@ func (self *SStoragecache) StartImageCacheTask(ctx context.Context, userCred mcc
}
func (self *SStoragecache) StartImageUncacheTask(ctx context.Context, userCred mcclient.TokenCredential, imageId string, isForce bool, parentTaskId string) error {
if ! isForce {
if !isForce {
err := self.ValidateDeleteCondition(ctx)
if err != nil {
return err
@@ -219,7 +220,6 @@ func (self *SStoragecache) ValidateDeleteCondition(ctx context.Context) error {
return self.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
}
func (self *SStoragecache) AllowPerformUncacheImage(ctx context.Context, userCred mcclient.TokenCredential, query jsonutils.JSONObject, data jsonutils.JSONObject) bool {
return userCred.IsSystemAdmin()
}
pkg/compute/models/storages.go
+5 -4
View File
@@ -2,16 +2,17 @@ package models
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/sqlchemy"
)
const (
pkg/compute/models/usage.go
+1 -1
View File
@@ -1,8 +1,8 @@
package models
import (
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/sqlchemy"
)
pkg/compute/models/vcenters.go
+2 -1
View File
@@ -3,9 +3,10 @@ package models
import (
"context"
"time"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
)
type SVCenterManager struct {
pkg/compute/models/vpcs.go
+6 -6
View File
@@ -3,18 +3,18 @@ package models
import (
"context"
"database/sql"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/pkg/util/netutils"
"github.com/yunionio/sqlchemy"
)
const (
@@ -461,4 +461,4 @@ func (manager *SVpcManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQue
}
return q, nil
}
}
pkg/compute/models/wires.go
+5 -5
View File
@@ -2,17 +2,17 @@ package models
import (
"context"
"fmt"
"database/sql"
"fmt"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/sqlchemy"
)
type SWireManager struct {
pkg/compute/models/zones.go
+6 -6
View File
@@ -2,17 +2,17 @@ package models
import (
"context"
"fmt"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/sqlchemy"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/pkg/util/compare"
"github.com/yunionio/sqlchemy"
)
const (
@@ -57,7 +57,7 @@ func (manager *SZoneManager) AllowListItems(ctx context.Context, userCred mcclie
func (zone *SZone) ValidateDeleteCondition(ctx context.Context) error {
usage := zone.GeneralUsage()
if ! usage.isEmpty() {
if !usage.isEmpty() {
return httperrors.NewNotEmptyError("not empty zone")
}
return zone.SStandaloneResourceBase.ValidateDeleteCondition(ctx)
pkg/compute/service/service.go
+1 -1
View File
@@ -5,12 +5,12 @@ import (
_ "github.com/go-sql-driver/mysql"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/compute"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/log"
_ "github.com/yunionio/onecloud/pkg/compute/tasks"
pkg/compute/tasks/baremetal_convert_hypervisor_task.go
+2 -2
View File
@@ -3,11 +3,11 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
const (
pkg/compute/tasks/cloud_provider_sync_info_task.go
+2 -2
View File
@@ -4,12 +4,12 @@ import (
"context"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/pkg/utils"
)
pkg/compute/tasks/disk_delete_task.go
+3 -3
View File
@@ -3,9 +3,9 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/onecloud/pkg/compute/options"
)
@@ -27,7 +27,7 @@ func (self *DiskDeleteTask) OnInit(ctx context.Context, obj db.IStandaloneModel,
db.OpsLog.LogEvent(disk, db.ACT_DELOCATE_FAIL, reason, self.UserCred)
return
}
if options.Options.EnablePendingDelete && ! disk.PendingDeleted && ! jsonutils.QueryBoolean(self.Params, "purge", false) && ! jsonutils.QueryBoolean(self.Params, "override_pending_delete", false) {
if options.Options.EnablePendingDelete && !disk.PendingDeleted && !jsonutils.QueryBoolean(self.Params, "purge", false) && !jsonutils.QueryBoolean(self.Params, "override_pending_delete", false) {
self.startPendingDeleteDisk(ctx, disk)
} else {
self.startDeleteDisk(ctx, disk)
@@ -43,7 +43,7 @@ func (self *DiskDeleteTask) startDeleteDisk(ctx context.Context, disk *models.SD
storage := disk.GetStorage()
host := storage.GetMasterHost()
isPurge := false
if (host == nil || ! host.Enabled) && jsonutils.QueryBoolean(self.Params, "purge", false) {
if (host == nil || !host.Enabled) && jsonutils.QueryBoolean(self.Params, "purge", false) {
isPurge = true
}
disk.SetStatus(self.UserCred, models.DISK_DEALLOC, "")
pkg/compute/tasks/guest_batch_create_task.go
+4 -4
View File
@@ -4,16 +4,16 @@ import (
"context"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient/auth"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient/auth"
"github.com/yunionio/mcclient/modules"
)
type GuestBatchCreateTask struct {
pkg/compute/tasks/guest_create_task.go
+2 -2
View File
@@ -5,12 +5,12 @@ import (
"fmt"
"time"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type GuestCreateTask struct {
pkg/compute/tasks/guest_delete_task.go
+1 -1
View File
@@ -3,12 +3,12 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/onecloud/pkg/compute/options"
"github.com/yunionio/jsonutils"
"github.com/yunionio/pkg/utils"
)
pkg/compute/tasks/guest_deploy_task.go
+2 -2
View File
@@ -4,11 +4,11 @@ import (
"context"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type GuestDeployTask struct {
pkg/compute/tasks/guest_detach_all_disks_task.go
+1 -1
View File
@@ -3,10 +3,10 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
)
type GuestDetachAllDisksTask struct {
pkg/compute/tasks/guest_detach_disk_task.go
+1 -1
View File
@@ -3,9 +3,9 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/jsonutils"
)
type GuestDetachDiskTask struct {
pkg/compute/tasks/guest_insert_iso_task.go
+1 -1
View File
@@ -3,9 +3,9 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/jsonutils"
)
type GuestInsertIsoTask struct {
pkg/compute/tasks/guest_start_task.go
+1 -1
View File
@@ -3,10 +3,10 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
)
type GuestStartTask struct {
pkg/compute/tasks/guest_stop_task.go
+2 -2
View File
@@ -4,11 +4,11 @@ import (
"context"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type GuestStopTask struct {
pkg/compute/tasks/guest_syncstatus_task.go
+2 -2
View File
@@ -3,12 +3,12 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type GuestSyncstatusTask struct {
pkg/compute/tasks/guest_undeploy_task.go
+1 -1
View File
@@ -3,10 +3,10 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/pkg/util/httputils"
)
pkg/compute/tasks/network_create_task.go
+3 -3
View File
@@ -2,15 +2,15 @@ package tasks
import (
"context"
"fmt"
"time"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type NetworkCreateTask struct {
pkg/compute/tasks/network_delete_task.go
+2 -2
View File
@@ -3,12 +3,12 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type NetworkDeleteTask struct {
pkg/compute/tasks/storage_cache_image_task.go
+1 -1
View File
@@ -4,10 +4,10 @@ import (
"context"
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
)
type StorageCacheImageTask struct {
pkg/compute/tasks/storage_uncache_image_task.go
+1 -1
View File
@@ -3,9 +3,9 @@ package tasks
import (
"context"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/compute/models"
)
pkg/compute/tasks/vpc_create_task.go
+3 -3
View File
@@ -2,14 +2,14 @@ package tasks
import (
"context"
"time"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type VpcCreateTask struct {
pkg/compute/tasks/vpc_delete_task.go
+3 -3
View File
@@ -2,14 +2,14 @@ package tasks
import (
"context"
"time"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman"
"github.com/yunionio/onecloud/pkg/cloudprovider"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
)
type VpcDeleteTask struct {
pkg/compute/usages/handler.go
+5 -5
View File
@@ -5,15 +5,15 @@ import (
"fmt"
"net/http"
"github.com/yunionio/pkg/appctx"
"github.com/yunionio/pkg/appsrv"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/pkg/httperrors"
json "github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/auth"
"github.com/yunionio/onecloud/pkg/cloudcommon/db"
"github.com/yunionio/onecloud/pkg/compute/models"
"github.com/yunionio/pkg/appctx"
"github.com/yunionio/pkg/appsrv"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/pkg/tristate"
"github.com/yunionio/pkg/utils"
)