diff --git a/cmd/aliyuncli/main.go b/cmd/aliyuncli/main.go index c5a134392d..c7a71d84f7 100644 --- a/cmd/aliyuncli/main.go +++ b/cmd/aliyuncli/main.go @@ -5,9 +5,9 @@ import ( "os" "github.com/yunionio/log" - "github.com/yunionio/structarg" "github.com/yunionio/onecloud/pkg/util/aliyun" "github.com/yunionio/onecloud/pkg/util/shellutils" + "github.com/yunionio/structarg" _ "github.com/yunionio/onecloud/pkg/util/aliyun/shell" ) diff --git a/cmd/esxicli/main.go b/cmd/esxicli/main.go index 87377e52e6..e79ab69c64 100644 --- a/cmd/esxicli/main.go +++ b/cmd/esxicli/main.go @@ -15,9 +15,9 @@ import ( type BaseOptions struct { Help bool `help:"Show help"` - Host string `help:"Host IP or NAME" default:"$VMWARE_HOST"` - Port int `help:"Service port" default:"$VMWARE_PORT"` - Account string `help:"VCenter or ESXi Account" default:"$VMWARE_ACCOUNT"` + Host string `help:"Host IP or NAME" default:"$VMWARE_HOST"` + Port int `help:"Service port" default:"$VMWARE_PORT"` + Account string `help:"VCenter or ESXi Account" default:"$VMWARE_ACCOUNT"` Password string `help:"Password" default:"$VMWARE_PASSWORD"` SUBCOMMAND string `help:"aliyuncli subcommand" subcommand:"true"` } diff --git a/pkg/appsrv/dispatcher/dispatcher.go b/pkg/appsrv/dispatcher/dispatcher.go index b7184c4ea4..c6356128d2 100644 --- a/pkg/appsrv/dispatcher/dispatcher.go +++ b/pkg/appsrv/dispatcher/dispatcher.go @@ -7,10 +7,10 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient/modules" "github.com/yunionio/onecloud/pkg/appctx" "github.com/yunionio/onecloud/pkg/appsrv" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient/modules" ) func AddModelDispatcher(prefix string, app *appsrv.Application, manager IModelDispatchHandler) { diff --git a/pkg/appsrv/dispatcher/handlers.go b/pkg/appsrv/dispatcher/handlers.go index c4f4eb20ab..95a56900cf 100644 --- a/pkg/appsrv/dispatcher/handlers.go +++ b/pkg/appsrv/dispatcher/handlers.go @@ -4,8 +4,8 @@ import ( "context" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient/modules" "github.com/yunionio/onecloud/pkg/appsrv" + "github.com/yunionio/onecloud/pkg/mcclient/modules" ) type IMiddlewareFilter interface { diff --git a/pkg/appsrv/dispatcher/jointdispatcher.go b/pkg/appsrv/dispatcher/jointdispatcher.go index c8bf2d0a41..c52e0b356a 100644 --- a/pkg/appsrv/dispatcher/jointdispatcher.go +++ b/pkg/appsrv/dispatcher/jointdispatcher.go @@ -7,10 +7,10 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient/modules" "github.com/yunionio/onecloud/pkg/appctx" "github.com/yunionio/onecloud/pkg/appsrv" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient/modules" ) func AddJointModelDispatcher(prefix string, app *appsrv.Application, manager IJointModelDispatchHandler) { diff --git a/pkg/cloudcommon/db/adminsharablevirtual.go b/pkg/cloudcommon/db/adminsharablevirtual.go index f1f3f94d5c..15b9723822 100644 --- a/pkg/cloudcommon/db/adminsharablevirtual.go +++ b/pkg/cloudcommon/db/adminsharablevirtual.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/utils" ) diff --git a/pkg/cloudcommon/db/db_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index 263908194b..579680b22a 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -9,14 +9,14 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" + "github.com/yunionio/onecloud/pkg/appsrv" + "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/mcclient/auth" "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/pkg/util/filterclause" "github.com/yunionio/onecloud/pkg/util/httputils" + "github.com/yunionio/pkg/gotypes" + "github.com/yunionio/pkg/util/filterclause" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" diff --git a/pkg/cloudcommon/db/db_joint_dispatcher.go b/pkg/cloudcommon/db/db_joint_dispatcher.go index 72f8c500f8..f8b776b201 100644 --- a/pkg/cloudcommon/db/db_joint_dispatcher.go +++ b/pkg/cloudcommon/db/db_joint_dispatcher.go @@ -7,9 +7,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" + "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" ) diff --git a/pkg/cloudcommon/db/standalone.go b/pkg/cloudcommon/db/standalone.go index 246927a33b..9b96a175da 100644 --- a/pkg/cloudcommon/db/standalone.go +++ b/pkg/cloudcommon/db/standalone.go @@ -7,8 +7,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/regutils" "github.com/yunionio/pkg/util/stringutils" "github.com/yunionio/pkg/utils" diff --git a/pkg/cloudcommon/db/taskman/tasks.go b/pkg/cloudcommon/db/taskman/tasks.go index afd871c08a..0ebf6cb7eb 100644 --- a/pkg/cloudcommon/db/taskman/tasks.go +++ b/pkg/cloudcommon/db/taskman/tasks.go @@ -10,8 +10,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/appctx" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/util/httputils" "github.com/yunionio/pkg/util/reflectutils" "github.com/yunionio/pkg/util/stringutils" diff --git a/pkg/cloudcommon/db/virtualjointbase.go b/pkg/cloudcommon/db/virtualjointbase.go index 00412ad9d0..252c90bc18 100644 --- a/pkg/cloudcommon/db/virtualjointbase.go +++ b/pkg/cloudcommon/db/virtualjointbase.go @@ -7,8 +7,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/reflectutils" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/cloudcommon/db/virtualresource.go b/pkg/cloudcommon/db/virtualresource.go index 3424909212..a07ac9e192 100644 --- a/pkg/cloudcommon/db/virtualresource.go +++ b/pkg/cloudcommon/db/virtualresource.go @@ -8,8 +8,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/timeutils" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go index ef81f0b312..3e7b821dfb 100644 --- a/pkg/compute/guestdrivers/aliyun.go +++ b/pkg/compute/guestdrivers/aliyun.go @@ -7,8 +7,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/seclib" "github.com/yunionio/pkg/utils" diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index fc63c861c7..ed31af62c8 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -116,7 +116,6 @@ func (self *SManagedVirtualizedGuestDriver) RequestSyncstatusOnHost(ctx context. return body, nil } - func (self *SManagedVirtualizedGuestDriver) GetGuestVncInfo(userCred mcclient.TokenCredential, guest *models.SGuest, host *models.SHost) (*jsonutils.JSONDict, error) { ihost, err := host.GetIHost() if err != nil { @@ -137,4 +136,4 @@ func (self *SManagedVirtualizedGuestDriver) GetGuestVncInfo(userCred mcclient.To dataDict := data.(*jsonutils.JSONDict) return dataDict, nil -} \ No newline at end of file +} diff --git a/pkg/compute/guestdrivers/virtualization.go b/pkg/compute/guestdrivers/virtualization.go index 5cc14b5b55..fc0b1a8a8f 100644 --- a/pkg/compute/guestdrivers/virtualization.go +++ b/pkg/compute/guestdrivers/virtualization.go @@ -6,8 +6,8 @@ import ( "regexp" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index 6f6c54c16e..f3fc768fcf 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -8,10 +8,10 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" + "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/mcclient/auth" "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/httperrors" "github.com/yunionio/pkg/util/timeutils" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index 4c86b60e85..9322809774 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -2,14 +2,14 @@ package models import ( "context" + "database/sql" "fmt" "time" - "database/sql" "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/timeutils" "github.com/yunionio/pkg/utils" @@ -284,7 +284,6 @@ func (manager *SCloudproviderManager) FetchCloudproviderByIdOrName(providerId st return providerObj.(*SCloudprovider) } - type SCloudproviderUsage struct { HostCount int VpcCount int @@ -383,4 +382,4 @@ func (manager *SCloudproviderManager) migrateVCenterInfo(vc *SVCenter) error { cp.Provider = CLOUD_PROVIDER_VMWARE return manager.TableSpec().Insert(&cp) -} \ No newline at end of file +} diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 4b523c7422..1d39eca8dd 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -6,8 +6,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/compare" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 9e6ed5ca21..038d27e24b 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -9,8 +9,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/tristate" "github.com/yunionio/pkg/util/compare" "github.com/yunionio/pkg/util/fileutils" diff --git a/pkg/compute/models/guestdrivers.go b/pkg/compute/models/guestdrivers.go index 3d640991fe..7d4bebfc9d 100644 --- a/pkg/compute/models/guestdrivers.go +++ b/pkg/compute/models/guestdrivers.go @@ -5,9 +5,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" + "github.com/yunionio/onecloud/pkg/mcclient" ) type IGuestDriver interface { diff --git a/pkg/compute/models/hostschedtags.go b/pkg/compute/models/hostschedtags.go index 19425351ea..9b360e8fe1 100644 --- a/pkg/compute/models/hostschedtags.go +++ b/pkg/compute/models/hostschedtags.go @@ -5,8 +5,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "github.com/yunionio/onecloud/pkg/mcclient" ) type SHostschedtagManager struct { diff --git a/pkg/compute/models/hoststorages.go b/pkg/compute/models/hoststorages.go index 8a27fbd599..0ee01c8031 100644 --- a/pkg/compute/models/hoststorages.go +++ b/pkg/compute/models/hoststorages.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/tristate" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/hostwires.go b/pkg/compute/models/hostwires.go index 4c0a83c0c7..c9b684f9eb 100644 --- a/pkg/compute/models/hostwires.go +++ b/pkg/compute/models/hostwires.go @@ -4,9 +4,9 @@ import ( "context" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 8c171fc920..3654529fe3 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -7,9 +7,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/regutils" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/netinterfaces.go b/pkg/compute/models/netinterfaces.go index 09d86082ab..09d708c9cc 100644 --- a/pkg/compute/models/netinterfaces.go +++ b/pkg/compute/models/netinterfaces.go @@ -6,8 +6,8 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/regutils" ) diff --git a/pkg/compute/models/reservedips.go b/pkg/compute/models/reservedips.go index a7cce64e99..10a4981c04 100644 --- a/pkg/compute/models/reservedips.go +++ b/pkg/compute/models/reservedips.go @@ -6,9 +6,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/schedtags.go b/pkg/compute/models/schedtags.go index 7c8942d8c4..32cb4db38e 100644 --- a/pkg/compute/models/schedtags.go +++ b/pkg/compute/models/schedtags.go @@ -7,9 +7,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index ebc3c16bd8..783a2485ee 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -8,9 +8,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/secrules" "github.com/yunionio/pkg/util/stringutils" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index 4383ec6462..d87f13c91c 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -6,9 +6,9 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/storagecachedimages.go b/pkg/compute/models/storagecachedimages.go index 7a66055b46..c40282b28b 100644 --- a/pkg/compute/models/storagecachedimages.go +++ b/pkg/compute/models/storagecachedimages.go @@ -7,10 +7,10 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/utils" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/storagecaches.go b/pkg/compute/models/storagecaches.go index 35f4b67b30..fd9b2e8cbf 100644 --- a/pkg/compute/models/storagecaches.go +++ b/pkg/compute/models/storagecaches.go @@ -6,11 +6,11 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/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/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index cd37407d21..cbefa742b4 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -5,11 +5,11 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/yunionio/onecloud/pkg/compute/options" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/tristate" "github.com/yunionio/pkg/util/compare" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/vcenters.go b/pkg/compute/models/vcenters.go index 335147a883..530b323d06 100644 --- a/pkg/compute/models/vcenters.go +++ b/pkg/compute/models/vcenters.go @@ -5,8 +5,8 @@ import ( "time" "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "github.com/yunionio/onecloud/pkg/mcclient" ) type SVCenterManager struct { diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 676c476c9d..bfe95fd84f 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -7,11 +7,11 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/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/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/compare" "github.com/yunionio/pkg/util/netutils" "github.com/yunionio/sqlchemy" diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go index e576f14d53..5708343f77 100644 --- a/pkg/compute/models/wires.go +++ b/pkg/compute/models/wires.go @@ -7,10 +7,10 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/cloudcommon/db" "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/pkg/util/compare" "github.com/yunionio/sqlchemy" ) diff --git a/pkg/compute/tasks/guest_batch_create_task.go b/pkg/compute/tasks/guest_batch_create_task.go index 50d3af7953..fa57be62dc 100644 --- a/pkg/compute/tasks/guest_batch_create_task.go +++ b/pkg/compute/tasks/guest_batch_create_task.go @@ -6,14 +6,14 @@ import ( "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/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/onecloud/pkg/mcclient/auth" + "github.com/yunionio/onecloud/pkg/mcclient/modules" ) type GuestBatchCreateTask struct { diff --git a/pkg/compute/usages/handler.go b/pkg/compute/usages/handler.go index b6f6a5cf79..23b7b6c2c1 100644 --- a/pkg/compute/usages/handler.go +++ b/pkg/compute/usages/handler.go @@ -7,13 +7,13 @@ import ( json "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/compute/models" "github.com/yunionio/onecloud/pkg/appctx" "github.com/yunionio/onecloud/pkg/appsrv" + "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "github.com/yunionio/onecloud/pkg/compute/models" "github.com/yunionio/onecloud/pkg/httperrors" + "github.com/yunionio/onecloud/pkg/mcclient" + "github.com/yunionio/onecloud/pkg/mcclient/auth" "github.com/yunionio/pkg/tristate" "github.com/yunionio/pkg/utils" ) diff --git a/pkg/mcclient/modules/managers.go b/pkg/mcclient/modules/managers.go index 817ddfd0ee..b138009ed1 100644 --- a/pkg/mcclient/modules/managers.go +++ b/pkg/mcclient/modules/managers.go @@ -114,4 +114,4 @@ func NewYunionAgentManager(keyword, keywordPlural string, columns, adminColumns adminColumns: adminColumns, serviceType: "yunionagent"}, Keyword: keyword, KeywordPlural: keywordPlural} -} \ No newline at end of file +} diff --git a/pkg/scheduler/cache/sync/default.go b/pkg/scheduler/cache/sync/default.go index a71a5423ba..d518ab73a7 100644 --- a/pkg/scheduler/cache/sync/default.go +++ b/pkg/scheduler/cache/sync/default.go @@ -21,9 +21,9 @@ func getUpdate(d []interface{}) ([]string, error) { func defaultSyncItems() []cache.CachedItem { return []cache.CachedItem{ - //newGlanceCache(), - //newNetworkCache(), - //newNetworksDataCache(), + //newGlanceCache(), + //newNetworkCache(), + //newNetworksDataCache(), } } diff --git a/pkg/util/aliyun/instance.go b/pkg/util/aliyun/instance.go index a061eb5fcd..cb62d9b1e5 100644 --- a/pkg/util/aliyun/instance.go +++ b/pkg/util/aliyun/instance.go @@ -1,8 +1,8 @@ package aliyun import ( - "time" "fmt" + "time" "github.com/yunionio/jsonutils" "github.com/yunionio/log" diff --git a/pkg/util/aliyun/shell/printutils.go b/pkg/util/aliyun/shell/printutils.go index 26996d39f3..3091fa5777 100644 --- a/pkg/util/aliyun/shell/printutils.go +++ b/pkg/util/aliyun/shell/printutils.go @@ -8,4 +8,4 @@ func printList(data interface{}, total, offset, limit int, columns []string) { func printObject(obj interface{}) { printutils.PrintInterfaceObject(obj) -} \ No newline at end of file +} diff --git a/pkg/util/aliyun/storagecache.go b/pkg/util/aliyun/storagecache.go index 44281f36fe..51faa2135d 100644 --- a/pkg/util/aliyun/storagecache.go +++ b/pkg/util/aliyun/storagecache.go @@ -6,11 +6,11 @@ import ( "time" "github.com/yunionio/log" + "github.com/yunionio/onecloud/pkg/cloudprovider" + "github.com/yunionio/onecloud/pkg/compute/options" "github.com/yunionio/onecloud/pkg/mcclient" "github.com/yunionio/onecloud/pkg/mcclient/auth" "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" ) type SStoragecache struct { diff --git a/pkg/util/esxi/datacenter.go b/pkg/util/esxi/datacenter.go index 05a6f9e032..167c724d6a 100644 --- a/pkg/util/esxi/datacenter.go +++ b/pkg/util/esxi/datacenter.go @@ -5,12 +5,12 @@ import ( "github.com/yunionio/onecloud/pkg/cloudprovider" ) -var DATACENTER_PROPS = []string {"name", "parent", "datastore"} +var DATACENTER_PROPS = []string{"name", "parent", "datastore"} type SDatacenter struct { SManagedObject - ihosts []cloudprovider.ICloudHost + ihosts []cloudprovider.ICloudHost istorages []cloudprovider.ICloudStorage Name string @@ -75,4 +75,4 @@ func (dc *SDatacenter) GetIStorages() ([]cloudprovider.ICloudStorage, error) { return nil, err } return dc.istorages, nil -} \ No newline at end of file +} diff --git a/pkg/util/esxi/host.go b/pkg/util/esxi/host.go index b766df43cb..6b580cd8c0 100644 --- a/pkg/util/esxi/host.go +++ b/pkg/util/esxi/host.go @@ -5,60 +5,60 @@ import ( "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/vmware/govmomi/vim25/types" - "github.com/yunionio/pkg/util/netutils" "github.com/yunionio/log" + "github.com/yunionio/onecloud/pkg/cloudprovider" + "github.com/yunionio/onecloud/pkg/compute/models" + "github.com/yunionio/pkg/util/netutils" ) -var HOST_SYSTEM_PROPS = []string {"name", "parent", "summary", "config", "hardware", "vm"} +var HOST_SYSTEM_PROPS = []string{"name", "parent", "summary", "config", "hardware", "vm"} type SHostNicInfo struct { - Dev string - Driver string - Mac string - Index int - LinkUp bool - IpAddr string - Mtu int + Dev string + Driver string + Mac string + Index int + LinkUp bool + IpAddr string + Mtu int NicType string } type SHostStorageAdapterInfo struct { - Device string - Model string - Driver string - Pci string - Drivers []SHostStorageDriverInfo + Device string + Model string + Driver string + Pci string + Drivers []SHostStorageDriverInfo Enclosure int } type SHostStorageDriverInfo struct { - CN string - Name string - Model string - Vendor string + CN string + Name string + Model string + Vendor string Revision string - Status string - SSD bool - Dev string - Size int + Status string + SSD bool + Dev string + Size int } type SHostStorageEnclosureInfo struct { - CN string - Name string - Model string - Vendor string + CN string + Name string + Model string + Vendor string Revision string - Status string + Status string } type SHost struct { SManagedObject - nicInfo []SHostNicInfo + nicInfo []SHostNicInfo storageInfo []SHostStorageAdapterInfo vms []cloudprovider.ICloudVM @@ -72,18 +72,17 @@ func (self *SHost) getHostSystem() *mo.HostSystem { return self.object.(*mo.HostSystem) } - func (self *SHost) GetGlobalId() string { return self.GetAccessIp() } func (self *SHost) GetStatus() string { /* - HostSystemPowerStatePoweredOn = HostSystemPowerState("poweredOn") - HostSystemPowerStatePoweredOff = HostSystemPowerState("poweredOff") - HostSystemPowerStateStandBy = HostSystemPowerState("standBy") - HostSystemPowerStateUnknown = HostSystemPowerState("unknown") - */ + HostSystemPowerStatePoweredOn = HostSystemPowerState("poweredOn") + HostSystemPowerStatePoweredOff = HostSystemPowerState("poweredOff") + HostSystemPowerStateStandBy = HostSystemPowerState("standBy") + HostSystemPowerStateUnknown = HostSystemPowerState("unknown") + */ switch self.getHostSystem().Summary.Runtime.PowerState { case types.HostSystemPowerStatePoweredOn: return models.HOST_STATUS_RUNNING @@ -143,7 +142,7 @@ func (self *SHost) GetIVMById(id string) (cloudprovider.ICloudVM, error) { if vms[i].GetGlobalId() == id { return vms[i], nil } - } + } return nil, cloudprovider.ErrNotFound } @@ -165,10 +164,10 @@ func (self *SHost) GetEnabled() bool { func (self *SHost) GetHostStatus() string { /* - HostSystemConnectionStateConnected = HostSystemConnectionState("connected") - HostSystemConnectionStateNotResponding = HostSystemConnectionState("notResponding") - HostSystemConnectionStateDisconnected = HostSystemConnectionState("disconnected") - */ + HostSystemConnectionStateConnected = HostSystemConnectionState("connected") + HostSystemConnectionStateNotResponding = HostSystemConnectionState("notResponding") + HostSystemConnectionStateDisconnected = HostSystemConnectionState("disconnected") + */ switch self.getHostSystem().Summary.Runtime.ConnectionState { case types.HostSystemConnectionStateConnected: return models.HOST_ONLINE @@ -177,7 +176,6 @@ func (self *SHost) GetHostStatus() string { } } - func findHostNicByMac(nicInfoList []SHostNicInfo, mac string) *SHostNicInfo { for i := 0; i < len(nicInfoList); i += 1 { if nicInfoList[i].Mac == mac { @@ -256,8 +254,8 @@ func (self *SHost) GetAccessMac() string { } type SSysInfo struct { - Manufacture string - Model string + Manufacture string + Model string SerialNumber string } @@ -290,7 +288,7 @@ func (self *SHost) GetCpuMhz() int { } func (self *SHost) GetMemSizeMB() int { - return int(self.getHostSystem().Summary.Hardware.MemorySize/1024/1024) + return int(self.getHostSystem().Summary.Hardware.MemorySize / 1024 / 1024) } /*func (self *SHost) fetchStorageInfo() { @@ -356,7 +354,7 @@ func (self *SHost) GetManagerId() string { } func (self *SHost) CreateVM(name string, imgId string, sysDiskSize int, cpu int, memMB int, vswitchId string, ipAddr string, desc string, -passwd string, storageType string, diskSizes []int, publicKey string) (cloudprovider.ICloudVM, error) { + passwd string, storageType string, diskSizes []int, publicKey string) (cloudprovider.ICloudVM, error) { log.Debugf("CreateVM") return nil, cloudprovider.ErrNotImplemented } diff --git a/pkg/util/esxi/manager.go b/pkg/util/esxi/manager.go index 92248093a7..88dd511e62 100644 --- a/pkg/util/esxi/manager.go +++ b/pkg/util/esxi/manager.go @@ -7,17 +7,17 @@ import ( "reflect" "github.com/vmware/govmomi" + "github.com/vmware/govmomi/object" + "github.com/vmware/govmomi/property" "github.com/vmware/govmomi/view" "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - "github.com/vmware/govmomi/property" - "github.com/vmware/govmomi/object" "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/vmware/govmomi/session" + "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/yunionio/onecloud/pkg/compute/models" "strings" ) @@ -231,4 +231,4 @@ func (cli *SESXiClient) FindHostByIp(hostIp string) (*SHost, error) { func (cli *SESXiClient) acquireCloneTicket() (string, error) { manager := session.NewManager(cli.client.Client) return manager.AcquireCloneTicket(cli.context) -} \ No newline at end of file +} diff --git a/pkg/util/esxi/mobase.go b/pkg/util/esxi/mobase.go index 7daa855d4f..5a0756257c 100644 --- a/pkg/util/esxi/mobase.go +++ b/pkg/util/esxi/mobase.go @@ -3,14 +3,14 @@ package esxi import ( "github.com/vmware/govmomi/vim25/mo" "github.com/yunionio/log" - "reflect" "github.com/yunionio/onecloud/pkg/cloudprovider" + "reflect" ) type SManagedObject struct { - manager *SESXiClient + manager *SESXiClient datacenter *SDatacenter - object mo.Entity + object mo.Entity path []string } @@ -57,7 +57,7 @@ func reverseArray(array interface{}) { return } tmp := reflect.Indirect(reflect.New(arrayValue.Type().Elem())) - for i, j := 0, arrayValue.Len() - 1; i < j; i, j = i + 1, j - 1 { + for i, j := 0, arrayValue.Len()-1; i < j; i, j = i+1, j-1 { tmpi := arrayValue.Index(i) tmpj := arrayValue.Index(j) tmp.Set(tmpi) @@ -121,4 +121,4 @@ func (self *SManagedObject) GetDatacenterPath() []string { } path := dc.GetPath() return path[1:] -} \ No newline at end of file +} diff --git a/pkg/util/esxi/provider/provider.go b/pkg/util/esxi/provider/provider.go index 696801fd81..21d488e347 100644 --- a/pkg/util/esxi/provider/provider.go +++ b/pkg/util/esxi/provider/provider.go @@ -2,15 +2,14 @@ package provider import ( "net/url" - "strings" "strconv" + "strings" "github.com/yunionio/jsonutils" "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/util/esxi" "github.com/yunionio/onecloud/pkg/cloudprovider" - + "github.com/yunionio/onecloud/pkg/util/esxi" ) type SESXiProviderFactory struct { @@ -116,4 +115,3 @@ func (self *SESXiProvider) GetIStorageById(id string) (cloudprovider.ICloudStora func (self *SESXiProvider) GetIStoragecacheById(id string) (cloudprovider.ICloudStoragecache, error) { return nil, cloudprovider.ErrNotImplemented } - diff --git a/pkg/util/esxi/shell/datacenter.go b/pkg/util/esxi/shell/datacenter.go index 30ee3f2cf7..9a3d25c863 100644 --- a/pkg/util/esxi/shell/datacenter.go +++ b/pkg/util/esxi/shell/datacenter.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/shellutils" "github.com/yunionio/onecloud/pkg/util/esxi" + "github.com/yunionio/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/esxi/shell/host.go b/pkg/util/esxi/shell/host.go index bf0254bd7e..740311184b 100644 --- a/pkg/util/esxi/shell/host.go +++ b/pkg/util/esxi/shell/host.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/shellutils" "github.com/yunionio/onecloud/pkg/util/esxi" + "github.com/yunionio/onecloud/pkg/util/shellutils" ) func init() { @@ -33,4 +33,4 @@ func init() { printObject(host) return nil }) -} \ No newline at end of file +} diff --git a/pkg/util/esxi/shell/store.go b/pkg/util/esxi/shell/store.go index 2198704509..32fed02cd8 100644 --- a/pkg/util/esxi/shell/store.go +++ b/pkg/util/esxi/shell/store.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/shellutils" "github.com/yunionio/onecloud/pkg/util/esxi" + "github.com/yunionio/onecloud/pkg/util/shellutils" ) func init() { @@ -21,4 +21,4 @@ func init() { printList(ds, nil) return nil }) -} \ No newline at end of file +} diff --git a/pkg/util/esxi/shell/utils.go b/pkg/util/esxi/shell/utils.go index 255ce645d8..58103c413e 100644 --- a/pkg/util/esxi/shell/utils.go +++ b/pkg/util/esxi/shell/utils.go @@ -2,7 +2,6 @@ package shell import "github.com/yunionio/onecloud/pkg/util/printutils" - func printList(data interface{}, columns []string) { printutils.PrintGetterList(data, columns) } diff --git a/pkg/util/esxi/shell/virtualmachine.go b/pkg/util/esxi/shell/virtualmachine.go index e8af328777..587e5b08ce 100644 --- a/pkg/util/esxi/shell/virtualmachine.go +++ b/pkg/util/esxi/shell/virtualmachine.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/shellutils" "github.com/yunionio/onecloud/pkg/util/esxi" "github.com/yunionio/onecloud/pkg/util/printutils" + "github.com/yunionio/onecloud/pkg/util/shellutils" ) func init() { @@ -25,7 +25,7 @@ func init() { type VirtualMachineShowOptions struct { HOSTIP string `help:"Host IP"` - VMID string `help:"VM ID"` + VMID string `help:"VM ID"` } shellutils.R(&VirtualMachineShowOptions{}, "vm-show", "Show vm details", func(cli *esxi.SESXiClient, args *VirtualMachineShowOptions) error { host, err := cli.FindHostByIp(args.HOSTIP) diff --git a/pkg/util/esxi/storage.go b/pkg/util/esxi/storage.go index 340d8235db..e1c89478bf 100644 --- a/pkg/util/esxi/storage.go +++ b/pkg/util/esxi/storage.go @@ -8,8 +8,7 @@ import ( "github.com/yunionio/onecloud/pkg/compute/models" ) -var DATASTORE_PROPS = []string {"name", "parent"} - +var DATASTORE_PROPS = []string{"name", "parent"} type SDatastore struct { SManagedObject @@ -86,4 +85,4 @@ func (self *SDatastore) GetManagerId() string { func (self *SDatastore) CreateIDisk(name string, sizeGb int, desc string) (cloudprovider.ICloudDisk, error) { return nil, cloudprovider.ErrNotImplemented -} \ No newline at end of file +} diff --git a/pkg/util/esxi/virtualmachine.go b/pkg/util/esxi/virtualmachine.go index 1cbbfd6fa2..34cf3b25fb 100644 --- a/pkg/util/esxi/virtualmachine.go +++ b/pkg/util/esxi/virtualmachine.go @@ -11,8 +11,8 @@ import ( "github.com/yunionio/onecloud/pkg/cloudprovider" "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/vmware/govmomi/object" "fmt" + "github.com/vmware/govmomi/object" ) var VIRTUAL_MACHINE_PROPS = []string{"name", "parent", "runtime", "summary"} @@ -31,7 +31,6 @@ func (self *SVirtualMachine) getVirtualMachine() *mo.VirtualMachine { return self.object.(*mo.VirtualMachine) } - func (self *SVirtualMachine) GetGlobalId() string { return self.getUuid() } @@ -178,12 +177,12 @@ func (self *SVirtualMachine) acquireWebmksTicket(ticketType string) (jsonutils.J port = 443 } /* - ret.Add(jsonutils.NewString(ticketType), "type") - ret.Add(jsonutils.NewString(ticket.Host), "host") - ret.Add(jsonutils.NewInt(int64(ticket.Port)), "port") - ret.Add(jsonutils.NewString(ticket.Ticket), "ticket") - ret.Add(jsonutils.NewString(ticket.SslThumbprint), "slThumbprint") - ret.Add(jsonutils.NewString(ticket.CfgFile), "cfgFile") + ret.Add(jsonutils.NewString(ticketType), "type") + ret.Add(jsonutils.NewString(ticket.Host), "host") + ret.Add(jsonutils.NewInt(int64(ticket.Port)), "port") + ret.Add(jsonutils.NewString(ticket.Ticket), "ticket") + ret.Add(jsonutils.NewString(ticket.SslThumbprint), "slThumbprint") + ret.Add(jsonutils.NewString(ticket.CfgFile), "cfgFile") */ url := fmt.Sprintf("wss://%s:%d/ticket/%s", host, port, ticket.Ticket) ret.Add(jsonutils.NewString("wmks"), "protocol") @@ -205,4 +204,4 @@ func (self *SVirtualMachine) acquireVmrcUrl() (jsonutils.JSONObject, error) { url := fmt.Sprintf("vmrc://clone:%s@%s:%d/?moid=%s", ticket, self.manager.host, port, self.GetId()) ret.Add(jsonutils.NewString(url), "url") return ret, nil -} \ No newline at end of file +} diff --git a/pkg/util/printutils/printgetter.go b/pkg/util/printutils/printgetter.go index 902e09163c..8184927fbc 100644 --- a/pkg/util/printutils/printgetter.go +++ b/pkg/util/printutils/printgetter.go @@ -1,13 +1,13 @@ package printutils import ( + "fmt" "reflect" "strings" - "fmt" "github.com/yunionio/jsonutils" - "github.com/yunionio/pkg/utils" "github.com/yunionio/onecloud/pkg/mcclient/modules" + "github.com/yunionio/pkg/utils" ) func getter2json(obj interface{}) jsonutils.JSONObject { @@ -57,4 +57,4 @@ func PrintGetterList(data interface{}, columns []string) { func PrintGetterObject(obj interface{}) { PrintJSONObject(getter2json(obj)) -} \ No newline at end of file +}