diff --git a/cmd/climc/shell/copyright.go b/cmd/climc/shell/copyright.go index a13a547b5f..95493d84d4 100644 --- a/cmd/climc/shell/copyright.go +++ b/cmd/climc/shell/copyright.go @@ -16,6 +16,7 @@ package shell import ( "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/cmd/climc/shell/dbinstance_backups.go b/cmd/climc/shell/dbinstance_backups.go index ba2f068381..0c47a98eab 100644 --- a/cmd/climc/shell/dbinstance_backups.go +++ b/cmd/climc/shell/dbinstance_backups.go @@ -16,6 +16,7 @@ package shell import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/mcclient/options" diff --git a/cmd/climc/shell/dbinstances.go b/cmd/climc/shell/dbinstances.go index 47fa11061a..3d8832b16b 100644 --- a/cmd/climc/shell/dbinstances.go +++ b/cmd/climc/shell/dbinstances.go @@ -19,6 +19,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/modules" diff --git a/cmd/climc/shell/identityproviders.go b/cmd/climc/shell/identityproviders.go index 41aebe6cb6..819b02078f 100644 --- a/cmd/climc/shell/identityproviders.go +++ b/cmd/climc/shell/identityproviders.go @@ -17,12 +17,12 @@ package shell import ( "fmt" + "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/identity" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/mcclient/options" - - "yunion.io/x/jsonutils" ) func init() { diff --git a/cmd/climc/shell/k8s/raw.go b/cmd/climc/shell/k8s/raw.go index 155070fc89..1dfee77bc3 100644 --- a/cmd/climc/shell/k8s/raw.go +++ b/cmd/climc/shell/k8s/raw.go @@ -21,6 +21,7 @@ import ( "os/exec" "github.com/ghodss/yaml" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/cmd/climc/shell/networkinterfacenetworks.go b/cmd/climc/shell/networkinterfacenetworks.go index 6ab2ca0305..5b3cc87f23 100644 --- a/cmd/climc/shell/networkinterfacenetworks.go +++ b/cmd/climc/shell/networkinterfacenetworks.go @@ -16,6 +16,7 @@ package shell import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/modules" diff --git a/cmd/climc/shell/notify.go b/cmd/climc/shell/notify.go index 66ac849c2d..8741bd701b 100644 --- a/cmd/climc/shell/notify.go +++ b/cmd/climc/shell/notify.go @@ -16,6 +16,7 @@ package shell import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/cmd/climc/shell/servers.go b/cmd/climc/shell/servers.go index f1271c45e0..0c25e409a0 100644 --- a/cmd/climc/shell/servers.go +++ b/cmd/climc/shell/servers.go @@ -23,6 +23,7 @@ import ( "path/filepath" "gopkg.in/yaml.v2" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/cmd/cryptool/main.go b/cmd/cryptool/main.go index 4a02d02028..b8e3f59aff 100644 --- a/cmd/cryptool/main.go +++ b/cmd/cryptool/main.go @@ -20,9 +20,8 @@ import ( "yunion.io/x/structarg" - "yunion.io/x/onecloud/pkg/util/shellutils" - _ "yunion.io/x/onecloud/cmd/cryptool/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/redfishcli/main.go b/cmd/redfishcli/main.go index 7ce01c8669..15922a915b 100644 --- a/cmd/redfishcli/main.go +++ b/cmd/redfishcli/main.go @@ -21,11 +21,10 @@ import ( "yunion.io/x/structarg" - "yunion.io/x/onecloud/pkg/util/redfish" - "yunion.io/x/onecloud/pkg/util/shellutils" - _ "yunion.io/x/onecloud/cmd/redfishcli/shell" + "yunion.io/x/onecloud/pkg/util/redfish" _ "yunion.io/x/onecloud/pkg/util/redfish/loader" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/ucloudcli/main.go b/cmd/ucloudcli/main.go index b6d2d452e1..00e11b7c94 100644 --- a/cmd/ucloudcli/main.go +++ b/cmd/ucloudcli/main.go @@ -17,10 +17,10 @@ package main import ( "fmt" "os" - "yunion.io/x/onecloud/pkg/multicloud/ucloud" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/multicloud/ucloud" _ "yunion.io/x/onecloud/pkg/multicloud/ucloud/shell" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/apigateway/handler/csrfexempt.go b/pkg/apigateway/handler/csrfexempt.go index c98e9d3840..c66c7b8b9f 100644 --- a/pkg/apigateway/handler/csrfexempt.go +++ b/pkg/apigateway/handler/csrfexempt.go @@ -21,7 +21,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/util/sets" "yunion.io/x/onecloud/pkg/appctx" @@ -29,6 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type CSRFResourceHandler struct { diff --git a/pkg/apigateway/handler/misc.go b/pkg/apigateway/handler/misc.go index c9c0dafaf7..dc128bcf17 100644 --- a/pkg/apigateway/handler/misc.go +++ b/pkg/apigateway/handler/misc.go @@ -30,10 +30,9 @@ import ( "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" - - "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/pkg/apigateway/handler/request.go b/pkg/apigateway/handler/request.go index 36fe057155..4a3fcbbad4 100644 --- a/pkg/apigateway/handler/request.go +++ b/pkg/apigateway/handler/request.go @@ -19,7 +19,6 @@ import ( "net/http" "github.com/pkg/errors" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/jsonutils" "yunion.io/x/pkg/utils" @@ -29,6 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type Request struct { diff --git a/pkg/apigateway/handler/resource.go b/pkg/apigateway/handler/resource.go index 80f235ed76..80ab51d709 100644 --- a/pkg/apigateway/handler/resource.go +++ b/pkg/apigateway/handler/resource.go @@ -22,11 +22,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/util/excelutils" ) diff --git a/pkg/apigateway/handler/rpc.go b/pkg/apigateway/handler/rpc.go index eaf5d9f179..f704420a13 100644 --- a/pkg/apigateway/handler/rpc.go +++ b/pkg/apigateway/handler/rpc.go @@ -22,13 +22,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/apigateway/service/service.go b/pkg/apigateway/service/service.go index 4c00661767..8763772356 100644 --- a/pkg/apigateway/service/service.go +++ b/pkg/apigateway/service/service.go @@ -21,7 +21,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/apigateway/app" "yunion.io/x/onecloud/pkg/apigateway/clientman" @@ -29,6 +28,7 @@ import ( app_common "yunion.io/x/onecloud/pkg/cloudcommon/app" common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) func StartService() { diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go index 193154f061..b1226cd996 100644 --- a/pkg/apis/compute/cloudaccount.go +++ b/pkg/apis/compute/cloudaccount.go @@ -16,6 +16,7 @@ package compute import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/apis" ) diff --git a/pkg/apis/compute/secgroup.go b/pkg/apis/compute/secgroup.go index ec0b61a887..daa831960d 100644 --- a/pkg/apis/compute/secgroup.go +++ b/pkg/apis/compute/secgroup.go @@ -4,9 +4,11 @@ import ( "fmt" "github.com/pkg/errors" - "yunion.io/x/onecloud/pkg/apis" + "yunion.io/x/pkg/util/regutils" "yunion.io/x/pkg/util/secrules" + + "yunion.io/x/onecloud/pkg/apis" ) type SSecgroupRuleCreateInput struct { diff --git a/pkg/appsrv/fetch.go b/pkg/appsrv/fetch.go index fc45d11fcd..63341370d3 100644 --- a/pkg/appsrv/fetch.go +++ b/pkg/appsrv/fetch.go @@ -15,11 +15,12 @@ package appsrv import ( + "encoding/xml" "io/ioutil" "net/http" - "encoding/xml" "github.com/pkg/errors" + "yunion.io/x/jsonutils" ) diff --git a/pkg/appsrv/send.go b/pkg/appsrv/send.go index ea8519a898..d0169f61d2 100644 --- a/pkg/appsrv/send.go +++ b/pkg/appsrv/send.go @@ -16,12 +16,13 @@ package appsrv import ( "encoding/xml" + "fmt" + "io" "net/http" "strconv" - "fmt" "github.com/pkg/errors" - "io" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/gotypes" diff --git a/pkg/baremetal/service/service.go b/pkg/baremetal/service/service.go index b039210ef3..82bc37f8eb 100644 --- a/pkg/baremetal/service/service.go +++ b/pkg/baremetal/service/service.go @@ -29,7 +29,6 @@ import ( common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" "yunion.io/x/onecloud/pkg/cloudcommon/service" "yunion.io/x/onecloud/pkg/hostman/guestfs/fsdriver" - _ "yunion.io/x/onecloud/pkg/util/redfish/loader" ) diff --git a/pkg/baremetal/utils/disktool/disktool.go b/pkg/baremetal/utils/disktool/disktool.go index e68bd26cb2..5038c39508 100644 --- a/pkg/baremetal/utils/disktool/disktool.go +++ b/pkg/baremetal/utils/disktool/disktool.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/baremetal/utils/raid/drivers/drivers.go b/pkg/baremetal/utils/raid/drivers/drivers.go index f82ec0fd42..40f9500a59 100644 --- a/pkg/baremetal/utils/raid/drivers/drivers.go +++ b/pkg/baremetal/utils/raid/drivers/drivers.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/baremetal/utils/raid/megactl/megactl.go b/pkg/baremetal/utils/raid/megactl/megactl.go index d15af630ab..3ae2d41a88 100644 --- a/pkg/baremetal/utils/raid/megactl/megactl.go +++ b/pkg/baremetal/utils/raid/megactl/megactl.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/log" "yunion.io/x/pkg/tristate" "yunion.io/x/pkg/util/stringutils" diff --git a/pkg/baremetal/utils/raid/raid.go b/pkg/baremetal/utils/raid/raid.go index af5b941b6a..2a7bc00a8c 100644 --- a/pkg/baremetal/utils/raid/raid.go +++ b/pkg/baremetal/utils/raid/raid.go @@ -18,6 +18,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/log" "yunion.io/x/pkg/tristate" diff --git a/pkg/cloudcommon/cmdline/helper_test.go b/pkg/cloudcommon/cmdline/helper_test.go index 240683e407..74d057842f 100644 --- a/pkg/cloudcommon/cmdline/helper_test.go +++ b/pkg/cloudcommon/cmdline/helper_test.go @@ -19,6 +19,7 @@ import ( "testing" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/apis/compute" ) diff --git a/pkg/cloudcommon/cmdline/parser_test.go b/pkg/cloudcommon/cmdline/parser_test.go index e1a1a7a514..264a92f6f7 100644 --- a/pkg/cloudcommon/cmdline/parser_test.go +++ b/pkg/cloudcommon/cmdline/parser_test.go @@ -19,6 +19,7 @@ import ( "testing" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/apis/compute" ) diff --git a/pkg/cloudcommon/cronman/cronman.go b/pkg/cloudcommon/cronman/cronman.go index 093a129d3a..b7a5aa801a 100644 --- a/pkg/cloudcommon/cronman/cronman.go +++ b/pkg/cloudcommon/cronman/cronman.go @@ -22,6 +22,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/log" "yunion.io/x/onecloud/pkg/appctx" diff --git a/pkg/cloudcommon/db/db_joint_dispatcher.go b/pkg/cloudcommon/db/db_joint_dispatcher.go index 5156432974..d747d93281 100644 --- a/pkg/cloudcommon/db/db_joint_dispatcher.go +++ b/pkg/cloudcommon/db/db_joint_dispatcher.go @@ -21,13 +21,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type DBJointModelDispatcher struct { diff --git a/pkg/cloudcommon/db/fieldtags.go b/pkg/cloudcommon/db/fieldtags.go index efb572a5e0..f8b18d24e6 100644 --- a/pkg/cloudcommon/db/fieldtags.go +++ b/pkg/cloudcommon/db/fieldtags.go @@ -16,6 +16,7 @@ package db import ( "sort" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/rbacutils" "yunion.io/x/onecloud/pkg/util/stringutils2" diff --git a/pkg/cloudcommon/db/quotas/quotas.go b/pkg/cloudcommon/db/quotas/quotas.go index a6f974509a..84065c95a6 100644 --- a/pkg/cloudcommon/db/quotas/quotas.go +++ b/pkg/cloudcommon/db/quotas/quotas.go @@ -16,11 +16,11 @@ package quotas import ( "context" + "database/sql" "yunion.io/x/jsonutils" "yunion.io/x/log" - "database/sql" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/cloudcommon/db/sharedresource.go b/pkg/cloudcommon/db/sharedresource.go index 3c3e83f607..28d925d28d 100644 --- a/pkg/cloudcommon/db/sharedresource.go +++ b/pkg/cloudcommon/db/sharedresource.go @@ -17,9 +17,10 @@ package db import ( "context" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/sqlchemy" ) // sharing resoure between project diff --git a/pkg/cloudcommon/db/tenantcache.go b/pkg/cloudcommon/db/tenantcache.go index acfe442a10..bef82f099d 100644 --- a/pkg/cloudcommon/db/tenantcache.go +++ b/pkg/cloudcommon/db/tenantcache.go @@ -21,10 +21,9 @@ import ( "runtime/debug" "time" - "yunion.io/x/jsonutils" - "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/sqlchemy" diff --git a/pkg/cloudcommon/etcd/handler/dispatcher.go b/pkg/cloudcommon/etcd/handler/dispatcher.go index b89792726f..c6a5fec71f 100644 --- a/pkg/cloudcommon/etcd/handler/dispatcher.go +++ b/pkg/cloudcommon/etcd/handler/dispatcher.go @@ -22,7 +22,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/utils" @@ -33,6 +32,7 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) func NewEtcdModelHandler(manger base.IEtcdModelManager) *SEtcdModelHandler { diff --git a/pkg/cloudcommon/notifyclient/notify.go b/pkg/cloudcommon/notifyclient/notify.go index 230e05500d..27f253813f 100644 --- a/pkg/cloudcommon/notifyclient/notify.go +++ b/pkg/cloudcommon/notifyclient/notify.go @@ -26,12 +26,12 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/mcclient/modules/notify" ) diff --git a/pkg/cloudcommon/service/services.go b/pkg/cloudcommon/service/services.go index caab07f7e5..3355079179 100644 --- a/pkg/cloudcommon/service/services.go +++ b/pkg/cloudcommon/service/services.go @@ -22,12 +22,12 @@ import ( "syscall" "yunion.io/x/log" + "yunion.io/x/pkg/util/signalutils" + "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudcommon/options" "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/procutils" - "yunion.io/x/pkg/util/signalutils" - "yunion.io/x/pkg/utils" ) type IService interface { diff --git a/pkg/cloudcommon/validators/misc.go b/pkg/cloudcommon/validators/misc.go index 8ee97b06a8..81fe95986e 100644 --- a/pkg/cloudcommon/validators/misc.go +++ b/pkg/cloudcommon/validators/misc.go @@ -16,8 +16,9 @@ package validators import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/mcclient" ) type ModelFilterOptions struct { diff --git a/pkg/cloudcommon/validators/validators.go b/pkg/cloudcommon/validators/validators.go index e947cfd257..376b301218 100644 --- a/pkg/cloudcommon/validators/validators.go +++ b/pkg/cloudcommon/validators/validators.go @@ -28,10 +28,9 @@ import ( "regexp" "strings" - "yunion.io/x/pkg/util/netutils" - "yunion.io/x/jsonutils" "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/util/netutils" "yunion.io/x/pkg/util/regutils" "yunion.io/x/sqlchemy" diff --git a/pkg/cloudnet/models/ifaces.go b/pkg/cloudnet/models/ifaces.go index 9286d3e0a2..56e94e2124 100644 --- a/pkg/cloudnet/models/ifaces.go +++ b/pkg/cloudnet/models/ifaces.go @@ -25,13 +25,13 @@ import ( "yunion.io/x/jsonutils" yerrors "yunion.io/x/pkg/util/errors" + "yunion.io/x/pkg/util/netutils" "yunion.io/x/sqlchemy" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/validators" cnutils "yunion.io/x/onecloud/pkg/cloudnet/utils" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/util/netutils" ) var regexpIfname = regexp.MustCompile(`[A-Za-z][A-Za-z0-9]{0,14}`) diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index 06da15c7bc..4cc52bacd2 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -21,8 +21,6 @@ import ( "time" "github.com/pkg/errors" - "yunion.io/x/onecloud/pkg/util/cloudinit" - "yunion.io/x/onecloud/pkg/util/seclib2" "yunion.io/x/jsonutils" "yunion.io/x/log" @@ -37,6 +35,8 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/billing" + "yunion.io/x/onecloud/pkg/util/cloudinit" + "yunion.io/x/onecloud/pkg/util/seclib2" ) type SManagedVirtualizedGuestDriver struct { diff --git a/pkg/compute/guestdrivers/openstack.go b/pkg/compute/guestdrivers/openstack.go index 303486e63a..f6f869d085 100644 --- a/pkg/compute/guestdrivers/openstack.go +++ b/pkg/compute/guestdrivers/openstack.go @@ -19,6 +19,8 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" @@ -26,7 +28,6 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/billing" - "yunion.io/x/pkg/utils" ) type SOpenStackGuestDriver struct { diff --git a/pkg/compute/hostdrivers/managedvirtual.go b/pkg/compute/hostdrivers/managedvirtual.go index c7b6d9ce1a..60d49e09ae 100644 --- a/pkg/compute/hostdrivers/managedvirtual.go +++ b/pkg/compute/hostdrivers/managedvirtual.go @@ -21,10 +21,10 @@ import ( "time" "github.com/pkg/errors" - "yunion.io/x/pkg/utils" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" diff --git a/pkg/compute/models/cloudregionresource.go b/pkg/compute/models/cloudregionresource.go index dc6e5a7064..fdd11ea8dd 100644 --- a/pkg/compute/models/cloudregionresource.go +++ b/pkg/compute/models/cloudregionresource.go @@ -19,6 +19,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/models/cloudsyncelasticcache.go b/pkg/compute/models/cloudsyncelasticcache.go index c8db477482..fb239225f1 100644 --- a/pkg/compute/models/cloudsyncelasticcache.go +++ b/pkg/compute/models/cloudsyncelasticcache.go @@ -19,9 +19,9 @@ import ( "fmt" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/models/dbinstance_accounts.go b/pkg/compute/models/dbinstance_accounts.go index 3742636baa..5df27d3269 100644 --- a/pkg/compute/models/dbinstance_accounts.go +++ b/pkg/compute/models/dbinstance_accounts.go @@ -20,6 +20,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" @@ -29,10 +34,6 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/seclib2" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/pkg/utils" - "yunion.io/x/sqlchemy" ) type SDBInstanceAccountManager struct { diff --git a/pkg/compute/models/dbinstance_backups.go b/pkg/compute/models/dbinstance_backups.go index 5226b2ad5b..c436b0f86a 100644 --- a/pkg/compute/models/dbinstance_backups.go +++ b/pkg/compute/models/dbinstance_backups.go @@ -23,6 +23,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" @@ -31,9 +35,6 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/sqlchemy" ) type SDBInstanceBackupManager struct { diff --git a/pkg/compute/models/dbinstance_databases.go b/pkg/compute/models/dbinstance_databases.go index 2c9136ccaa..20373d591b 100644 --- a/pkg/compute/models/dbinstance_databases.go +++ b/pkg/compute/models/dbinstance_databases.go @@ -19,6 +19,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" @@ -27,9 +31,6 @@ import ( "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/sqlchemy" ) type SDBInstanceDatabaseManager struct { diff --git a/pkg/compute/models/dbinstance_parameters.go b/pkg/compute/models/dbinstance_parameters.go index 8e3f6811c6..e8bd40ead4 100644 --- a/pkg/compute/models/dbinstance_parameters.go +++ b/pkg/compute/models/dbinstance_parameters.go @@ -19,15 +19,16 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/sqlchemy" ) type SDBInstanceParameterManager struct { diff --git a/pkg/compute/models/dbinstance_privileges.go b/pkg/compute/models/dbinstance_privileges.go index 3c749de166..f49152fe0b 100644 --- a/pkg/compute/models/dbinstance_privileges.go +++ b/pkg/compute/models/dbinstance_privileges.go @@ -18,15 +18,16 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/sqlchemy" ) type SDBInstancePrivilegeManager struct { diff --git a/pkg/compute/models/dbinstance_skus.go b/pkg/compute/models/dbinstance_skus.go index e96d7ca5ad..4cd0258b79 100644 --- a/pkg/compute/models/dbinstance_skus.go +++ b/pkg/compute/models/dbinstance_skus.go @@ -8,6 +8,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" "yunion.io/x/onecloud/pkg/cloudcommon/validators" @@ -16,10 +21,6 @@ import ( "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" "yunion.io/x/onecloud/pkg/util/httputils" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/pkg/utils" - "yunion.io/x/sqlchemy" ) type SDBInstanceSkuManager struct { diff --git a/pkg/compute/models/dbinstancejoints.go b/pkg/compute/models/dbinstancejoints.go index 2bf3d01100..c8d4f461d5 100644 --- a/pkg/compute/models/dbinstancejoints.go +++ b/pkg/compute/models/dbinstancejoints.go @@ -15,8 +15,9 @@ package models import ( - "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/pkg/errors" + + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SDBInstanceJointsManager struct { diff --git a/pkg/compute/models/dbinstancenetworks.go b/pkg/compute/models/dbinstancenetworks.go index 31e40f2973..f930539a3a 100644 --- a/pkg/compute/models/dbinstancenetworks.go +++ b/pkg/compute/models/dbinstancenetworks.go @@ -19,15 +19,15 @@ import ( "database/sql" "fmt" - api "yunion.io/x/onecloud/pkg/apis/compute" - "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/compare" "yunion.io/x/pkg/util/netutils" - "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/models/dbinstances.go b/pkg/compute/models/dbinstances.go index a92c430719..5d98912644 100644 --- a/pkg/compute/models/dbinstances.go +++ b/pkg/compute/models/dbinstances.go @@ -23,6 +23,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" + billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" @@ -33,12 +40,6 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/billing" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/tristate" - "yunion.io/x/pkg/util/compare" - "yunion.io/x/pkg/util/netutils" - "yunion.io/x/pkg/utils" - "yunion.io/x/sqlchemy" ) type SDBInstanceManager struct { diff --git a/pkg/compute/models/external_projects.go b/pkg/compute/models/external_projects.go index 73f8f99f00..685f5353ed 100644 --- a/pkg/compute/models/external_projects.go +++ b/pkg/compute/models/external_projects.go @@ -21,6 +21,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" @@ -28,7 +29,6 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/sqlchemy" ) type SExternalProjectManager struct { diff --git a/pkg/compute/models/host_recycle.go b/pkg/compute/models/host_recycle.go index 08442a1573..4e96cfe972 100644 --- a/pkg/compute/models/host_recycle.go +++ b/pkg/compute/models/host_recycle.go @@ -16,9 +16,7 @@ package models import ( "context" - "fmt" - - // "strings" + "fmt" // "strings" "time" "github.com/golang-plus/errors" diff --git a/pkg/compute/models/loadbalancerbackendgroups.go b/pkg/compute/models/loadbalancerbackendgroups.go index 3284f53568..cb9d140318 100644 --- a/pkg/compute/models/loadbalancerbackendgroups.go +++ b/pkg/compute/models/loadbalancerbackendgroups.go @@ -18,6 +18,7 @@ import ( "context" "database/sql" "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" diff --git a/pkg/compute/models/loadbalancercertificates.go b/pkg/compute/models/loadbalancercertificates.go index b7f40f1e0c..90c3ef3679 100644 --- a/pkg/compute/models/loadbalancercertificates.go +++ b/pkg/compute/models/loadbalancercertificates.go @@ -24,6 +24,7 @@ import ( "fmt" "strings" "time" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/sqlchemy" diff --git a/pkg/compute/models/networkschedtags.go b/pkg/compute/models/networkschedtags.go index 729e4eccb9..bf31afb43e 100644 --- a/pkg/compute/models/networkschedtags.go +++ b/pkg/compute/models/networkschedtags.go @@ -16,6 +16,7 @@ package models import ( "context" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudcommon/db" diff --git a/pkg/compute/models/skus.go b/pkg/compute/models/skus.go index 487cbcc3a5..133642132b 100644 --- a/pkg/compute/models/skus.go +++ b/pkg/compute/models/skus.go @@ -25,14 +25,7 @@ import ( "strings" "time" - "yunion.io/x/onecloud/pkg/compute/options" - "github.com/pkg/errors" - "yunion.io/x/onecloud/pkg/cloudcommon/validators" - "yunion.io/x/onecloud/pkg/mcclient/auth" - "yunion.io/x/onecloud/pkg/mcclient/modules" - - "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/jsonutils" "yunion.io/x/log" @@ -44,9 +37,14 @@ import ( api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/util/hashcache" "yunion.io/x/onecloud/pkg/util/logclient" "yunion.io/x/onecloud/pkg/util/rbacutils" diff --git a/pkg/compute/models/snapshotpolicydisks.go b/pkg/compute/models/snapshotpolicydisks.go index 09a8ea834b..18818f6000 100644 --- a/pkg/compute/models/snapshotpolicydisks.go +++ b/pkg/compute/models/snapshotpolicydisks.go @@ -20,11 +20,11 @@ import ( "database/sql" "fmt" "strings" - "yunion.io/x/sqlchemy" "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" + "yunion.io/x/sqlchemy" "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" diff --git a/pkg/compute/models/storageschedtags.go b/pkg/compute/models/storageschedtags.go index d03d74e4b0..70608a5518 100644 --- a/pkg/compute/models/storageschedtags.go +++ b/pkg/compute/models/storageschedtags.go @@ -16,6 +16,7 @@ package models import ( "context" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudcommon/db" diff --git a/pkg/compute/models/zoneresource.go b/pkg/compute/models/zoneresource.go index 710a927885..55b2e19b7b 100644 --- a/pkg/compute/models/zoneresource.go +++ b/pkg/compute/models/zoneresource.go @@ -18,6 +18,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/regiondrivers/azure.go b/pkg/compute/regiondrivers/azure.go index e8ab3e54ce..283f41dda9 100644 --- a/pkg/compute/regiondrivers/azure.go +++ b/pkg/compute/regiondrivers/azure.go @@ -18,6 +18,7 @@ import ( "context" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/compute/regiondrivers/openstack.go b/pkg/compute/regiondrivers/openstack.go index 9cdd3d6462..f4f1328fe5 100644 --- a/pkg/compute/regiondrivers/openstack.go +++ b/pkg/compute/regiondrivers/openstack.go @@ -18,6 +18,7 @@ import ( "context" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/regiondrivers/ucloud.go b/pkg/compute/regiondrivers/ucloud.go index 63abe50547..f4423bba94 100644 --- a/pkg/compute/regiondrivers/ucloud.go +++ b/pkg/compute/regiondrivers/ucloud.go @@ -18,6 +18,7 @@ import ( "context" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/compute/regiondrivers/zstack.go b/pkg/compute/regiondrivers/zstack.go index 33ae903109..dbb2478be8 100644 --- a/pkg/compute/regiondrivers/zstack.go +++ b/pkg/compute/regiondrivers/zstack.go @@ -18,6 +18,7 @@ import ( "context" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/validators" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/service/service.go b/pkg/compute/service/service.go index 7bd5bc5eeb..e720d021b9 100644 --- a/pkg/compute/service/service.go +++ b/pkg/compute/service/service.go @@ -34,7 +34,6 @@ import ( _ "yunion.io/x/onecloud/pkg/compute/regiondrivers" _ "yunion.io/x/onecloud/pkg/compute/storagedrivers" _ "yunion.io/x/onecloud/pkg/compute/tasks" - _ "yunion.io/x/onecloud/pkg/multicloud/loader" ) diff --git a/pkg/compute/storagedrivers/gpfs.go b/pkg/compute/storagedrivers/gpfs.go index 00b232cf12..1609a94f26 100644 --- a/pkg/compute/storagedrivers/gpfs.go +++ b/pkg/compute/storagedrivers/gpfs.go @@ -20,12 +20,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/timeutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/compute/options" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/util/timeutils" ) type SGpfsStorageDriver struct { diff --git a/pkg/compute/storagedrivers/rbd.go b/pkg/compute/storagedrivers/rbd.go index 8bbcd03c99..3f1849a948 100644 --- a/pkg/compute/storagedrivers/rbd.go +++ b/pkg/compute/storagedrivers/rbd.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go b/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go index ad3d0ef623..47a389b330 100644 --- a/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go +++ b/pkg/compute/tasks/dbinstance_account_grant_privilege_task.go @@ -19,13 +19,14 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/errors" ) type DBInstanceAccountGrantPrivilegeTask struct { diff --git a/pkg/compute/tasks/dbinstance_account_reset_password_task.go b/pkg/compute/tasks/dbinstance_account_reset_password_task.go index ef548c832f..be76f1ae24 100644 --- a/pkg/compute/tasks/dbinstance_account_reset_password_task.go +++ b/pkg/compute/tasks/dbinstance_account_reset_password_task.go @@ -18,12 +18,13 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/errors" ) type DBInstanceAccountResetPasswordTask struct { diff --git a/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go b/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go index b9e9128fc9..03b2c02949 100644 --- a/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go +++ b/pkg/compute/tasks/dbinstance_account_revoke_privilege_task.go @@ -19,13 +19,14 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/errors" ) type DBInstanceAccountRevokePrivilegeTask struct { diff --git a/pkg/compute/tasks/dbinstance_account_set_privileges_task.go b/pkg/compute/tasks/dbinstance_account_set_privileges_task.go index 5b067b2a7a..e409fce02c 100644 --- a/pkg/compute/tasks/dbinstance_account_set_privileges_task.go +++ b/pkg/compute/tasks/dbinstance_account_set_privileges_task.go @@ -20,13 +20,14 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/errors" ) type DBInstanceAccountSetPrivilegesTask struct { diff --git a/pkg/compute/tasks/dbinstance_public_connection_task.go b/pkg/compute/tasks/dbinstance_public_connection_task.go index c6a6ff9216..c792036de5 100644 --- a/pkg/compute/tasks/dbinstance_public_connection_task.go +++ b/pkg/compute/tasks/dbinstance_public_connection_task.go @@ -19,13 +19,14 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/errors" ) type DBInstancePublicConnectionTask struct { diff --git a/pkg/compute/tasks/guest_block_io_throttle_task.go b/pkg/compute/tasks/guest_block_io_throttle_task.go index f2c47c1d78..f08a2d0a51 100644 --- a/pkg/compute/tasks/guest_block_io_throttle_task.go +++ b/pkg/compute/tasks/guest_block_io_throttle_task.go @@ -19,6 +19,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" diff --git a/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go b/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go index 7bc8b38187..6bc1c1fcb2 100644 --- a/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go +++ b/pkg/compute/tasks/loadbalancer_backendgroup_create_task.go @@ -19,6 +19,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" diff --git a/pkg/compute/tasks/loadbalancer_listener_create_task.go b/pkg/compute/tasks/loadbalancer_listener_create_task.go index 6c2364b84c..81beb673b0 100644 --- a/pkg/compute/tasks/loadbalancer_listener_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_create_task.go @@ -17,6 +17,7 @@ package tasks import ( "context" "fmt" + "yunion.io/x/jsonutils" api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go index 3d1a4086fa..26e098a4e9 100644 --- a/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go +++ b/pkg/compute/tasks/loadbalancer_listener_rule_create_task.go @@ -17,6 +17,7 @@ package tasks import ( "context" "fmt" + "yunion.io/x/jsonutils" api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/compute/tasks/server_sku_delete_task.go b/pkg/compute/tasks/server_sku_delete_task.go index a5f0d825a9..cf6467fd30 100644 --- a/pkg/compute/tasks/server_sku_delete_task.go +++ b/pkg/compute/tasks/server_sku_delete_task.go @@ -18,6 +18,7 @@ import ( "context" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/hostman/guestfs/core.go b/pkg/hostman/guestfs/core.go index f5962b988f..60af893e77 100644 --- a/pkg/hostman/guestfs/core.go +++ b/pkg/hostman/guestfs/core.go @@ -19,6 +19,7 @@ import ( "math/rand" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/hostman/guestfs/sshpart/sshpart.go b/pkg/hostman/guestfs/sshpart/sshpart.go index 331e2521f7..8230ef09b0 100644 --- a/pkg/hostman/guestfs/sshpart/sshpart.go +++ b/pkg/hostman/guestfs/sshpart/sshpart.go @@ -25,6 +25,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/hostman/guestman/guestman.go b/pkg/hostman/guestman/guestman.go index 3848a8a9f2..0efa84951f 100644 --- a/pkg/hostman/guestman/guestman.go +++ b/pkg/hostman/guestman/guestman.go @@ -26,6 +26,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/regutils" diff --git a/pkg/hostman/guestman/qemu-kvmhelper.go b/pkg/hostman/guestman/qemu-kvmhelper.go index 7573976dde..39a910ce31 100644 --- a/pkg/hostman/guestman/qemu-kvmhelper.go +++ b/pkg/hostman/guestman/qemu-kvmhelper.go @@ -22,6 +22,7 @@ import ( "github.com/mdlayher/arp" "github.com/mdlayher/ethernet" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/hostman/hostdeployer/apis/utils.go b/pkg/hostman/hostdeployer/apis/utils.go index 56de239fbb..792418c3f7 100644 --- a/pkg/hostman/hostdeployer/apis/utils.go +++ b/pkg/hostman/hostdeployer/apis/utils.go @@ -19,6 +19,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/types" ) diff --git a/pkg/hostman/hostdeployer/deployserver/deployserver.go b/pkg/hostman/hostdeployer/deployserver/deployserver.go index 1b36bfe06b..7647089e75 100644 --- a/pkg/hostman/hostdeployer/deployserver/deployserver.go +++ b/pkg/hostman/hostdeployer/deployserver/deployserver.go @@ -23,6 +23,7 @@ import ( "strings" "google.golang.org/grpc" + "yunion.io/x/log" common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" diff --git a/pkg/hostman/hostinfo/hostbridge/linux_bridge.go b/pkg/hostman/hostinfo/hostbridge/linux_bridge.go index b68cf7c2f5..0881882066 100644 --- a/pkg/hostman/hostinfo/hostbridge/linux_bridge.go +++ b/pkg/hostman/hostinfo/hostbridge/linux_bridge.go @@ -22,9 +22,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/hostman/options" "yunion.io/x/onecloud/pkg/util/procutils" - "yunion.io/x/pkg/utils" ) func NewLinuxBridgeDeriver(bridge, inter, ip string) (*SLinuxBridgeDriver, error) { diff --git a/pkg/hostman/storageman/disk_base.go b/pkg/hostman/storageman/disk_base.go index f95f12e02f..125516e4c9 100644 --- a/pkg/hostman/storageman/disk_base.go +++ b/pkg/hostman/storageman/disk_base.go @@ -20,6 +20,7 @@ import ( "path" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/hostman/storageman/disk_nas.go b/pkg/hostman/storageman/disk_nas.go index f45320a7dd..7637e7f7ef 100644 --- a/pkg/hostman/storageman/disk_nas.go +++ b/pkg/hostman/storageman/disk_nas.go @@ -20,6 +20,7 @@ import ( "path" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/hostman/storageman/storage_local.go b/pkg/hostman/storageman/storage_local.go index 7862ad0b58..7f1785bd31 100644 --- a/pkg/hostman/storageman/storage_local.go +++ b/pkg/hostman/storageman/storage_local.go @@ -22,6 +22,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/timeutils" diff --git a/pkg/image/models/image_guest_joint.go b/pkg/image/models/image_guest_joint.go index 7335bba1de..4a52f43f39 100644 --- a/pkg/image/models/image_guest_joint.go +++ b/pkg/image/models/image_guest_joint.go @@ -17,9 +17,10 @@ package models import ( "context" + "yunion.io/x/pkg/errors" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/errors" ) type SGuestImageJointManager struct { diff --git a/pkg/keystone/service/service.go b/pkg/keystone/service/service.go index 38e35225b4..6a90c38712 100644 --- a/pkg/keystone/service/service.go +++ b/pkg/keystone/service/service.go @@ -27,21 +27,17 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/cronman" "yunion.io/x/onecloud/pkg/cloudcommon/db" common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" - "yunion.io/x/onecloud/pkg/cloudcommon/policy" - - // "yunion.io/x/onecloud/pkg/keystone/keys" + "yunion.io/x/onecloud/pkg/cloudcommon/policy" // "yunion.io/x/onecloud/pkg/keystone/keys" "yunion.io/x/onecloud/pkg/keystone/cronjobs" - "yunion.io/x/onecloud/pkg/keystone/models" - "yunion.io/x/onecloud/pkg/keystone/options" - "yunion.io/x/onecloud/pkg/keystone/tokens" - - "yunion.io/x/onecloud/pkg/mcclient/auth" - "yunion.io/x/onecloud/pkg/util/logclient" - _ "yunion.io/x/onecloud/pkg/keystone/driver/cas" _ "yunion.io/x/onecloud/pkg/keystone/driver/ldap" _ "yunion.io/x/onecloud/pkg/keystone/driver/sql" + "yunion.io/x/onecloud/pkg/keystone/models" + "yunion.io/x/onecloud/pkg/keystone/options" _ "yunion.io/x/onecloud/pkg/keystone/tasks" + "yunion.io/x/onecloud/pkg/keystone/tokens" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/util/logclient" ) func keystoneUUIDGenerator() string { diff --git a/pkg/keystone/tokens/payloads.go b/pkg/keystone/tokens/payloads.go index fb9314fe43..89778c3843 100644 --- a/pkg/keystone/tokens/payloads.go +++ b/pkg/keystone/tokens/payloads.go @@ -24,8 +24,9 @@ import ( "github.com/pkg/errors" "github.com/vmihailenco/msgpack" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/netutils" + + "yunion.io/x/onecloud/pkg/mcclient" ) type TScopedPayloadVersion byte diff --git a/pkg/lbagent/hastate.go b/pkg/lbagent/hastate.go index 4f9995fc10..14796eadec 100644 --- a/pkg/lbagent/hastate.go +++ b/pkg/lbagent/hastate.go @@ -29,6 +29,7 @@ import ( "github.com/fsnotify/fsnotify" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" agentutils "yunion.io/x/onecloud/pkg/lbagent/utils" ) diff --git a/pkg/lbagent/models/modelset.go b/pkg/lbagent/models/modelset.go index 728e3d2733..f29d99df7e 100644 --- a/pkg/lbagent/models/modelset.go +++ b/pkg/lbagent/models/modelset.go @@ -18,9 +18,9 @@ import ( "sort" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/models" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/pkg/lbagent/models/reflect.go b/pkg/lbagent/models/reflect.go index 71d26bad5d..83332412d1 100644 --- a/pkg/lbagent/models/reflect.go +++ b/pkg/lbagent/models/reflect.go @@ -21,13 +21,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/util/timeutils" "yunion.io/x/pkg/utils" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/models" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/options" ) diff --git a/pkg/mcclient/aksk.go b/pkg/mcclient/aksk.go index 54c42efbc9..c39e16fecb 100644 --- a/pkg/mcclient/aksk.go +++ b/pkg/mcclient/aksk.go @@ -16,13 +16,13 @@ package mcclient import ( "context" + "io" "net/http" + "strings" "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" - "io" - "strings" api "yunion.io/x/onecloud/pkg/apis/identity" "yunion.io/x/onecloud/pkg/util/netutils2" "yunion.io/x/onecloud/pkg/util/s3auth" diff --git a/pkg/mcclient/auth/aksk.go b/pkg/mcclient/auth/aksk.go index 80fcd67346..e2b126a9d5 100644 --- a/pkg/mcclient/auth/aksk.go +++ b/pkg/mcclient/auth/aksk.go @@ -16,10 +16,12 @@ package auth import ( "net/http" - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/util/s3auth" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/cache" + + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/s3auth" ) type sAccessKeyCache struct { diff --git a/pkg/mcclient/example/server.go b/pkg/mcclient/example/server.go index 8e6ecb12ba..5963ffb645 100644 --- a/pkg/mcclient/example/server.go +++ b/pkg/mcclient/example/server.go @@ -17,12 +17,12 @@ package example import ( "context" - "yunion.io/x/onecloud/pkg/mcclient/options" - "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/options" ) const ( diff --git a/pkg/mcclient/modulebase/filter.go b/pkg/mcclient/modulebase/filter.go index 5e249942aa..290c30ee33 100644 --- a/pkg/mcclient/modulebase/filter.go +++ b/pkg/mcclient/modulebase/filter.go @@ -17,6 +17,7 @@ package modulebase import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modulebase/joint.go b/pkg/mcclient/modulebase/joint.go index b160bddc9b..da2c5ac3b6 100644 --- a/pkg/mcclient/modulebase/joint.go +++ b/pkg/mcclient/modulebase/joint.go @@ -19,6 +19,7 @@ import ( "net/url" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modulebase/projectresources.go b/pkg/mcclient/modulebase/projectresources.go index 01e53bef65..a50ea29e0a 100644 --- a/pkg/mcclient/modulebase/projectresources.go +++ b/pkg/mcclient/modulebase/projectresources.go @@ -18,6 +18,7 @@ import ( "io/ioutil" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modulebase/resource.go b/pkg/mcclient/modulebase/resource.go index c5d6d64ff3..6f748119d8 100644 --- a/pkg/mcclient/modulebase/resource.go +++ b/pkg/mcclient/modulebase/resource.go @@ -21,6 +21,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/httputils" diff --git a/pkg/mcclient/modulebase/utils.go b/pkg/mcclient/modulebase/utils.go index a02afce48a..30921d4301 100644 --- a/pkg/mcclient/modulebase/utils.go +++ b/pkg/mcclient/modulebase/utils.go @@ -19,6 +19,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/mcclient/modules/cache.go b/pkg/mcclient/modules/cache.go index 45e737bece..94842f3bc2 100644 --- a/pkg/mcclient/modules/cache.go +++ b/pkg/mcclient/modules/cache.go @@ -20,9 +20,9 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) const ( diff --git a/pkg/mcclient/modules/mod_buckets.go b/pkg/mcclient/modules/mod_buckets.go index ef35258355..acc2b5d657 100644 --- a/pkg/mcclient/modules/mod_buckets.go +++ b/pkg/mcclient/modules/mod_buckets.go @@ -21,6 +21,7 @@ import ( "strconv" "github.com/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" diff --git a/pkg/mcclient/modules/mod_credentials.go b/pkg/mcclient/modules/mod_credentials.go index 7c17ea35b1..a7a1833e9b 100644 --- a/pkg/mcclient/modules/mod_credentials.go +++ b/pkg/mcclient/modules/mod_credentials.go @@ -19,14 +19,15 @@ import ( "fmt" "time" + "github.com/pkg/errors" + "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/util/seclib" - "github.com/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/identity" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type SCredentialManager struct { diff --git a/pkg/mcclient/modules/mod_dbinstanceaccounts.go b/pkg/mcclient/modules/mod_dbinstanceaccounts.go index a82de7b756..7833899741 100644 --- a/pkg/mcclient/modules/mod_dbinstanceaccounts.go +++ b/pkg/mcclient/modules/mod_dbinstanceaccounts.go @@ -18,10 +18,12 @@ import ( "fmt" "github.com/pkg/errors" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" - "yunion.io/x/pkg/utils" ) var ( diff --git a/pkg/mcclient/modules/mod_hosts.go b/pkg/mcclient/modules/mod_hosts.go index 3ad2d678a6..3e0c97b3bc 100644 --- a/pkg/mcclient/modules/mod_hosts.go +++ b/pkg/mcclient/modules/mod_hosts.go @@ -21,11 +21,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/mcclient/modules/mod_identity.go b/pkg/mcclient/modules/mod_identity.go index 73a9c38afc..6bdceb1a36 100644 --- a/pkg/mcclient/modules/mod_identity.go +++ b/pkg/mcclient/modules/mod_identity.go @@ -18,9 +18,9 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type SIdentityUsageManager struct { diff --git a/pkg/mcclient/modules/mod_itsm_process_instances.go b/pkg/mcclient/modules/mod_itsm_process_instances.go index c249eb34d6..7362d6681d 100644 --- a/pkg/mcclient/modules/mod_itsm_process_instances.go +++ b/pkg/mcclient/modules/mod_itsm_process_instances.go @@ -20,6 +20,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) diff --git a/pkg/mcclient/modules/mod_itsm_tasks.go b/pkg/mcclient/modules/mod_itsm_tasks.go index ac0813697b..a2a3c746af 100644 --- a/pkg/mcclient/modules/mod_itsm_tasks.go +++ b/pkg/mcclient/modules/mod_itsm_tasks.go @@ -18,6 +18,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) diff --git a/pkg/mcclient/modules/mod_license.go b/pkg/mcclient/modules/mod_license.go index 4ddf713534..e1fb66526a 100644 --- a/pkg/mcclient/modules/mod_license.go +++ b/pkg/mcclient/modules/mod_license.go @@ -20,9 +20,9 @@ import ( "net/http" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type LicenseManager struct { diff --git a/pkg/mcclient/modules/mod_parameters.go b/pkg/mcclient/modules/mod_parameters.go index 69ae1d7d65..0d52c54472 100644 --- a/pkg/mcclient/modules/mod_parameters.go +++ b/pkg/mcclient/modules/mod_parameters.go @@ -18,11 +18,11 @@ import ( "context" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type ParametersManager struct { diff --git a/pkg/mcclient/modules/mod_performances.go b/pkg/mcclient/modules/mod_performances.go index 67770e80b7..b0460da80e 100644 --- a/pkg/mcclient/modules/mod_performances.go +++ b/pkg/mcclient/modules/mod_performances.go @@ -18,9 +18,9 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type PerformanceManager struct { diff --git a/pkg/mcclient/modules/mod_quotas.go b/pkg/mcclient/modules/mod_quotas.go index 7225053509..0a5cef0394 100644 --- a/pkg/mcclient/modules/mod_quotas.go +++ b/pkg/mcclient/modules/mod_quotas.go @@ -19,9 +19,9 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type QuotaManager struct { diff --git a/pkg/mcclient/modules/mod_reservedips.go b/pkg/mcclient/modules/mod_reservedips.go index d242ebd618..5badab5db2 100644 --- a/pkg/mcclient/modules/mod_reservedips.go +++ b/pkg/mcclient/modules/mod_reservedips.go @@ -19,9 +19,9 @@ import ( "sync" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type ReservedIPManager struct { diff --git a/pkg/mcclient/modules/mod_scheduler.go b/pkg/mcclient/modules/mod_scheduler.go index 0159ac980b..c6c350ad6c 100644 --- a/pkg/mcclient/modules/mod_scheduler.go +++ b/pkg/mcclient/modules/mod_scheduler.go @@ -19,12 +19,11 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" - - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/mcclient/auth" api "yunion.io/x/onecloud/pkg/apis/scheduler" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) var ( diff --git a/pkg/mcclient/modules/mod_servers.go b/pkg/mcclient/modules/mod_servers.go index ae12e8ad11..8486e5e6f3 100644 --- a/pkg/mcclient/modules/mod_servers.go +++ b/pkg/mcclient/modules/mod_servers.go @@ -19,11 +19,11 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/util/seclib2" ) diff --git a/pkg/mcclient/modules/mod_stastics.go b/pkg/mcclient/modules/mod_stastics.go index 092cce8e79..60880b35fd 100644 --- a/pkg/mcclient/modules/mod_stastics.go +++ b/pkg/mcclient/modules/mod_stastics.go @@ -18,9 +18,9 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type StatisticsManager struct { diff --git a/pkg/mcclient/modules/mod_users.go b/pkg/mcclient/modules/mod_users.go index 9c5d64b090..1007c6672b 100644 --- a/pkg/mcclient/modules/mod_users.go +++ b/pkg/mcclient/modules/mod_users.go @@ -18,9 +18,9 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) type UserManager struct { diff --git a/pkg/mcclient/modules/notify/mod_notification.go b/pkg/mcclient/modules/notify/mod_notification.go index 708b314185..330ba34b3c 100644 --- a/pkg/mcclient/modules/notify/mod_notification.go +++ b/pkg/mcclient/modules/notify/mod_notification.go @@ -16,9 +16,9 @@ package notify import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/pkg/multicloud/aliyun/aliyun.go b/pkg/multicloud/aliyun/aliyun.go index 423ba3a63f..f510240f27 100644 --- a/pkg/multicloud/aliyun/aliyun.go +++ b/pkg/multicloud/aliyun/aliyun.go @@ -21,14 +21,14 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" + "github.com/aliyun/aliyun-oss-go-sdk/oss" + "github.com/pkg/errors" "yunion.io/x/jsonutils" "yunion.io/x/log" v "yunion.io/x/pkg/util/version" "yunion.io/x/pkg/utils" - "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/aliyun/business.go b/pkg/multicloud/aliyun/business.go index cc9e3359ad..f7d159a65e 100644 --- a/pkg/multicloud/aliyun/business.go +++ b/pkg/multicloud/aliyun/business.go @@ -17,11 +17,11 @@ package aliyun import ( "time" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" + + "yunion.io/x/onecloud/pkg/cloudprovider" ) func (self *SAliyunClient) businessRequest(apiName string, params map[string]string) (jsonutils.JSONObject, error) { diff --git a/pkg/multicloud/aliyun/dbinstance.go b/pkg/multicloud/aliyun/dbinstance.go index a7cd2e4165..1046f0e208 100644 --- a/pkg/multicloud/aliyun/dbinstance.go +++ b/pkg/multicloud/aliyun/dbinstance.go @@ -21,16 +21,15 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/log" + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/utils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/rand" - - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/utils" ) type SReadOnlyDBInstanceIds struct { diff --git a/pkg/multicloud/aliyun/dbinstance_account.go b/pkg/multicloud/aliyun/dbinstance_account.go index 73608d4461..ad5d3b6f04 100644 --- a/pkg/multicloud/aliyun/dbinstance_account.go +++ b/pkg/multicloud/aliyun/dbinstance_account.go @@ -17,11 +17,11 @@ package aliyun import ( "fmt" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - - "yunion.io/x/pkg/errors" ) type SDatabasePrivileges struct { diff --git a/pkg/multicloud/aliyun/dbinstance_backup.go b/pkg/multicloud/aliyun/dbinstance_backup.go index ce388fb967..a46a6b47df 100644 --- a/pkg/multicloud/aliyun/dbinstance_backup.go +++ b/pkg/multicloud/aliyun/dbinstance_backup.go @@ -20,6 +20,7 @@ import ( "time" "github.com/coredns/coredns/plugin/pkg/log" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/utils" diff --git a/pkg/multicloud/aliyun/elasticcache_instance.go b/pkg/multicloud/aliyun/elasticcache_instance.go index 964d9bad9f..69e93340e6 100644 --- a/pkg/multicloud/aliyun/elasticcache_instance.go +++ b/pkg/multicloud/aliyun/elasticcache_instance.go @@ -19,6 +19,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/multicloud/aliyun/host.go b/pkg/multicloud/aliyun/host.go index a1dd8ce734..8dcc0d4bb8 100644 --- a/pkg/multicloud/aliyun/host.go +++ b/pkg/multicloud/aliyun/host.go @@ -19,10 +19,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/multicloud" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/util/billing" ) diff --git a/pkg/multicloud/aliyun/loadbalancer.go b/pkg/multicloud/aliyun/loadbalancer.go index 9094475e39..543325aafc 100644 --- a/pkg/multicloud/aliyun/loadbalancer.go +++ b/pkg/multicloud/aliyun/loadbalancer.go @@ -19,14 +19,13 @@ import ( "strings" "time" - "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/pkg/errors" - "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) type ListenerProtocol string diff --git a/pkg/multicloud/aliyun/loadbalancermasterslavebackend.go b/pkg/multicloud/aliyun/loadbalancermasterslavebackend.go index 682772e614..0b066f3a60 100644 --- a/pkg/multicloud/aliyun/loadbalancermasterslavebackend.go +++ b/pkg/multicloud/aliyun/loadbalancermasterslavebackend.go @@ -18,11 +18,10 @@ import ( "fmt" "strings" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/jsonutils" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SLoadbalancerMasterSlaveBackend struct { diff --git a/pkg/multicloud/aliyun/networkinterfaces.go b/pkg/multicloud/aliyun/networkinterfaces.go index 34daedf32c..c9243eb7dd 100644 --- a/pkg/multicloud/aliyun/networkinterfaces.go +++ b/pkg/multicloud/aliyun/networkinterfaces.go @@ -18,11 +18,10 @@ import ( "fmt" "time" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" ) diff --git a/pkg/multicloud/aliyun/objects.go b/pkg/multicloud/aliyun/objects.go index 2488dbac1c..39b2c3e78f 100644 --- a/pkg/multicloud/aliyun/objects.go +++ b/pkg/multicloud/aliyun/objects.go @@ -15,10 +15,11 @@ package aliyun import ( + "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/pkg/errors" + "yunion.io/x/log" - "github.com/aliyun/aliyun-oss-go-sdk/oss" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/aliyun/vpc.go b/pkg/multicloud/aliyun/vpc.go index c656594e8d..7d3e422f22 100644 --- a/pkg/multicloud/aliyun/vpc.go +++ b/pkg/multicloud/aliyun/vpc.go @@ -18,12 +18,11 @@ import ( "strings" "time" - "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) const ( diff --git a/pkg/multicloud/aws/aws.go b/pkg/multicloud/aws/aws.go index c4b56d86bc..a08452ff8f 100644 --- a/pkg/multicloud/aws/aws.go +++ b/pkg/multicloud/aws/aws.go @@ -21,11 +21,11 @@ import ( "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/ec2" + "github.com/aws/aws-sdk-go/service/s3" "yunion.io/x/log" "yunion.io/x/pkg/errors" - "github.com/aws/aws-sdk-go/service/s3" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/aws/bucket.go b/pkg/multicloud/aws/bucket.go index 970d906bd9..0ad38a3f1e 100644 --- a/pkg/multicloud/aws/bucket.go +++ b/pkg/multicloud/aws/bucket.go @@ -18,6 +18,7 @@ import ( "context" "fmt" "io" + "net/url" "time" "github.com/aws/aws-sdk-go/aws/request" @@ -27,7 +28,6 @@ import ( "yunion.io/x/pkg/errors" "yunion.io/x/s3cli" - "net/url" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/util/fileutils2" diff --git a/pkg/multicloud/aws/dbinstance.go b/pkg/multicloud/aws/dbinstance.go index 60d348482e..dcf11e7c26 100644 --- a/pkg/multicloud/aws/dbinstance.go +++ b/pkg/multicloud/aws/dbinstance.go @@ -20,6 +20,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + billing "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/multicloud/aws/dbinstance_database.go b/pkg/multicloud/aws/dbinstance_database.go index b49efab764..2919fdb7d9 100644 --- a/pkg/multicloud/aws/dbinstance_database.go +++ b/pkg/multicloud/aws/dbinstance_database.go @@ -15,9 +15,8 @@ package aws import ( - "yunion.io/x/onecloud/pkg/multicloud" - api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/multicloud" ) type SDBInstanceDatabase struct { diff --git a/pkg/multicloud/aws/dbinstance_snapshot.go b/pkg/multicloud/aws/dbinstance_snapshot.go index 4ec0c1b9ef..37f642531e 100644 --- a/pkg/multicloud/aws/dbinstance_snapshot.go +++ b/pkg/multicloud/aws/dbinstance_snapshot.go @@ -18,6 +18,7 @@ import ( "time" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" diff --git a/pkg/multicloud/aws/instance.go b/pkg/multicloud/aws/instance.go index c363a26842..4cf2ec4651 100644 --- a/pkg/multicloud/aws/instance.go +++ b/pkg/multicloud/aws/instance.go @@ -21,8 +21,6 @@ import ( "strings" "time" - "yunion.io/x/onecloud/pkg/multicloud" - "github.com/aws/aws-sdk-go/service/ec2" "yunion.io/x/jsonutils" @@ -33,6 +31,7 @@ import ( billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/cloudinit" ) diff --git a/pkg/multicloud/aws/latitude_and_longitude.go b/pkg/multicloud/aws/latitude_and_longitude.go index 64d69929a9..d94f0e6d64 100644 --- a/pkg/multicloud/aws/latitude_and_longitude.go +++ b/pkg/multicloud/aws/latitude_and_longitude.go @@ -15,9 +15,8 @@ package aws import ( - "yunion.io/x/onecloud/pkg/cloudprovider" - api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) // https://docs.aws.amazon.com/general/latest/gr/rande.html diff --git a/pkg/multicloud/aws/loadbalancer.go b/pkg/multicloud/aws/loadbalancer.go index 0a0e6902d0..262fdc2286 100644 --- a/pkg/multicloud/aws/loadbalancer.go +++ b/pkg/multicloud/aws/loadbalancer.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/elbv2" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/multicloud/aws/loadbalancerbackend.go b/pkg/multicloud/aws/loadbalancerbackend.go index 505267d85a..fde3c39ad3 100644 --- a/pkg/multicloud/aws/loadbalancerbackend.go +++ b/pkg/multicloud/aws/loadbalancerbackend.go @@ -18,6 +18,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" ) diff --git a/pkg/multicloud/aws/loadbalancerbackendgroup.go b/pkg/multicloud/aws/loadbalancerbackendgroup.go index d655cb4d19..a844d98460 100644 --- a/pkg/multicloud/aws/loadbalancerbackendgroup.go +++ b/pkg/multicloud/aws/loadbalancerbackendgroup.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/elbv2" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/utils" diff --git a/pkg/multicloud/aws/loadbalancercert.go b/pkg/multicloud/aws/loadbalancercert.go index 969e88f9f4..1cc143de19 100644 --- a/pkg/multicloud/aws/loadbalancercert.go +++ b/pkg/multicloud/aws/loadbalancercert.go @@ -23,8 +23,10 @@ import ( "time" "github.com/aws/aws-sdk-go/service/iam" + "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/aws/loadbalancerlistener.go b/pkg/multicloud/aws/loadbalancerlistener.go index 791b50e42b..1b30d17a9c 100644 --- a/pkg/multicloud/aws/loadbalancerlistener.go +++ b/pkg/multicloud/aws/loadbalancerlistener.go @@ -22,6 +22,7 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/multicloud/aws/region.go b/pkg/multicloud/aws/region.go index d626481c76..906d1905ca 100644 --- a/pkg/multicloud/aws/region.go +++ b/pkg/multicloud/aws/region.go @@ -36,6 +36,7 @@ import ( "github.com/aws/aws-sdk-go/service/elbv2" "github.com/aws/aws-sdk-go/service/iam" "github.com/aws/aws-sdk-go/service/s3" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" diff --git a/pkg/multicloud/aws/securitygroup.go b/pkg/multicloud/aws/securitygroup.go index 07914a5a5b..85477b9b73 100644 --- a/pkg/multicloud/aws/securitygroup.go +++ b/pkg/multicloud/aws/securitygroup.go @@ -22,6 +22,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/secrules" diff --git a/pkg/multicloud/aws/utils.go b/pkg/multicloud/aws/utils.go index f697052c1f..c382c725d4 100644 --- a/pkg/multicloud/aws/utils.go +++ b/pkg/multicloud/aws/utils.go @@ -23,11 +23,12 @@ import ( "strings" "github.com/aws/aws-sdk-go/service/ec2" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/secrules" + + "yunion.io/x/onecloud/pkg/cloudprovider" ) type portRange struct { diff --git a/pkg/multicloud/azure/azure.go b/pkg/multicloud/azure/azure.go index f2231cb9a4..bb696d1853 100644 --- a/pkg/multicloud/azure/azure.go +++ b/pkg/multicloud/azure/azure.go @@ -25,11 +25,11 @@ import ( "github.com/Azure/go-autorest/autorest" azureenv "github.com/Azure/go-autorest/autorest/azure" "github.com/Azure/go-autorest/autorest/azure/auth" + "github.com/pkg/errors" "yunion.io/x/jsonutils" "yunion.io/x/log" - "github.com/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/azure/classic_disk.go b/pkg/multicloud/azure/classic_disk.go index f966dba178..154c90812a 100644 --- a/pkg/multicloud/azure/classic_disk.go +++ b/pkg/multicloud/azure/classic_disk.go @@ -19,10 +19,11 @@ import ( "strings" "time" + "github.com/Azure/azure-sdk-for-go/storage" + "yunion.io/x/jsonutils" "yunion.io/x/log" - "github.com/Azure/azure-sdk-for-go/storage" billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/multicloud/azure/host.go b/pkg/multicloud/azure/host.go index 5f54fcfa25..165884606a 100644 --- a/pkg/multicloud/azure/host.go +++ b/pkg/multicloud/azure/host.go @@ -19,11 +19,10 @@ import ( "strings" "time" - "yunion.io/x/pkg/util/osprofile" - "yunion.io/x/pkg/utils" - "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/osprofile" + "yunion.io/x/pkg/utils" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/multicloud/azure/resourcegroup.go b/pkg/multicloud/azure/resourcegroup.go index f78849a876..deef41ce92 100644 --- a/pkg/multicloud/azure/resourcegroup.go +++ b/pkg/multicloud/azure/resourcegroup.go @@ -16,6 +16,7 @@ package azure import ( "fmt" + "yunion.io/x/jsonutils" ) diff --git a/pkg/multicloud/azure/storagecache.go b/pkg/multicloud/azure/storagecache.go index 120d370b7e..46188771b3 100644 --- a/pkg/multicloud/azure/storagecache.go +++ b/pkg/multicloud/azure/storagecache.go @@ -24,6 +24,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/multicloud/bucket_base.go b/pkg/multicloud/bucket_base.go index d4f058f7f4..35267b178b 100644 --- a/pkg/multicloud/bucket_base.go +++ b/pkg/multicloud/bucket_base.go @@ -16,6 +16,7 @@ package multicloud import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/huawei/client/modules/mod_dbinstance.go b/pkg/multicloud/huawei/client/modules/mod_dbinstance.go index df2b89f125..f6b41a2c31 100644 --- a/pkg/multicloud/huawei/client/modules/mod_dbinstance.go +++ b/pkg/multicloud/huawei/client/modules/mod_dbinstance.go @@ -18,6 +18,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud/huawei/client/auth" "yunion.io/x/onecloud/pkg/multicloud/huawei/client/responses" diff --git a/pkg/multicloud/huawei/client/modules/mod_dbinstance_job.go b/pkg/multicloud/huawei/client/modules/mod_dbinstance_job.go index 3e11a2027c..3597d2e77f 100644 --- a/pkg/multicloud/huawei/client/modules/mod_dbinstance_job.go +++ b/pkg/multicloud/huawei/client/modules/mod_dbinstance_job.go @@ -16,6 +16,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/multicloud/huawei/client/auth" ) diff --git a/pkg/multicloud/huawei/client/modules/mod_loadbalancer_backend.go b/pkg/multicloud/huawei/client/modules/mod_loadbalancer_backend.go index bb3154ffc2..d4ac5ff2da 100644 --- a/pkg/multicloud/huawei/client/modules/mod_loadbalancer_backend.go +++ b/pkg/multicloud/huawei/client/modules/mod_loadbalancer_backend.go @@ -16,6 +16,7 @@ package modules import ( "fmt" + "yunion.io/x/onecloud/pkg/multicloud/huawei/client/auth" ) diff --git a/pkg/multicloud/huawei/client/modules/mod_loadbalancer_rules.go b/pkg/multicloud/huawei/client/modules/mod_loadbalancer_rules.go index 41e8733915..555aaafbd5 100644 --- a/pkg/multicloud/huawei/client/modules/mod_loadbalancer_rules.go +++ b/pkg/multicloud/huawei/client/modules/mod_loadbalancer_rules.go @@ -16,6 +16,7 @@ package modules import ( "fmt" + "yunion.io/x/onecloud/pkg/multicloud/huawei/client/auth" ) diff --git a/pkg/multicloud/huawei/dbinstance.go b/pkg/multicloud/huawei/dbinstance.go index ece0619146..24d784aaae 100644 --- a/pkg/multicloud/huawei/dbinstance.go +++ b/pkg/multicloud/huawei/dbinstance.go @@ -24,6 +24,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/multicloud/huawei/dbinstance_account.go b/pkg/multicloud/huawei/dbinstance_account.go index 2f8658e183..587b0b4074 100644 --- a/pkg/multicloud/huawei/dbinstance_account.go +++ b/pkg/multicloud/huawei/dbinstance_account.go @@ -18,6 +18,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" diff --git a/pkg/multicloud/huawei/dbinstance_backup.go b/pkg/multicloud/huawei/dbinstance_backup.go index d70789808d..a9a9eec9dc 100644 --- a/pkg/multicloud/huawei/dbinstance_backup.go +++ b/pkg/multicloud/huawei/dbinstance_backup.go @@ -18,10 +18,11 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/errors" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/pkg/errors" ) type SDBInstanceBackup struct { diff --git a/pkg/multicloud/huawei/eip.go b/pkg/multicloud/huawei/eip.go index 46b5882937..24a68b2a9a 100644 --- a/pkg/multicloud/huawei/eip.go +++ b/pkg/multicloud/huawei/eip.go @@ -20,6 +20,7 @@ import ( "time" "yunion.io/x/jsonutils" + billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/multicloud/huawei/elasticcache_instance.go b/pkg/multicloud/huawei/elasticcache_instance.go index 79a286cf6a..fafbde5a62 100644 --- a/pkg/multicloud/huawei/elasticcache_instance.go +++ b/pkg/multicloud/huawei/elasticcache_instance.go @@ -18,6 +18,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/log" billing_api "yunion.io/x/onecloud/pkg/apis/billing" diff --git a/pkg/multicloud/huawei/instance.go b/pkg/multicloud/huawei/instance.go index b5005d73ca..ca3ca77df7 100644 --- a/pkg/multicloud/huawei/instance.go +++ b/pkg/multicloud/huawei/instance.go @@ -23,6 +23,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/osprofile" diff --git a/pkg/multicloud/huawei/loadbalancer.go b/pkg/multicloud/huawei/loadbalancer.go index c9437d897d..dc0368d2bb 100644 --- a/pkg/multicloud/huawei/loadbalancer.go +++ b/pkg/multicloud/huawei/loadbalancer.go @@ -19,6 +19,7 @@ import ( "time" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/huawei/loadbalancer_acl.go b/pkg/multicloud/huawei/loadbalancer_acl.go index f91d278675..1aa8a330d8 100644 --- a/pkg/multicloud/huawei/loadbalancer_acl.go +++ b/pkg/multicloud/huawei/loadbalancer_acl.go @@ -16,7 +16,9 @@ package huawei import ( "strings" + "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/huawei/loadbalancer_backend.go b/pkg/multicloud/huawei/loadbalancer_backend.go index 78ec97855a..aa82a59b6d 100644 --- a/pkg/multicloud/huawei/loadbalancer_backend.go +++ b/pkg/multicloud/huawei/loadbalancer_backend.go @@ -17,9 +17,10 @@ package huawei import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/pkg/utils" ) type SElbBackend struct { diff --git a/pkg/multicloud/huawei/loadbalancer_backendgroup.go b/pkg/multicloud/huawei/loadbalancer_backendgroup.go index b71a460b94..66c67560fd 100644 --- a/pkg/multicloud/huawei/loadbalancer_backendgroup.go +++ b/pkg/multicloud/huawei/loadbalancer_backendgroup.go @@ -17,7 +17,9 @@ package huawei import ( "fmt" "strings" + "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/huawei/loadbalancer_cert.go b/pkg/multicloud/huawei/loadbalancer_cert.go index fbc884ca1c..b2096b8632 100644 --- a/pkg/multicloud/huawei/loadbalancer_cert.go +++ b/pkg/multicloud/huawei/loadbalancer_cert.go @@ -19,7 +19,9 @@ import ( "fmt" "strings" "time" + "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" ) diff --git a/pkg/multicloud/huawei/loadbalancer_listener.go b/pkg/multicloud/huawei/loadbalancer_listener.go index d376bed798..440cc41e6e 100644 --- a/pkg/multicloud/huawei/loadbalancer_listener.go +++ b/pkg/multicloud/huawei/loadbalancer_listener.go @@ -16,11 +16,12 @@ package huawei import ( "time" + "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type InsertHeaders struct { diff --git a/pkg/multicloud/huawei/loadbalancer_listener_rule.go b/pkg/multicloud/huawei/loadbalancer_listener_rule.go index ac7d9e73a4..16b392481f 100644 --- a/pkg/multicloud/huawei/loadbalancer_listener_rule.go +++ b/pkg/multicloud/huawei/loadbalancer_listener_rule.go @@ -17,6 +17,7 @@ package huawei import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" ) diff --git a/pkg/multicloud/huawei/port.go b/pkg/multicloud/huawei/port.go index c2632189fa..3bad7543f5 100644 --- a/pkg/multicloud/huawei/port.go +++ b/pkg/multicloud/huawei/port.go @@ -15,10 +15,11 @@ package huawei import ( + "yunion.io/x/pkg/utils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/pkg/utils" ) type SFixedIP struct { diff --git a/pkg/multicloud/huawei/routetable.go b/pkg/multicloud/huawei/routetable.go index 033ff4fe23..ef778c04d1 100644 --- a/pkg/multicloud/huawei/routetable.go +++ b/pkg/multicloud/huawei/routetable.go @@ -16,9 +16,11 @@ package huawei import ( "fmt" + "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/pkg/errors" + + "yunion.io/x/onecloud/pkg/cloudprovider" ) // date: 2019.07.15 diff --git a/pkg/multicloud/loader/loader.go b/pkg/multicloud/loader/loader.go index 1226e65ff7..14be3d9de2 100644 --- a/pkg/multicloud/loader/loader.go +++ b/pkg/multicloud/loader/loader.go @@ -15,27 +15,20 @@ package loader import ( - "yunion.io/x/log" + "yunion.io/x/log" // on-premise virtualization technologies - // on-premise virtualization technologies - _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" - - // private clouds - _ "yunion.io/x/onecloud/pkg/multicloud/openstack/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/zstack/provider" - - // public clouds _ "yunion.io/x/onecloud/pkg/multicloud/aliyun/provider" _ "yunion.io/x/onecloud/pkg/multicloud/aws/provider" _ "yunion.io/x/onecloud/pkg/multicloud/azure/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/esxi/provider" // private clouds _ "yunion.io/x/onecloud/pkg/multicloud/huawei/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/qcloud/provider" - _ "yunion.io/x/onecloud/pkg/multicloud/ucloud/provider" - - // object storages _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/ceph/provider" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/provider" _ "yunion.io/x/onecloud/pkg/multicloud/objectstore/xsky/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/openstack/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/qcloud/provider" + _ "yunion.io/x/onecloud/pkg/multicloud/ucloud/provider" // object storages + _ "yunion.io/x/onecloud/pkg/multicloud/zstack/provider" // public clouds ) func init() { diff --git a/pkg/multicloud/objectstore/object.go b/pkg/multicloud/objectstore/object.go index a3a35610f0..e6f3f37247 100644 --- a/pkg/multicloud/objectstore/object.go +++ b/pkg/multicloud/objectstore/object.go @@ -18,8 +18,9 @@ import ( "strings" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/pkg/errors" + + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SObject struct { diff --git a/pkg/multicloud/objectstore/shell.go b/pkg/multicloud/objectstore/shell.go index 7fff3ac3bd..909b261c70 100644 --- a/pkg/multicloud/objectstore/shell.go +++ b/pkg/multicloud/objectstore/shell.go @@ -22,6 +22,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/printutils" "yunion.io/x/onecloud/pkg/util/shellutils" diff --git a/pkg/multicloud/objectstore/shell/minio.go b/pkg/multicloud/objectstore/shell/minio.go index 2b61697c59..a39ae2f4fb 100644 --- a/pkg/multicloud/objectstore/shell/minio.go +++ b/pkg/multicloud/objectstore/shell/minio.go @@ -16,6 +16,7 @@ package shell import ( "fmt" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud/objectstore" "yunion.io/x/onecloud/pkg/util/shellutils" diff --git a/pkg/multicloud/openstack/eip.go b/pkg/multicloud/openstack/eip.go index 5ee66768a6..20c24399bd 100644 --- a/pkg/multicloud/openstack/eip.go +++ b/pkg/multicloud/openstack/eip.go @@ -21,10 +21,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SPortDetail struct { diff --git a/pkg/multicloud/openstack/flavor.go b/pkg/multicloud/openstack/flavor.go index 056c8b03f5..3bcb5cbc29 100644 --- a/pkg/multicloud/openstack/flavor.go +++ b/pkg/multicloud/openstack/flavor.go @@ -18,6 +18,7 @@ import ( "fmt" "github.com/pkg/errors" + "yunion.io/x/jsonutils" api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/multicloud/openstack/image.go b/pkg/multicloud/openstack/image.go index 9e7f3f3896..bf51dddd17 100644 --- a/pkg/multicloud/openstack/image.go +++ b/pkg/multicloud/openstack/image.go @@ -21,6 +21,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/util/osprofile" "yunion.io/x/pkg/utils" diff --git a/pkg/multicloud/openstack/instance.go b/pkg/multicloud/openstack/instance.go index 8a2ea48e02..87df5a7cc9 100644 --- a/pkg/multicloud/openstack/instance.go +++ b/pkg/multicloud/openstack/instance.go @@ -19,8 +19,6 @@ import ( "fmt" "time" - "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/errors" @@ -29,6 +27,7 @@ import ( billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/onecloud/pkg/util/billing" ) diff --git a/pkg/multicloud/openstack/network.go b/pkg/multicloud/openstack/network.go index 7124e0d10a..5236db145d 100644 --- a/pkg/multicloud/openstack/network.go +++ b/pkg/multicloud/openstack/network.go @@ -18,6 +18,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/multicloud/openstack/port.go b/pkg/multicloud/openstack/port.go index 1f4e52fe1f..973b812648 100644 --- a/pkg/multicloud/openstack/port.go +++ b/pkg/multicloud/openstack/port.go @@ -19,11 +19,11 @@ import ( "net/url" "time" - "yunion.io/x/onecloud/pkg/multicloud" "yunion.io/x/pkg/errors" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) type DnsAssignment struct { diff --git a/pkg/multicloud/openstack/region.go b/pkg/multicloud/openstack/region.go index 61bfc30992..bfc641c8f1 100644 --- a/pkg/multicloud/openstack/region.go +++ b/pkg/multicloud/openstack/region.go @@ -20,6 +20,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/multicloud/qcloud/loadbalancer_acl.go b/pkg/multicloud/qcloud/loadbalancer_acl.go index d345871dda..aba679f229 100644 --- a/pkg/multicloud/qcloud/loadbalancer_acl.go +++ b/pkg/multicloud/qcloud/loadbalancer_acl.go @@ -16,9 +16,9 @@ package qcloud import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) // 腾讯云没有LB ACL diff --git a/pkg/multicloud/qcloud/network.go b/pkg/multicloud/qcloud/network.go index 28520037d2..39290d8dfd 100644 --- a/pkg/multicloud/qcloud/network.go +++ b/pkg/multicloud/qcloud/network.go @@ -18,6 +18,7 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/multicloud/qcloud/networkinterface.go b/pkg/multicloud/qcloud/networkinterface.go index aabbdcedcf..999c399be2 100644 --- a/pkg/multicloud/qcloud/networkinterface.go +++ b/pkg/multicloud/qcloud/networkinterface.go @@ -18,11 +18,11 @@ import ( "fmt" "time" - api "yunion.io/x/onecloud/pkg/apis/compute" - "yunion.io/x/onecloud/pkg/multicloud" - "github.com/pkg/errors" + + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) type SPrivateIpAddress struct { diff --git a/pkg/multicloud/ucloud/eip.go b/pkg/multicloud/ucloud/eip.go index 4cea7a10e0..5c6a43afb1 100644 --- a/pkg/multicloud/ucloud/eip.go +++ b/pkg/multicloud/ucloud/eip.go @@ -19,9 +19,8 @@ import ( "strings" "time" - "yunion.io/x/log" - "yunion.io/x/jsonutils" + "yunion.io/x/log" billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/multicloud/ucloud/host.go b/pkg/multicloud/ucloud/host.go index 6343b553a2..5ccce9e792 100644 --- a/pkg/multicloud/ucloud/host.go +++ b/pkg/multicloud/ucloud/host.go @@ -20,14 +20,13 @@ import ( "strconv" "strings" - "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/billing" - "yunion.io/x/jsonutils" + "yunion.io/x/log" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" + "yunion.io/x/onecloud/pkg/util/billing" ) type SHost struct { diff --git a/pkg/multicloud/ucloud/instance.go b/pkg/multicloud/ucloud/instance.go index d56d442278..81d42c1118 100644 --- a/pkg/multicloud/ucloud/instance.go +++ b/pkg/multicloud/ucloud/instance.go @@ -21,12 +21,11 @@ import ( "strings" "time" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/utils" - "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/errors" "yunion.io/x/pkg/util/osprofile" + "yunion.io/x/pkg/utils" billing_api "yunion.io/x/onecloud/pkg/apis/billing" api "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/multicloud/ucloud/network.go b/pkg/multicloud/ucloud/network.go index 54f25d9354..4db2e90654 100644 --- a/pkg/multicloud/ucloud/network.go +++ b/pkg/multicloud/ucloud/network.go @@ -16,6 +16,7 @@ package ucloud import ( "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/multicloud/ucloud/vip.go b/pkg/multicloud/ucloud/vip.go index 5dfd21e253..9b49fb4208 100644 --- a/pkg/multicloud/ucloud/vip.go +++ b/pkg/multicloud/ucloud/vip.go @@ -15,11 +15,12 @@ package ucloud import ( + "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/netutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" - "yunion.io/x/pkg/errors" - "yunion.io/x/pkg/util/netutils" ) type SVipAddr struct { diff --git a/pkg/multicloud/ucloud/vpc.go b/pkg/multicloud/ucloud/vpc.go index 035afc1817..160fa86fa5 100644 --- a/pkg/multicloud/ucloud/vpc.go +++ b/pkg/multicloud/ucloud/vpc.go @@ -19,6 +19,7 @@ import ( "strings" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" diff --git a/pkg/multicloud/ucloud/wire.go b/pkg/multicloud/ucloud/wire.go index 10e02c4914..e9a6e88ffc 100644 --- a/pkg/multicloud/ucloud/wire.go +++ b/pkg/multicloud/ucloud/wire.go @@ -16,7 +16,9 @@ package ucloud import ( "fmt" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/zstack/eip.go b/pkg/multicloud/zstack/eip.go index 0c75fe66dd..fdf7c6d683 100644 --- a/pkg/multicloud/zstack/eip.go +++ b/pkg/multicloud/zstack/eip.go @@ -19,9 +19,9 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SEipAddress struct { diff --git a/pkg/multicloud/zstack/host.go b/pkg/multicloud/zstack/host.go index e5e4a3136f..6fdf5b6eda 100644 --- a/pkg/multicloud/zstack/host.go +++ b/pkg/multicloud/zstack/host.go @@ -19,12 +19,13 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) type SHost struct { diff --git a/pkg/multicloud/zstack/image.go b/pkg/multicloud/zstack/image.go index 06eac7f5e3..e85cceba2c 100644 --- a/pkg/multicloud/zstack/image.go +++ b/pkg/multicloud/zstack/image.go @@ -23,15 +23,15 @@ import ( "time" "github.com/pkg/errors" - "yunion.io/x/onecloud/pkg/util/imagetools" "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/util/httputils" - "yunion.io/x/onecloud/pkg/util/multipart" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/util/httputils" + "yunion.io/x/onecloud/pkg/util/imagetools" + "yunion.io/x/onecloud/pkg/util/multipart" ) type SBackupStorageRef struct { diff --git a/pkg/multicloud/zstack/instance.go b/pkg/multicloud/zstack/instance.go index 8027f84998..4781b7b8ac 100644 --- a/pkg/multicloud/zstack/instance.go +++ b/pkg/multicloud/zstack/instance.go @@ -23,12 +23,12 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/pkg/util/osprofile" "yunion.io/x/pkg/utils" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/util/billing" ) type SInstanceCdrome struct { diff --git a/pkg/multicloud/zstack/instancenic.go b/pkg/multicloud/zstack/instancenic.go index ec6bea9031..8bbfd5f9bd 100644 --- a/pkg/multicloud/zstack/instancenic.go +++ b/pkg/multicloud/zstack/instancenic.go @@ -16,8 +16,8 @@ package zstack import ( "yunion.io/x/jsonutils" - "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/zstack/network.go b/pkg/multicloud/zstack/network.go index 6d2fd68a00..ad9cb2d969 100644 --- a/pkg/multicloud/zstack/network.go +++ b/pkg/multicloud/zstack/network.go @@ -18,10 +18,10 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/pkg/util/netutils" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/rbacutils" ) diff --git a/pkg/multicloud/zstack/offering.go b/pkg/multicloud/zstack/offering.go index ce4bc5b579..c6230b26a7 100644 --- a/pkg/multicloud/zstack/offering.go +++ b/pkg/multicloud/zstack/offering.go @@ -20,6 +20,7 @@ import ( "github.com/pkg/errors" "yunion.io/x/jsonutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/multicloud" diff --git a/pkg/multicloud/zstack/provider/provider.go b/pkg/multicloud/zstack/provider/provider.go index c67c9f1b10..e2b3fbbe36 100644 --- a/pkg/multicloud/zstack/provider/provider.go +++ b/pkg/multicloud/zstack/provider/provider.go @@ -17,12 +17,11 @@ package provider import ( "context" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/jsonutils" api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/multicloud/zstack" ) diff --git a/pkg/multicloud/zstack/region.go b/pkg/multicloud/zstack/region.go index 68652b451b..fa4a830b92 100644 --- a/pkg/multicloud/zstack/region.go +++ b/pkg/multicloud/zstack/region.go @@ -19,6 +19,7 @@ import ( "strings" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/secrules" diff --git a/pkg/multicloud/zstack/securitygroup.go b/pkg/multicloud/zstack/securitygroup.go index 69fae92279..063f20fee1 100644 --- a/pkg/multicloud/zstack/securitygroup.go +++ b/pkg/multicloud/zstack/securitygroup.go @@ -21,8 +21,9 @@ import ( "strings" "yunion.io/x/jsonutils" - api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/pkg/util/secrules" + + api "yunion.io/x/onecloud/pkg/apis/compute" ) type SSecurityGroupRule struct { diff --git a/pkg/multicloud/zstack/storage.go b/pkg/multicloud/zstack/storage.go index 24d6b8a5a2..eab7fd6401 100644 --- a/pkg/multicloud/zstack/storage.go +++ b/pkg/multicloud/zstack/storage.go @@ -20,6 +20,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/zstack/storage_local.go b/pkg/multicloud/zstack/storage_local.go index 685747ecc1..24a66dd255 100644 --- a/pkg/multicloud/zstack/storage_local.go +++ b/pkg/multicloud/zstack/storage_local.go @@ -20,6 +20,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/zstack/storagecache.go b/pkg/multicloud/zstack/storagecache.go index c7ee6fe999..82ca01b53b 100644 --- a/pkg/multicloud/zstack/storagecache.go +++ b/pkg/multicloud/zstack/storagecache.go @@ -21,6 +21,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/options" diff --git a/pkg/multicloud/zstack/vip.go b/pkg/multicloud/zstack/vip.go index 6730be1e7b..de57592107 100644 --- a/pkg/multicloud/zstack/vip.go +++ b/pkg/multicloud/zstack/vip.go @@ -17,13 +17,14 @@ package zstack import ( "fmt" - "yunion.io/x/onecloud/pkg/multicloud" - "github.com/pkg/errors" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/util/netutils" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/pkg/util/netutils" + "yunion.io/x/onecloud/pkg/multicloud" ) type SVirtualIP struct { diff --git a/pkg/multicloud/zstack/vpc.go b/pkg/multicloud/zstack/vpc.go index 39278fea84..1357ad82b3 100644 --- a/pkg/multicloud/zstack/vpc.go +++ b/pkg/multicloud/zstack/vpc.go @@ -18,10 +18,10 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/multicloud" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/multicloud" ) type SVpc struct { diff --git a/pkg/multicloud/zstack/wire.go b/pkg/multicloud/zstack/wire.go index d99952edc4..c3f69708dd 100644 --- a/pkg/multicloud/zstack/wire.go +++ b/pkg/multicloud/zstack/wire.go @@ -19,6 +19,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/multicloud/zstack/zone.go b/pkg/multicloud/zstack/zone.go index a9ab560213..951a620844 100644 --- a/pkg/multicloud/zstack/zone.go +++ b/pkg/multicloud/zstack/zone.go @@ -16,9 +16,9 @@ package zstack import ( "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/cloudprovider" api "yunion.io/x/onecloud/pkg/apis/compute" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SZone struct { diff --git a/pkg/multicloud/zstack/zstack.go b/pkg/multicloud/zstack/zstack.go index 0f0ae6856c..88d0d8fe7d 100644 --- a/pkg/multicloud/zstack/zstack.go +++ b/pkg/multicloud/zstack/zstack.go @@ -27,8 +27,10 @@ import ( "time" "github.com/pkg/errors" + "yunion.io/x/jsonutils" "yunion.io/x/log" + api "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/httputils" diff --git a/pkg/notify/models/mod_contact.go b/pkg/notify/models/mod_contact.go index 5a2713a8b6..2667a4b053 100644 --- a/pkg/notify/models/mod_contact.go +++ b/pkg/notify/models/mod_contact.go @@ -19,6 +19,7 @@ import ( "fmt" "strings" "time" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" "yunion.io/x/sqlchemy" diff --git a/pkg/notify/rpc/apis/send_server.pb.go b/pkg/notify/rpc/apis/send_server.pb.go index 358a6b1965..2b30129f9a 100644 --- a/pkg/notify/rpc/apis/send_server.pb.go +++ b/pkg/notify/rpc/apis/send_server.pb.go @@ -20,11 +20,12 @@ package apis import ( context "context" fmt "fmt" + math "math" + proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" - math "math" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/pkg/notify/rpc/send.go b/pkg/notify/rpc/send.go index 065f662a84..e1d9405a48 100644 --- a/pkg/notify/rpc/send.go +++ b/pkg/notify/rpc/send.go @@ -27,6 +27,7 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + "yunion.io/x/log" "yunion.io/x/pkg/errors" diff --git a/pkg/notify/service.go b/pkg/notify/service.go index 42c1437828..95c2ea8e72 100644 --- a/pkg/notify/service.go +++ b/pkg/notify/service.go @@ -20,6 +20,7 @@ import ( "time" _ "github.com/go-sql-driver/mysql" + "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon" diff --git a/pkg/s3gateway/handlers/errors.go b/pkg/s3gateway/handlers/errors.go index 3585544973..fd22c0d123 100644 --- a/pkg/s3gateway/handlers/errors.go +++ b/pkg/s3gateway/handlers/errors.go @@ -17,12 +17,12 @@ package handlers import ( "context" "net/http" + "runtime/debug" "yunion.io/x/log" "yunion.io/x/pkg/errors" "yunion.io/x/s3cli" - "runtime/debug" "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/s3gateway/handlers/middelware.go b/pkg/s3gateway/handlers/middelware.go index 3178cf7c69..b703eda693 100644 --- a/pkg/s3gateway/handlers/middelware.go +++ b/pkg/s3gateway/handlers/middelware.go @@ -18,9 +18,9 @@ import ( "context" "net/http" + "yunion.io/x/log" "yunion.io/x/pkg/gotypes" - "yunion.io/x/log" "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/mcclient/auth" diff --git a/pkg/s3gateway/models/buckets.go b/pkg/s3gateway/models/buckets.go index e21332547c..d9e2d43994 100644 --- a/pkg/s3gateway/models/buckets.go +++ b/pkg/s3gateway/models/buckets.go @@ -16,17 +16,20 @@ package models import ( "context" - "github.com/pkg/errors" "time" + + "github.com/pkg/errors" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/s3cli" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/s3gateway/session" "yunion.io/x/onecloud/pkg/util/hashcache" - "yunion.io/x/pkg/gotypes" - "yunion.io/x/s3cli" ) type SBucketManagerDelegate struct { diff --git a/pkg/s3gateway/models/cloudproviders.go b/pkg/s3gateway/models/cloudproviders.go index 9605c166ad..3b1e2b3931 100644 --- a/pkg/s3gateway/models/cloudproviders.go +++ b/pkg/s3gateway/models/cloudproviders.go @@ -20,13 +20,13 @@ import ( "yunion.io/x/pkg/errors" "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/s3gateway/session" "yunion.io/x/onecloud/pkg/util/hashcache" - "yunion.io/x/pkg/utils" ) type SCloudproviderManagerDelegate struct { diff --git a/pkg/s3gateway/service/service.go b/pkg/s3gateway/service/service.go index 527214d2e6..df3ad0c90d 100644 --- a/pkg/s3gateway/service/service.go +++ b/pkg/s3gateway/service/service.go @@ -23,10 +23,9 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon" app_common "yunion.io/x/onecloud/pkg/cloudcommon/app" common_options "yunion.io/x/onecloud/pkg/cloudcommon/options" + _ "yunion.io/x/onecloud/pkg/multicloud/loader" "yunion.io/x/onecloud/pkg/s3gateway/handlers" "yunion.io/x/onecloud/pkg/s3gateway/options" - - _ "yunion.io/x/onecloud/pkg/multicloud/loader" ) func StartService() { diff --git a/pkg/s3gateway/session/session.go b/pkg/s3gateway/session/session.go index 29215c2b79..107459a897 100644 --- a/pkg/s3gateway/session/session.go +++ b/pkg/s3gateway/session/session.go @@ -16,6 +16,7 @@ package session import ( "context" + "yunion.io/x/onecloud/pkg/image/options" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" diff --git a/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go index 76844591a4..a28571a3f8 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go @@ -15,9 +15,8 @@ package baremetal import ( - "fmt" + "fmt" // computeapi "yunion.io/x/onecloud/pkg/apis/compute" - // computeapi "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/compute/baremetal" "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" "yunion.io/x/onecloud/pkg/scheduler/core" diff --git a/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go b/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go index a8f588c1c3..0240c5fb74 100644 --- a/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go +++ b/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go @@ -24,7 +24,6 @@ import ( "yunion.io/x/pkg/util/netutils" "yunion.io/x/onecloud/pkg/compute/models" - "yunion.io/x/onecloud/pkg/scheduler/api" "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" ) diff --git a/pkg/scheduler/api/sched.go b/pkg/scheduler/api/sched.go index e6cc3a77d9..ee774f4044 100644 --- a/pkg/scheduler/api/sched.go +++ b/pkg/scheduler/api/sched.go @@ -15,9 +15,8 @@ package api import ( - "net/http" + "net/http" //"yunion.io/x/jsonutils" - //"yunion.io/x/jsonutils" "yunion.io/x/log" computeapi "yunion.io/x/onecloud/pkg/apis/compute" diff --git a/pkg/scheduler/handler/forecast_helper.go b/pkg/scheduler/handler/forecast_helper.go index 13fc60ee83..a58c630313 100644 --- a/pkg/scheduler/handler/forecast_helper.go +++ b/pkg/scheduler/handler/forecast_helper.go @@ -16,6 +16,7 @@ package handler import ( "fmt" + "yunion.io/x/log" schedapi "yunion.io/x/onecloud/pkg/apis/scheduler" diff --git a/pkg/scheduler/manager/task_history.go b/pkg/scheduler/manager/task_history.go index f1ac514764..752e8636cd 100644 --- a/pkg/scheduler/manager/task_history.go +++ b/pkg/scheduler/manager/task_history.go @@ -23,9 +23,8 @@ import ( "yunion.io/x/pkg/util/wait" u "yunion.io/x/pkg/utils" - o "yunion.io/x/onecloud/pkg/scheduler/options" - "yunion.io/x/onecloud/pkg/scheduler/models" + o "yunion.io/x/onecloud/pkg/scheduler/options" ) type HistoryItem struct { diff --git a/pkg/scheduler/service/service.go b/pkg/scheduler/service/service.go index 0429f992c3..1c5419d3e5 100644 --- a/pkg/scheduler/service/service.go +++ b/pkg/scheduler/service/service.go @@ -22,6 +22,7 @@ import ( "time" "github.com/gin-gonic/gin" + _ "github.com/go-sql-driver/mysql" "yunion.io/x/log" "yunion.io/x/pkg/util/prometheus" @@ -30,17 +31,15 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon" app_common "yunion.io/x/onecloud/pkg/cloudcommon/app" "yunion.io/x/onecloud/pkg/cloudcommon/db" + _ "yunion.io/x/onecloud/pkg/compute/guestdrivers" + _ "yunion.io/x/onecloud/pkg/compute/hostdrivers" computemodels "yunion.io/x/onecloud/pkg/compute/models" + _ "yunion.io/x/onecloud/pkg/scheduler/algorithmprovider" skuman "yunion.io/x/onecloud/pkg/scheduler/data_manager/sku" schedhandler "yunion.io/x/onecloud/pkg/scheduler/handler" schedman "yunion.io/x/onecloud/pkg/scheduler/manager" o "yunion.io/x/onecloud/pkg/scheduler/options" "yunion.io/x/onecloud/pkg/util/gin/middleware" - - _ "github.com/go-sql-driver/mysql" - _ "yunion.io/x/onecloud/pkg/compute/guestdrivers" - _ "yunion.io/x/onecloud/pkg/compute/hostdrivers" - _ "yunion.io/x/onecloud/pkg/scheduler/algorithmprovider" ) func StartService() error { diff --git a/pkg/util/ansible/serializable.go b/pkg/util/ansible/serializable.go index f310c116b1..3f2ff833f2 100644 --- a/pkg/util/ansible/serializable.go +++ b/pkg/util/ansible/serializable.go @@ -16,6 +16,7 @@ package ansible import ( "reflect" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/gotypes" ) diff --git a/pkg/util/dhcp/server.go b/pkg/util/dhcp/server.go index ae77c2868a..947a9f8cba 100644 --- a/pkg/util/dhcp/server.go +++ b/pkg/util/dhcp/server.go @@ -20,6 +20,7 @@ import ( "runtime/debug" "golang.org/x/net/bpf" + "yunion.io/x/log" ) diff --git a/pkg/util/fernetool/fernet.go b/pkg/util/fernetool/fernet.go index 94c84c803d..f1d1e713be 100644 --- a/pkg/util/fernetool/fernet.go +++ b/pkg/util/fernetool/fernet.go @@ -15,17 +15,17 @@ package fernetool import ( + "crypto/sha1" + "encoding/base64" + "encoding/hex" "fmt" "io/ioutil" "path/filepath" "time" "github.com/fernet/fernet-go" - - "crypto/sha1" - "encoding/base64" - "encoding/hex" "github.com/pkg/errors" + "yunion.io/x/onecloud/pkg/util/fileutils2" ) diff --git a/pkg/util/httputils/httputils.go b/pkg/util/httputils/httputils.go index 4a324dd459..aadeefcd20 100644 --- a/pkg/util/httputils/httputils.go +++ b/pkg/util/httputils/httputils.go @@ -22,6 +22,7 @@ import ( "io/ioutil" "net" "net/http" + "net/http/httputil" "net/url" "os" "strconv" @@ -35,7 +36,6 @@ import ( "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/trace" - "net/http/httputil" "yunion.io/x/onecloud/pkg/appctx" ) diff --git a/pkg/util/ldaputils/ldaputils.go b/pkg/util/ldaputils/ldaputils.go index 2d870e1407..c800681515 100644 --- a/pkg/util/ldaputils/ldaputils.go +++ b/pkg/util/ldaputils/ldaputils.go @@ -19,9 +19,8 @@ import ( "fmt" "strings" - "gopkg.in/ldap.v3" - "github.com/pkg/errors" + "gopkg.in/ldap.v3" "yunion.io/x/log" ) diff --git a/pkg/util/printutils/printgetter.go b/pkg/util/printutils/printgetter.go index 496e429baa..da19ff499b 100644 --- a/pkg/util/printutils/printgetter.go +++ b/pkg/util/printutils/printgetter.go @@ -20,9 +20,10 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modulebase" "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/mcclient/modulebase" ) func getter2json(obj interface{}) jsonutils.JSONObject { diff --git a/pkg/util/rbacutils/rbac_test.go b/pkg/util/rbacutils/rbac_test.go index c0a7527ac5..3c7a7972ac 100644 --- a/pkg/util/rbacutils/rbac_test.go +++ b/pkg/util/rbacutils/rbac_test.go @@ -18,7 +18,6 @@ import ( "testing" "yunion.io/x/jsonutils" - "yunion.io/x/pkg/util/netutils" ) diff --git a/pkg/util/redfish/loader/loader.go b/pkg/util/redfish/loader/loader.go index 478e3da975..f33d0b1e03 100644 --- a/pkg/util/redfish/loader/loader.go +++ b/pkg/util/redfish/loader/loader.go @@ -16,9 +16,7 @@ package loader import ( "yunion.io/x/log" - - _ "yunion.io/x/onecloud/pkg/util/redfish/generic" - // _ "yunion.io/x/onecloud/pkg/util/redfish/hprest" + _ "yunion.io/x/onecloud/pkg/util/redfish/generic" // _ "yunion.io/x/onecloud/pkg/util/redfish/hprest" _ "yunion.io/x/onecloud/pkg/util/redfish/idrac" _ "yunion.io/x/onecloud/pkg/util/redfish/ilo" ) diff --git a/pkg/util/s3auth/interface.go b/pkg/util/s3auth/interface.go index 1e67dd2307..fca9a45aca 100644 --- a/pkg/util/s3auth/interface.go +++ b/pkg/util/s3auth/interface.go @@ -17,6 +17,7 @@ package s3auth import ( "net/http" "strings" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" ) diff --git a/pkg/util/s3auth/v4.go b/pkg/util/s3auth/v4.go index 5353346cc4..ba8dfa768d 100644 --- a/pkg/util/s3auth/v4.go +++ b/pkg/util/s3auth/v4.go @@ -27,9 +27,9 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/pkg/errors" + "yunion.io/x/pkg/util/timeutils" "yunion.io/x/onecloud/pkg/util/streamutils" - "yunion.io/x/pkg/util/timeutils" ) // Signature and API related constants. diff --git a/pkg/util/sysutils/sysutils_test.go b/pkg/util/sysutils/sysutils_test.go index 435f69d215..bf0b5e02a3 100644 --- a/pkg/util/sysutils/sysutils_test.go +++ b/pkg/util/sysutils/sysutils_test.go @@ -21,6 +21,7 @@ import ( "testing" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/apis/compute" "yunion.io/x/onecloud/pkg/cloudcommon/types" ) diff --git a/pkg/yunionconf/models/parameters.go b/pkg/yunionconf/models/parameters.go index 866158d1b8..5c8381a576 100644 --- a/pkg/yunionconf/models/parameters.go +++ b/pkg/yunionconf/models/parameters.go @@ -20,8 +20,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/timeutils" - "yunion.io/x/sqlchemy" - // "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" // "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db" @@ -31,7 +30,6 @@ import ( "yunion.io/x/onecloud/pkg/mcclient/auth" "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/util/rbacutils" - "yunion.io/x/onecloud/pkg/yunionconf/options" )