From 8fe4f2ec98110dece5412f7980a0085725b7e993 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Wed, 13 Mar 2019 10:46:12 +0000 Subject: [PATCH] treewide: group imports with goimports ./goimports -w -local yunion.io/x/onecloud/ -corp yunion.io/x/ $GOPATH/src/yunion.io/x/onecloud/{cmd,pkg} --- cmd/aliyuncli/main.go | 4 ++-- cmd/awscli/main.go | 4 ++-- cmd/azurecli/main.go | 3 +-- cmd/climc/climc.go | 3 +-- cmd/climc/promputils/option_arguments.go | 2 +- cmd/climc/shell/account_balances.go | 1 + cmd/climc/shell/alarmlogs.go | 1 + cmd/climc/shell/baremetalagents.go | 1 + cmd/climc/shell/baremetalnetworks.go | 1 + cmd/climc/shell/baremetalstorages.go | 1 + cmd/climc/shell/bill_analysises.go | 1 + cmd/climc/shell/bill_balances.go | 1 + cmd/climc/shell/bill_conditions.go | 1 + cmd/climc/shell/bill_details.go | 1 + cmd/climc/shell/bill_resources.go | 1 + cmd/climc/shell/contactgroups.go | 1 + cmd/climc/shell/email_config.go | 1 + cmd/climc/shell/endpoints.go | 1 + cmd/climc/shell/groups.go | 1 + cmd/climc/shell/hostcachedimages.go | 1 + cmd/climc/shell/hosts.go | 1 + cmd/climc/shell/hoststorages.go | 1 + cmd/climc/shell/hostwires.go | 1 + cmd/climc/shell/images.go | 1 + cmd/climc/shell/instances.go | 1 + cmd/climc/shell/isolatedevices.go | 1 + cmd/climc/shell/k8s/k8s.go | 1 + cmd/climc/shell/keypairs.go | 1 + cmd/climc/shell/keystoneutils.go | 1 + cmd/climc/shell/labels.go | 1 + cmd/climc/shell/loadbalanceracls.go | 1 + cmd/climc/shell/loadbalancerlistenerrules.go | 1 + cmd/climc/shell/loadbalancerlisteners.go | 1 + cmd/climc/shell/loadbalancernetworks.go | 1 + cmd/climc/shell/meteralert.go | 1 + cmd/climc/shell/metrics.go | 1 + cmd/climc/shell/monitor_metrics.go | 1 + cmd/climc/shell/monitor_types.go | 1 + cmd/climc/shell/monitorinputs.go | 1 + cmd/climc/shell/monitortemplates.go | 1 + cmd/climc/shell/networks.go | 1 + cmd/climc/shell/nodes.go | 1 + cmd/climc/shell/notices.go | 1 + cmd/climc/shell/operations.go | 1 + cmd/climc/shell/parameters.go | 1 + cmd/climc/shell/performances.go | 1 + cmd/climc/shell/policies.go | 2 ++ cmd/climc/shell/price_infos.go | 1 + cmd/climc/shell/processes.go | 1 + cmd/climc/shell/processlogs.go | 1 + cmd/climc/shell/project_admin.go | 1 + cmd/climc/shell/project_admin_candidates.go | 1 + cmd/climc/shell/project_hosts.go | 1 + cmd/climc/shell/quotas.go | 1 + cmd/climc/shell/rates.go | 1 + cmd/climc/shell/recipient.go | 1 + cmd/climc/shell/regions.go | 1 + cmd/climc/shell/res_results.go | 1 + cmd/climc/shell/reservedips.go | 1 + cmd/climc/shell/resource_details.go | 1 + cmd/climc/shell/resource_fees.go | 1 + cmd/climc/shell/role_assignments.go | 1 + cmd/climc/shell/roles.go | 1 + cmd/climc/shell/schedtaghosts.go | 1 + cmd/climc/shell/schedtags.go | 2 ++ cmd/climc/shell/schedulers.go | 1 + cmd/climc/shell/secgrouprules.go | 1 + cmd/climc/shell/secgroups.go | 1 + cmd/climc/shell/serverdisks.go | 2 ++ cmd/climc/shell/serverisolatedevices.go | 1 + cmd/climc/shell/service_hosts.go | 1 + cmd/climc/shell/service_name_suggestions.go | 1 + cmd/climc/shell/services.go | 1 + cmd/climc/shell/servicetrees.go | 1 + cmd/climc/shell/sms_configs.go | 1 + cmd/climc/shell/snapshots.go | 1 + cmd/climc/shell/specs.go | 1 + cmd/climc/shell/sshkeypairs.go | 2 ++ cmd/climc/shell/storagecachedimages.go | 1 + cmd/climc/shell/storagecaches.go | 1 + cmd/climc/shell/storages.go | 1 + cmd/climc/shell/tasks.go | 1 + cmd/climc/shell/treenodes.go | 1 + cmd/climc/shell/underutilizedinstances.go | 1 + cmd/climc/shell/unused_resources.go | 1 + cmd/climc/shell/updates.go | 1 + cmd/climc/shell/usages.go | 1 + cmd/climc/shell/users.go | 1 + cmd/climc/shell/utils.go | 1 + cmd/climc/shell/vcenters.go | 1 + cmd/climc/shell/verification.go | 1 + cmd/climc/shell/vncproxy.go | 1 + cmd/climc/shell/vpcs.go | 1 + cmd/climc/shell/websockets.go | 1 + cmd/climc/shell/wires.go | 1 + cmd/climc/shell/zones.go | 1 + cmd/esxicli/main.go | 3 +-- cmd/huaweicli/main.go | 4 ++-- cmd/ipmicli/main.go | 3 +-- cmd/lbagent/main.go | 1 + cmd/openstackcli/main.go | 4 ++-- cmd/qcloudcli/main.go | 4 ++-- cmd/region-dns/main.go | 5 ++--- cmd/scheduler/app/server.go | 3 ++- cmd/scheduler/main.go | 1 + cmd/scheduler/options/options.go | 2 +- pkg/appsrv/dispatcher/handlers.go | 3 ++- pkg/appsrv/dispatcher/jointdispatcher.go | 1 + pkg/appsrv/test/testapp.go | 1 + pkg/baremetal/pxe/dhcp.go | 1 + pkg/baremetal/utils/disktool/disktool_test.go | 2 +- pkg/baremetal/utils/raid/drivers/drivers.go | 3 +-- pkg/cloudcommon/cronman/cronman.go | 1 + pkg/cloudcommon/db/adminsharablevirtual.go | 3 ++- pkg/cloudcommon/db/db_joint_dispatcher.go | 6 +++--- pkg/cloudcommon/db/interface.go | 2 +- pkg/cloudcommon/db/jointbase.go | 3 ++- pkg/cloudcommon/db/lockman/example/main.go | 2 +- pkg/cloudcommon/db/lockman/fifo.go | 1 + pkg/cloudcommon/db/lockman/inmemory.go | 2 +- pkg/cloudcommon/db/metadata.go | 2 +- pkg/cloudcommon/db/namevalidator.go | 3 ++- pkg/cloudcommon/db/resourcebase.go | 3 ++- pkg/cloudcommon/db/sharablevirtual.go | 3 ++- pkg/cloudcommon/db/standalone.go | 5 +++-- pkg/cloudcommon/db/statusstandalone.go | 1 + pkg/cloudcommon/db/taskman/interface.go | 1 + pkg/cloudcommon/db/taskman/localtaskworker.go | 1 + pkg/cloudcommon/db/tenantcache.go | 2 -- pkg/cloudcommon/etcd/etcd.go | 6 ++++-- pkg/cloudcommon/etcd/models/base/basemanager.go | 2 +- pkg/cloudcommon/etcd/models/serviceregistries.go | 1 + pkg/cloudcommon/etcd/test/etcdtest.go | 2 ++ pkg/cloudcommon/policy/global.go | 1 + pkg/cloudir/service/service.go | 1 + pkg/cloudprovider/cloudprovider.go | 4 ++-- pkg/cloudprovider/instance.go | 1 + pkg/cloutpost/service/service.go | 1 + pkg/compute/hostdrivers/huawei.go | 1 + pkg/compute/hostdrivers/openstack.go | 1 + pkg/compute/hostdrivers/qcloud.go | 1 + pkg/compute/models/baremetalagents.go | 9 +++++---- pkg/compute/models/cloudregions.go | 4 ++-- pkg/compute/models/dynamicschedtags.go | 3 +-- pkg/compute/models/groupguests.go | 2 +- pkg/compute/models/groupnetworks.go | 2 +- pkg/compute/models/guest_actions.go | 2 +- pkg/compute/models/guestdrivers.go | 2 +- pkg/compute/models/guestsecgroups.go | 1 + pkg/compute/models/hostjoints.go | 2 +- pkg/compute/models/hostschedtags.go | 1 + pkg/compute/models/hostwires.go | 3 ++- pkg/compute/models/initdb.go | 1 + pkg/compute/models/isolated_devices.go | 7 ++++--- pkg/compute/models/keypairs.go | 5 +++-- pkg/compute/models/managedresource.go | 2 +- pkg/compute/models/netinterfaces.go | 3 ++- pkg/compute/models/quotas.go | 3 ++- pkg/compute/models/regiondrivers.go | 1 + pkg/compute/models/reservedips.go | 3 ++- pkg/compute/models/storagedrivers.go | 1 + pkg/compute/regiondrivers/qcloud.go | 1 + pkg/compute/service/service.go | 13 ++++++------- pkg/compute/sshkeys/handler.go | 1 + pkg/compute/storagedrivers/base.go | 1 + pkg/compute/storagedrivers/local.go | 1 + pkg/compute/storagedrivers/nfs.go | 1 + pkg/compute/storagedrivers/rbd.go | 1 + pkg/compute/tasks/baremetal_delete_task.go | 1 + pkg/compute/tasks/baremetal_maintenance_task.go | 1 + pkg/compute/tasks/baremetal_prepare_task.go | 1 + .../tasks/baremetal_server_rebuild_root_task.go | 1 + pkg/compute/tasks/baremetal_server_reset_task.go | 1 + pkg/compute/tasks/baremetal_server_start_task.go | 1 + pkg/compute/tasks/baremetal_server_stop_task.go | 1 + .../tasks/baremetal_server_sync_status_task.go | 1 + pkg/compute/tasks/baremetal_sync_status_task.go | 1 + .../tasks/baremetal_unconvert_hypervisor_task.go | 1 + pkg/compute/tasks/baremetal_unmaintenance_task.go | 1 + pkg/compute/tasks/cloud_account_import_task.go | 1 + pkg/compute/tasks/cloud_account_sync_task.go | 1 + pkg/compute/tasks/cloud_provider_sync_info_task.go | 2 +- pkg/compute/tasks/eip_deallocate_task.go | 3 +-- pkg/compute/tasks/guest_backup_tasks.go | 3 ++- pkg/compute/tasks/guest_create_disk_task.go | 2 +- pkg/compute/tasks/guest_deploy_task.go | 1 + pkg/compute/tasks/guest_reset_task.go | 1 + pkg/compute/tasks/guest_save_image_task.go | 1 + pkg/compute/tasks/guest_start_task.go | 1 + pkg/compute/tasks/guest_stop_task.go | 1 + pkg/compute/tasks/guest_syncstatus_task.go | 1 + pkg/compute/tasks/host_storage_attach_task.go | 1 + pkg/compute/tasks/host_storage_detach_task.go | 1 + pkg/compute/tasks/network_create_task.go | 1 + pkg/compute/tasks/network_delete_task.go | 1 + pkg/compute/tasks/security_group_delete_task.go | 1 + pkg/compute/tasks/storage_uncache_image_task.go | 2 +- pkg/compute/tasks/vpc_create_task.go | 1 + pkg/compute/tasks/vpc_delete_task.go | 1 + pkg/dns/parse.go | 3 ++- pkg/hostimage/host_image_service.go | 5 +++-- pkg/hostman/downloader/guest_downloader.go | 1 + pkg/hostman/downloader/image_downloader.go | 3 ++- pkg/hostman/guestfs/fsdriver/android.go | 1 + pkg/hostman/guestfs/fsdriver/esxi.go | 1 + pkg/hostman/guestfs/fsdriver/linux.go | 1 + pkg/hostman/guestfs/fsdriver/macos.go | 3 ++- pkg/hostman/guestfs/fsdriver/windows.go | 3 ++- pkg/hostman/guestman/guesthelper.go | 1 + pkg/hostman/hostinfo/hostdhcp/dhcprelay.go | 1 + pkg/hostman/hostinfo/hostinfohelper.go | 1 + pkg/hostman/hostinfo/hostpinger.go | 1 + pkg/hostman/hostmetrics/hostmetrics.go | 1 + pkg/hostman/kubehandler.go | 1 + pkg/hostman/monitor/hmp.go | 1 + pkg/hostman/storageman/disk_local.go | 3 ++- pkg/hostman/storageman/disk_rbd.go | 4 +++- pkg/hostman/storageman/imagecache_local.go | 1 + pkg/hostman/storageman/imagecache_rbd.go | 1 + pkg/hostman/storageman/imagecachemanager_local.go | 3 ++- pkg/hostman/storageman/imagecachemanager_rbd.go | 1 + pkg/hostman/storageman/remotefile/remotefile.go | 1 + pkg/hostman/storageman/storage_base.go | 1 + pkg/hostman/storageman/storage_rbd.go | 4 +++- pkg/hostman/storageman/storagehandler.go | 1 + pkg/hostman/system_service/fluentbit.go | 1 + pkg/hostman/system_service/system_service.go | 1 + pkg/httperrors/httperrors.go | 1 + pkg/image/models/initdb.go | 1 + pkg/image/service/service.go | 3 +-- pkg/image/tasks/image_delete_task.go | 1 + pkg/mcclient/auth/middleware.go | 2 +- pkg/mcclient/mcclient.go | 3 ++- pkg/mcclient/modules/base.go | 1 + pkg/mcclient/modules/cache.go | 1 + pkg/mcclient/modules/filter.go | 1 + pkg/mcclient/modules/joint.go | 1 + pkg/mcclient/modules/mod_alarmevents.go | 1 + pkg/mcclient/modules/mod_capabilities.go | 1 + pkg/mcclient/modules/mod_cloudregions.go | 3 ++- pkg/mcclient/modules/mod_contacts.go | 1 + pkg/mcclient/modules/mod_domains.go | 4 ++-- pkg/mcclient/modules/mod_endpoints.go | 1 + pkg/mcclient/modules/mod_hosts.go | 9 +++++---- pkg/mcclient/modules/mod_images.go | 4 ++-- pkg/mcclient/modules/mod_infos.go | 1 + pkg/mcclient/modules/mod_license.go | 1 + pkg/mcclient/modules/mod_nodes.go | 1 + pkg/mcclient/modules/mod_performances.go | 1 + pkg/mcclient/modules/mod_policies.go | 1 + pkg/mcclient/modules/mod_projects.go | 4 ++-- pkg/mcclient/modules/mod_quotas.go | 1 + pkg/mcclient/modules/mod_recipients.go | 1 + pkg/mcclient/modules/mod_reservedips.go | 1 + pkg/mcclient/modules/mod_roleassignments.go | 1 + pkg/mcclient/modules/mod_roles.go | 1 + pkg/mcclient/modules/mod_schedtags.go | 1 + pkg/mcclient/modules/mod_scheduler.go | 1 + pkg/mcclient/modules/mod_servers.go | 5 +++-- pkg/mcclient/modules/mod_servicehosts.go | 1 + pkg/mcclient/modules/mod_specs.go | 3 ++- pkg/mcclient/modules/mod_sshkeypairs.go | 2 ++ pkg/mcclient/modules/mod_stastics.go | 1 + pkg/mcclient/modules/mod_treenodes.go | 1 + pkg/mcclient/modules/mod_updates.go | 1 + pkg/mcclient/modules/mod_usages.go | 1 + pkg/mcclient/modules/mod_users.go | 1 + pkg/mcclient/modules/mod_vncproxy.go | 1 + pkg/mcclient/modules/mod_webconsole.go | 1 + pkg/mcclient/modules/modules.go | 1 + pkg/mcclient/modules/resource.go | 6 +++--- pkg/mcclient/options/loadbalancerbackendgroups.go | 3 ++- pkg/mcclient/session.go | 3 ++- pkg/mcclient/tokenman.go | 1 + pkg/proxy/http.go | 1 + .../predicates/baremetal/status_predicate.go | 3 ++- .../algorithm/predicates/guest/status_predicate.go | 3 +-- .../algorithm/predicates/guest/storage_predicate.go | 3 ++- .../predicates/k8s/host_status_predicate.go | 2 +- pkg/scheduler/algorithm/predicates/k8s/k8s.go | 2 +- .../algorithm/predicates/k8s/network_predicate.go | 2 +- .../algorithm/predicates/k8s/volume_predicate.go | 2 +- pkg/scheduler/algorithm/predicates/predicates.go | 1 + pkg/scheduler/algorithmprovider/baremetal.go | 3 ++- pkg/scheduler/algorithmprovider/defaults.go | 3 ++- pkg/scheduler/api/candidate.go | 2 +- pkg/scheduler/api/cleanup.go | 4 +--- pkg/scheduler/api/completed.go | 4 +--- pkg/scheduler/api/history.go | 2 +- pkg/scheduler/api/sched.go | 2 +- pkg/scheduler/cache/candidate/baremetals.go | 1 + pkg/scheduler/cache/candidate/default.go | 3 ++- pkg/scheduler/cache/candidate/hosts.go | 8 ++++---- pkg/scheduler/cache/db/default.go | 3 ++- pkg/scheduler/cache/sync/default.go | 3 ++- pkg/scheduler/cache/sync/network.go | 3 ++- pkg/scheduler/cache/sync/network_data.go | 3 ++- pkg/scheduler/cache/sync/networks/db/db.go | 1 + pkg/scheduler/core/generic_scheduler.go | 3 ++- pkg/scheduler/data_manager/candidate_manager.go | 3 ++- pkg/scheduler/data_manager/network_manager.go | 1 + pkg/scheduler/data_manager/reserved_algorithm.go | 3 ++- pkg/scheduler/factory/factory.go | 3 ++- pkg/scheduler/factory/plugins.go | 3 ++- pkg/scheduler/handler/handler.go | 5 +++-- pkg/scheduler/handler/k8s_extender.go | 4 ++-- pkg/scheduler/handler/ping.go | 3 ++- pkg/scheduler/handler/version.go | 2 +- pkg/scheduler/manager/completed_queue.go | 3 ++- pkg/scheduler/manager/expire_queue.go | 3 ++- pkg/scheduler/manager/task_history.go | 3 ++- pkg/scheduler/manager/task_queue.go | 1 + pkg/util/aliyun/image.go | 2 +- pkg/util/aliyun/instancenic.go | 3 ++- pkg/util/aliyun/keypair.go | 5 +++-- pkg/util/aliyun/loadbalanceracl.go | 1 + pkg/util/aliyun/loadbalancerbackend.go | 1 + pkg/util/aliyun/loadbalancerbackendgroup.go | 1 + pkg/util/aliyun/loadbalancerhttplistener.go | 1 + pkg/util/aliyun/loadbalancerhttpslistener.go | 1 + pkg/util/aliyun/loadbalancerlistenerrule.go | 1 + pkg/util/aliyun/natgateway.go | 2 +- pkg/util/aliyun/routetable.go | 2 +- pkg/util/aliyun/shell/routetable.go | 1 + pkg/util/aliyun/storagecache.go | 1 + pkg/util/aliyun/vswitch.go | 2 +- pkg/util/aliyun/wrapper.go | 6 +++--- pkg/util/aws/eip.go | 1 + pkg/util/aws/provider/provider.go | 1 + pkg/util/azure/provider/provider.go | 1 + pkg/util/azure/shell/image.go | 1 + pkg/util/cgrouputils/cpusetutils.go | 1 + pkg/util/cgrouputils/cpuutils.go | 2 ++ pkg/util/conditionparser/parser_test.go | 2 +- pkg/util/coreosutils/coreosutils.go | 1 + pkg/util/esxi/shell/store.go | 1 + pkg/util/esxi/shell/virtualmachine.go | 1 + pkg/util/fileutils2/blkid.go | 1 + pkg/util/fileutils2/cheksum.go | 9 ++++----- pkg/util/fileutils2/fileutils.go | 3 ++- pkg/util/fuseutils/fuseutils.go | 1 + pkg/util/gin/middleware/error.go | 2 +- pkg/util/gin/middleware/keystone_auth.go | 2 +- pkg/util/gin/middleware/log.go | 2 +- pkg/util/huawei/client/manager/manager.go | 1 + pkg/util/huawei/client/modules/manager_resource.go | 1 + pkg/util/huawei/client/modules/mod_jobs.go | 1 + pkg/util/huawei/client/modules/mod_servers.go | 3 ++- pkg/util/huawei/client/responses/responses.go | 1 + pkg/util/huawei/client/responses/responses_test.go | 1 + pkg/util/huawei/eip.go | 1 + pkg/util/huawei/host.go | 1 + pkg/util/huawei/huawei.go | 1 + pkg/util/huawei/instancenic.go | 3 ++- pkg/util/huawei/keypair.go | 1 + pkg/util/huawei/network.go | 3 ++- pkg/util/huawei/order.go | 1 + pkg/util/huawei/project.go | 2 +- pkg/util/huawei/provider/provider.go | 1 + pkg/util/huawei/snapshot.go | 1 + pkg/util/huawei/storage.go | 2 ++ pkg/util/huawei/utils.go | 5 +++-- pkg/util/huawei/vpc.go | 1 + pkg/util/huawei/wire.go | 1 + pkg/util/huawei/zone.go | 5 +++-- pkg/util/netutils2/macutils_test.go | 1 + pkg/util/openstack/disk.go | 1 + pkg/util/openstack/flavor.go | 1 + pkg/util/openstack/host.go | 3 ++- pkg/util/openstack/image.go | 3 ++- pkg/util/openstack/instance.go | 3 ++- pkg/util/openstack/keypaire.go | 3 ++- pkg/util/openstack/network.go | 3 ++- pkg/util/openstack/openstack.go | 1 + pkg/util/openstack/quota.go | 1 + pkg/util/openstack/region.go | 1 + pkg/util/openstack/securitygroup.go | 5 +++-- pkg/util/openstack/snapshot.go | 1 + pkg/util/openstack/vpc.go | 1 + pkg/util/openstack/zone.go | 1 + pkg/util/printutils/printgetter.go | 3 ++- pkg/util/qcloud/instance.go | 3 +-- pkg/util/qcloud/loadbalancer_backend.go | 1 + pkg/util/qcloud/loadbalancer_listener.go | 1 + pkg/util/qcloud/loadbalancer_listenerrule.go | 1 + pkg/util/qcloud/shell/cos.go | 1 + pkg/util/qcloud/shell/image.go | 1 + pkg/util/seclib2/crypto.go | 12 ++++++------ pkg/util/seclib2/ssh.go | 6 +++--- pkg/util/seclib2/ssh_test.go | 3 ++- pkg/util/tarutils/tarutils.go | 1 + pkg/util/winutils/winutils.go | 3 ++- pkg/webconsole/command/ssh_command.go | 9 +++++---- pkg/webconsole/service/service.go | 2 +- pkg/yunionconf/models/initdb.go | 1 + pkg/yunionconf/models/parameters.go | 7 ++++--- pkg/yunionconf/service/service.go | 4 ++-- 397 files changed, 538 insertions(+), 219 deletions(-) diff --git a/cmd/aliyuncli/main.go b/cmd/aliyuncli/main.go index d896e1610b..79746a3041 100644 --- a/cmd/aliyuncli/main.go +++ b/cmd/aliyuncli/main.go @@ -5,11 +5,11 @@ import ( "os" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/aliyun" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/util/aliyun" _ "yunion.io/x/onecloud/pkg/util/aliyun/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/awscli/main.go b/cmd/awscli/main.go index 5bbb915469..2ad403cd3a 100644 --- a/cmd/awscli/main.go +++ b/cmd/awscli/main.go @@ -5,11 +5,11 @@ import ( "os" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/aws" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/util/aws" _ "yunion.io/x/onecloud/pkg/util/aws/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/azurecli/main.go b/cmd/azurecli/main.go index ffc636a49c..dea06cf5b9 100644 --- a/cmd/azurecli/main.go +++ b/cmd/azurecli/main.go @@ -8,10 +8,9 @@ import ( "yunion.io/x/structarg" "yunion.io/x/onecloud/pkg/util/azure" + _ "yunion.io/x/onecloud/pkg/util/azure/shell" "yunion.io/x/onecloud/pkg/util/printutils" "yunion.io/x/onecloud/pkg/util/shellutils" - - _ "yunion.io/x/onecloud/pkg/util/azure/shell" ) type BaseOptions struct { diff --git a/cmd/climc/climc.go b/cmd/climc/climc.go index 65d362f725..1e96bb7776 100644 --- a/cmd/climc/climc.go +++ b/cmd/climc/climc.go @@ -18,10 +18,9 @@ import ( "yunion.io/x/onecloud/cmd/climc/promputils" "yunion.io/x/onecloud/cmd/climc/shell" - "yunion.io/x/onecloud/pkg/mcclient" - _ "yunion.io/x/onecloud/cmd/climc/shell/etcd" _ "yunion.io/x/onecloud/cmd/climc/shell/k8s" + "yunion.io/x/onecloud/pkg/mcclient" ) type BaseOptions struct { diff --git a/cmd/climc/promputils/option_arguments.go b/cmd/climc/promputils/option_arguments.go index 1d9e14072c..e9eb5a398d 100644 --- a/cmd/climc/promputils/option_arguments.go +++ b/cmd/climc/promputils/option_arguments.go @@ -6,7 +6,7 @@ import ( "path/filepath" "strings" - "github.com/c-bata/go-prompt" + prompt "github.com/c-bata/go-prompt" ) func init() { diff --git a/cmd/climc/shell/account_balances.go b/cmd/climc/shell/account_balances.go index 377209a4c1..88c0e02136 100644 --- a/cmd/climc/shell/account_balances.go +++ b/cmd/climc/shell/account_balances.go @@ -2,6 +2,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/alarmlogs.go b/cmd/climc/shell/alarmlogs.go index d1dff14858..916c0f090b 100644 --- a/cmd/climc/shell/alarmlogs.go +++ b/cmd/climc/shell/alarmlogs.go @@ -5,6 +5,7 @@ import ( "strings" "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/baremetalagents.go b/cmd/climc/shell/baremetalagents.go index 94942659d6..382cb089fe 100644 --- a/cmd/climc/shell/baremetalagents.go +++ b/cmd/climc/shell/baremetalagents.go @@ -2,6 +2,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/baremetalnetworks.go b/cmd/climc/shell/baremetalnetworks.go index 24a3ef65bf..bf8c135340 100644 --- a/cmd/climc/shell/baremetalnetworks.go +++ b/cmd/climc/shell/baremetalnetworks.go @@ -2,6 +2,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/baremetalstorages.go b/cmd/climc/shell/baremetalstorages.go index 28a4705aa3..935e6775ce 100644 --- a/cmd/climc/shell/baremetalstorages.go +++ b/cmd/climc/shell/baremetalstorages.go @@ -2,6 +2,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/bill_analysises.go b/cmd/climc/shell/bill_analysises.go index d1f7273387..fa72a13f68 100644 --- a/cmd/climc/shell/bill_analysises.go +++ b/cmd/climc/shell/bill_analysises.go @@ -2,6 +2,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/bill_balances.go b/cmd/climc/shell/bill_balances.go index 51a23e99b7..979d89a4f4 100644 --- a/cmd/climc/shell/bill_balances.go +++ b/cmd/climc/shell/bill_balances.go @@ -2,6 +2,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/bill_conditions.go b/cmd/climc/shell/bill_conditions.go index 5feb4890c1..3dc6d2aa8e 100644 --- a/cmd/climc/shell/bill_conditions.go +++ b/cmd/climc/shell/bill_conditions.go @@ -2,6 +2,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/bill_details.go b/cmd/climc/shell/bill_details.go index f5d17510d0..c2dd2cff7b 100644 --- a/cmd/climc/shell/bill_details.go +++ b/cmd/climc/shell/bill_details.go @@ -2,6 +2,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/bill_resources.go b/cmd/climc/shell/bill_resources.go index 61a3c1ad4b..fd81fccf7c 100644 --- a/cmd/climc/shell/bill_resources.go +++ b/cmd/climc/shell/bill_resources.go @@ -2,6 +2,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/contactgroups.go b/cmd/climc/shell/contactgroups.go index 9841ffaa8f..5ba3842b4f 100644 --- a/cmd/climc/shell/contactgroups.go +++ b/cmd/climc/shell/contactgroups.go @@ -2,6 +2,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/email_config.go b/cmd/climc/shell/email_config.go index 7425aec620..bd681d8c3a 100644 --- a/cmd/climc/shell/email_config.go +++ b/cmd/climc/shell/email_config.go @@ -2,6 +2,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/endpoints.go b/cmd/climc/shell/endpoints.go index 913f83c2af..7d6f25be4b 100644 --- a/cmd/climc/shell/endpoints.go +++ b/cmd/climc/shell/endpoints.go @@ -2,6 +2,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/groups.go b/cmd/climc/shell/groups.go index af83b483b5..4d3eaa176e 100644 --- a/cmd/climc/shell/groups.go +++ b/cmd/climc/shell/groups.go @@ -2,6 +2,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/hostcachedimages.go b/cmd/climc/shell/hostcachedimages.go index c150c7fb91..3a9b9bcfb8 100644 --- a/cmd/climc/shell/hostcachedimages.go +++ b/cmd/climc/shell/hostcachedimages.go @@ -2,6 +2,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/hosts.go b/cmd/climc/shell/hosts.go index 9d09dd04c8..b023e1de48 100644 --- a/cmd/climc/shell/hosts.go +++ b/cmd/climc/shell/hosts.go @@ -4,6 +4,7 @@ import ( "fmt" "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/hoststorages.go b/cmd/climc/shell/hoststorages.go index f2b438d308..941eb65efb 100644 --- a/cmd/climc/shell/hoststorages.go +++ b/cmd/climc/shell/hoststorages.go @@ -2,6 +2,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/hostwires.go b/cmd/climc/shell/hostwires.go index 4b606c99bc..a739e44bb2 100644 --- a/cmd/climc/shell/hostwires.go +++ b/cmd/climc/shell/hostwires.go @@ -2,6 +2,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/images.go b/cmd/climc/shell/images.go index 1ffed7d655..c62b505bdf 100644 --- a/cmd/climc/shell/images.go +++ b/cmd/climc/shell/images.go @@ -7,6 +7,7 @@ import ( "strings" "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/instances.go b/cmd/climc/shell/instances.go index 2453a7939f..f9cb33c163 100644 --- a/cmd/climc/shell/instances.go +++ b/cmd/climc/shell/instances.go @@ -2,6 +2,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/isolatedevices.go b/cmd/climc/shell/isolatedevices.go index 72515beb51..38951b3e7f 100644 --- a/cmd/climc/shell/isolatedevices.go +++ b/cmd/climc/shell/isolatedevices.go @@ -2,6 +2,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/k8s/k8s.go b/cmd/climc/shell/k8s/k8s.go index 08c6910a76..770717e9aa 100644 --- a/cmd/climc/shell/k8s/k8s.go +++ b/cmd/climc/shell/k8s/k8s.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/cmd/climc/shell" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" diff --git a/cmd/climc/shell/keypairs.go b/cmd/climc/shell/keypairs.go index a45abec9c4..1cb5db48a6 100644 --- a/cmd/climc/shell/keypairs.go +++ b/cmd/climc/shell/keypairs.go @@ -5,6 +5,7 @@ import ( "io/ioutil" "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/keystoneutils.go b/cmd/climc/shell/keystoneutils.go index 0e6910a1a2..1fd771c650 100644 --- a/cmd/climc/shell/keystoneutils.go +++ b/cmd/climc/shell/keystoneutils.go @@ -2,6 +2,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/labels.go b/cmd/climc/shell/labels.go index 169111bd2d..57d4293322 100644 --- a/cmd/climc/shell/labels.go +++ b/cmd/climc/shell/labels.go @@ -2,6 +2,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/loadbalanceracls.go b/cmd/climc/shell/loadbalanceracls.go index c0e36d0704..0f487332cb 100644 --- a/cmd/climc/shell/loadbalanceracls.go +++ b/cmd/climc/shell/loadbalanceracls.go @@ -2,6 +2,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/loadbalancerlistenerrules.go b/cmd/climc/shell/loadbalancerlistenerrules.go index 60d4660bc5..47cc7d3d06 100644 --- a/cmd/climc/shell/loadbalancerlistenerrules.go +++ b/cmd/climc/shell/loadbalancerlistenerrules.go @@ -2,6 +2,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/loadbalancerlisteners.go b/cmd/climc/shell/loadbalancerlisteners.go index d88b28b4fc..afb5d93856 100644 --- a/cmd/climc/shell/loadbalancerlisteners.go +++ b/cmd/climc/shell/loadbalancerlisteners.go @@ -2,6 +2,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/loadbalancernetworks.go b/cmd/climc/shell/loadbalancernetworks.go index c11d3cf821..07084e9f85 100644 --- a/cmd/climc/shell/loadbalancernetworks.go +++ b/cmd/climc/shell/loadbalancernetworks.go @@ -2,6 +2,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/meteralert.go b/cmd/climc/shell/meteralert.go index f7f6e5e2e2..575ee3fd56 100644 --- a/cmd/climc/shell/meteralert.go +++ b/cmd/climc/shell/meteralert.go @@ -2,6 +2,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/metrics.go b/cmd/climc/shell/metrics.go index 8b8b410271..71d4837e32 100644 --- a/cmd/climc/shell/metrics.go +++ b/cmd/climc/shell/metrics.go @@ -2,6 +2,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/monitor_metrics.go b/cmd/climc/shell/monitor_metrics.go index a00de0d70b..a0de5b2284 100644 --- a/cmd/climc/shell/monitor_metrics.go +++ b/cmd/climc/shell/monitor_metrics.go @@ -5,6 +5,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/cmd/climc/shell/monitor_types.go b/cmd/climc/shell/monitor_types.go index 9aa06a8943..48d1318d6e 100644 --- a/cmd/climc/shell/monitor_types.go +++ b/cmd/climc/shell/monitor_types.go @@ -2,6 +2,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/monitorinputs.go b/cmd/climc/shell/monitorinputs.go index 6809637f99..ca32031490 100644 --- a/cmd/climc/shell/monitorinputs.go +++ b/cmd/climc/shell/monitorinputs.go @@ -2,6 +2,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/monitortemplates.go b/cmd/climc/shell/monitortemplates.go index 1256e2abdf..0838551069 100644 --- a/cmd/climc/shell/monitortemplates.go +++ b/cmd/climc/shell/monitortemplates.go @@ -4,6 +4,7 @@ import ( "strings" "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/networks.go b/cmd/climc/shell/networks.go index 5be1049c83..39a7e399dd 100644 --- a/cmd/climc/shell/networks.go +++ b/cmd/climc/shell/networks.go @@ -4,6 +4,7 @@ import ( "fmt" "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/nodes.go b/cmd/climc/shell/nodes.go index 04da28548a..47b88713de 100644 --- a/cmd/climc/shell/nodes.go +++ b/cmd/climc/shell/nodes.go @@ -4,6 +4,7 @@ import ( "strings" "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/notices.go b/cmd/climc/shell/notices.go index ab7f4423fe..9c4cfb9be1 100644 --- a/cmd/climc/shell/notices.go +++ b/cmd/climc/shell/notices.go @@ -2,6 +2,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/operations.go b/cmd/climc/shell/operations.go index b778b52e29..586e8555b6 100644 --- a/cmd/climc/shell/operations.go +++ b/cmd/climc/shell/operations.go @@ -2,6 +2,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/parameters.go b/cmd/climc/shell/parameters.go index 9546aa1826..0d490e711b 100644 --- a/cmd/climc/shell/parameters.go +++ b/cmd/climc/shell/parameters.go @@ -2,6 +2,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/performances.go b/cmd/climc/shell/performances.go index 4f80a09b20..b13e95a316 100644 --- a/cmd/climc/shell/performances.go +++ b/cmd/climc/shell/performances.go @@ -2,6 +2,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/policies.go b/cmd/climc/shell/policies.go index aeda2b0598..e468e7f3c6 100644 --- a/cmd/climc/shell/policies.go +++ b/cmd/climc/shell/policies.go @@ -7,7 +7,9 @@ import ( "os/exec" "strings" "time" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/auth" diff --git a/cmd/climc/shell/price_infos.go b/cmd/climc/shell/price_infos.go index ade96eade9..53750838fe 100644 --- a/cmd/climc/shell/price_infos.go +++ b/cmd/climc/shell/price_infos.go @@ -2,6 +2,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/processes.go b/cmd/climc/shell/processes.go index efa3f9b08b..ad69162500 100644 --- a/cmd/climc/shell/processes.go +++ b/cmd/climc/shell/processes.go @@ -2,6 +2,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/processlogs.go b/cmd/climc/shell/processlogs.go index 29f92cd850..2c435278c5 100644 --- a/cmd/climc/shell/processlogs.go +++ b/cmd/climc/shell/processlogs.go @@ -2,6 +2,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/project_admin.go b/cmd/climc/shell/project_admin.go index 7a7a0c8d25..12b9530594 100644 --- a/cmd/climc/shell/project_admin.go +++ b/cmd/climc/shell/project_admin.go @@ -2,6 +2,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/project_admin_candidates.go b/cmd/climc/shell/project_admin_candidates.go index 2af2cdfed7..588a056c1b 100644 --- a/cmd/climc/shell/project_admin_candidates.go +++ b/cmd/climc/shell/project_admin_candidates.go @@ -2,6 +2,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/project_hosts.go b/cmd/climc/shell/project_hosts.go index e404bacd88..199214a0d1 100644 --- a/cmd/climc/shell/project_hosts.go +++ b/cmd/climc/shell/project_hosts.go @@ -2,6 +2,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/quotas.go b/cmd/climc/shell/quotas.go index e54b4d5d97..ebfb7c539e 100644 --- a/cmd/climc/shell/quotas.go +++ b/cmd/climc/shell/quotas.go @@ -2,6 +2,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/rates.go b/cmd/climc/shell/rates.go index 4ef1b4f787..36cd879318 100644 --- a/cmd/climc/shell/rates.go +++ b/cmd/climc/shell/rates.go @@ -2,6 +2,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/recipient.go b/cmd/climc/shell/recipient.go index b870d0629d..eaef0160df 100644 --- a/cmd/climc/shell/recipient.go +++ b/cmd/climc/shell/recipient.go @@ -2,6 +2,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/regions.go b/cmd/climc/shell/regions.go index aa5768cca0..926a1378b0 100644 --- a/cmd/climc/shell/regions.go +++ b/cmd/climc/shell/regions.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/cmd/climc/shell/res_results.go b/cmd/climc/shell/res_results.go index 11ba29da1a..1fbd9d4c19 100644 --- a/cmd/climc/shell/res_results.go +++ b/cmd/climc/shell/res_results.go @@ -2,6 +2,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/reservedips.go b/cmd/climc/shell/reservedips.go index e0603cca34..4ce6beb3f8 100644 --- a/cmd/climc/shell/reservedips.go +++ b/cmd/climc/shell/reservedips.go @@ -2,6 +2,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/resource_details.go b/cmd/climc/shell/resource_details.go index 83a28a6e59..6735fdd080 100644 --- a/cmd/climc/shell/resource_details.go +++ b/cmd/climc/shell/resource_details.go @@ -2,6 +2,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/resource_fees.go b/cmd/climc/shell/resource_fees.go index f9b5781ae3..1da6a08f02 100644 --- a/cmd/climc/shell/resource_fees.go +++ b/cmd/climc/shell/resource_fees.go @@ -2,6 +2,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/role_assignments.go b/cmd/climc/shell/role_assignments.go index f663a09fd0..72119a002c 100644 --- a/cmd/climc/shell/role_assignments.go +++ b/cmd/climc/shell/role_assignments.go @@ -2,6 +2,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/roles.go b/cmd/climc/shell/roles.go index 56c8d5e297..4ad1870292 100644 --- a/cmd/climc/shell/roles.go +++ b/cmd/climc/shell/roles.go @@ -2,6 +2,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/schedtaghosts.go b/cmd/climc/shell/schedtaghosts.go index 4a3eee5f19..8973621b84 100644 --- a/cmd/climc/shell/schedtaghosts.go +++ b/cmd/climc/shell/schedtaghosts.go @@ -2,6 +2,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/schedtags.go b/cmd/climc/shell/schedtags.go index 86f4178cc7..f4fa28a9e2 100644 --- a/cmd/climc/shell/schedtags.go +++ b/cmd/climc/shell/schedtags.go @@ -2,7 +2,9 @@ package shell import ( "fmt" + "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/schedulers.go b/cmd/climc/shell/schedulers.go index 3da9b11dfd..7438e3a30c 100644 --- a/cmd/climc/shell/schedulers.go +++ b/cmd/climc/shell/schedulers.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/cmd/climc/shell/secgrouprules.go b/cmd/climc/shell/secgrouprules.go index 2992a709ce..e3581c9d0c 100644 --- a/cmd/climc/shell/secgrouprules.go +++ b/cmd/climc/shell/secgrouprules.go @@ -2,6 +2,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/secgroups.go b/cmd/climc/shell/secgroups.go index 2b9cab1036..565ac3bcdd 100644 --- a/cmd/climc/shell/secgroups.go +++ b/cmd/climc/shell/secgroups.go @@ -4,6 +4,7 @@ import ( "fmt" "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/serverdisks.go b/cmd/climc/shell/serverdisks.go index f0e350ae15..bd8eaf9247 100644 --- a/cmd/climc/shell/serverdisks.go +++ b/cmd/climc/shell/serverdisks.go @@ -2,7 +2,9 @@ package shell import ( "fmt" + "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/serverisolatedevices.go b/cmd/climc/shell/serverisolatedevices.go index 995456df90..9815e10325 100644 --- a/cmd/climc/shell/serverisolatedevices.go +++ b/cmd/climc/shell/serverisolatedevices.go @@ -2,6 +2,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/service_hosts.go b/cmd/climc/shell/service_hosts.go index 77c134fba1..422b9a12cd 100644 --- a/cmd/climc/shell/service_hosts.go +++ b/cmd/climc/shell/service_hosts.go @@ -2,6 +2,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/service_name_suggestions.go b/cmd/climc/shell/service_name_suggestions.go index fd01ef652e..5ddadb72a1 100644 --- a/cmd/climc/shell/service_name_suggestions.go +++ b/cmd/climc/shell/service_name_suggestions.go @@ -2,6 +2,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/services.go b/cmd/climc/shell/services.go index 88045fdcee..ad22e0ae5c 100644 --- a/cmd/climc/shell/services.go +++ b/cmd/climc/shell/services.go @@ -2,6 +2,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/servicetrees.go b/cmd/climc/shell/servicetrees.go index aeda96d62a..37c4cca8dd 100644 --- a/cmd/climc/shell/servicetrees.go +++ b/cmd/climc/shell/servicetrees.go @@ -2,6 +2,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/sms_configs.go b/cmd/climc/shell/sms_configs.go index 52c722f67f..bdc04755c7 100644 --- a/cmd/climc/shell/sms_configs.go +++ b/cmd/climc/shell/sms_configs.go @@ -2,6 +2,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/snapshots.go b/cmd/climc/shell/snapshots.go index a638fd7b30..8438410b30 100644 --- a/cmd/climc/shell/snapshots.go +++ b/cmd/climc/shell/snapshots.go @@ -2,6 +2,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/specs.go b/cmd/climc/shell/specs.go index 011ba7bee7..b620f0ebec 100644 --- a/cmd/climc/shell/specs.go +++ b/cmd/climc/shell/specs.go @@ -4,6 +4,7 @@ import ( "fmt" "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/sshkeypairs.go b/cmd/climc/shell/sshkeypairs.go index d68aa940b5..b32847ac07 100644 --- a/cmd/climc/shell/sshkeypairs.go +++ b/cmd/climc/shell/sshkeypairs.go @@ -2,7 +2,9 @@ package shell import ( "fmt" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/cmd/climc/shell/storagecachedimages.go b/cmd/climc/shell/storagecachedimages.go index 0b0095a088..8e1341ca4f 100644 --- a/cmd/climc/shell/storagecachedimages.go +++ b/cmd/climc/shell/storagecachedimages.go @@ -2,6 +2,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/storagecaches.go b/cmd/climc/shell/storagecaches.go index 5fe2384b60..6ac826d0f5 100644 --- a/cmd/climc/shell/storagecaches.go +++ b/cmd/climc/shell/storagecaches.go @@ -2,6 +2,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/storages.go b/cmd/climc/shell/storages.go index eca4541f00..186b56bb5a 100644 --- a/cmd/climc/shell/storages.go +++ b/cmd/climc/shell/storages.go @@ -4,6 +4,7 @@ import ( "fmt" "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/tasks.go b/cmd/climc/shell/tasks.go index 9d62fcbebe..e62e5994c1 100644 --- a/cmd/climc/shell/tasks.go +++ b/cmd/climc/shell/tasks.go @@ -2,6 +2,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/treenodes.go b/cmd/climc/shell/treenodes.go index 98b8ee89f4..4f7d1ea609 100644 --- a/cmd/climc/shell/treenodes.go +++ b/cmd/climc/shell/treenodes.go @@ -5,6 +5,7 @@ import ( "strconv" "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/underutilizedinstances.go b/cmd/climc/shell/underutilizedinstances.go index 84fd17ed08..749f09708b 100644 --- a/cmd/climc/shell/underutilizedinstances.go +++ b/cmd/climc/shell/underutilizedinstances.go @@ -2,6 +2,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/unused_resources.go b/cmd/climc/shell/unused_resources.go index 3743e0fb89..bc06d487ad 100644 --- a/cmd/climc/shell/unused_resources.go +++ b/cmd/climc/shell/unused_resources.go @@ -2,6 +2,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/updates.go b/cmd/climc/shell/updates.go index 7e4879dac0..cdc23a9381 100644 --- a/cmd/climc/shell/updates.go +++ b/cmd/climc/shell/updates.go @@ -2,6 +2,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/usages.go b/cmd/climc/shell/usages.go index 37d3942433..ab1673b0cc 100644 --- a/cmd/climc/shell/usages.go +++ b/cmd/climc/shell/usages.go @@ -2,6 +2,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/users.go b/cmd/climc/shell/users.go index e5154134af..5f47f81135 100644 --- a/cmd/climc/shell/users.go +++ b/cmd/climc/shell/users.go @@ -2,6 +2,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/utils.go b/cmd/climc/shell/utils.go index 67061edbe6..34df49228f 100644 --- a/cmd/climc/shell/utils.go +++ b/cmd/climc/shell/utils.go @@ -4,6 +4,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/util/excelutils" "yunion.io/x/onecloud/pkg/util/printutils" diff --git a/cmd/climc/shell/vcenters.go b/cmd/climc/shell/vcenters.go index 4b33f4e265..e7ca4e54d8 100644 --- a/cmd/climc/shell/vcenters.go +++ b/cmd/climc/shell/vcenters.go @@ -2,6 +2,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/verification.go b/cmd/climc/shell/verification.go index e0ff6c9601..cbc18ecba2 100644 --- a/cmd/climc/shell/verification.go +++ b/cmd/climc/shell/verification.go @@ -2,6 +2,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/vncproxy.go b/cmd/climc/shell/vncproxy.go index d3b0cd635c..6247a5916b 100644 --- a/cmd/climc/shell/vncproxy.go +++ b/cmd/climc/shell/vncproxy.go @@ -2,6 +2,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/vpcs.go b/cmd/climc/shell/vpcs.go index 509770b378..a0bff18049 100644 --- a/cmd/climc/shell/vpcs.go +++ b/cmd/climc/shell/vpcs.go @@ -2,6 +2,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/websockets.go b/cmd/climc/shell/websockets.go index 57ed591a8c..a40bc79b2e 100644 --- a/cmd/climc/shell/websockets.go +++ b/cmd/climc/shell/websockets.go @@ -2,6 +2,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/wires.go b/cmd/climc/shell/wires.go index 8018a61957..0f226d3901 100644 --- a/cmd/climc/shell/wires.go +++ b/cmd/climc/shell/wires.go @@ -2,6 +2,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/zones.go b/cmd/climc/shell/zones.go index 42c984b709..10ba24cd22 100644 --- a/cmd/climc/shell/zones.go +++ b/cmd/climc/shell/zones.go @@ -2,6 +2,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/esxicli/main.go b/cmd/esxicli/main.go index a1be1866cd..3b217ed700 100644 --- a/cmd/esxicli/main.go +++ b/cmd/esxicli/main.go @@ -8,9 +8,8 @@ import ( "yunion.io/x/structarg" "yunion.io/x/onecloud/pkg/util/esxi" - "yunion.io/x/onecloud/pkg/util/shellutils" - _ "yunion.io/x/onecloud/pkg/util/esxi/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/huaweicli/main.go b/cmd/huaweicli/main.go index b23535f7bc..8d3863443b 100644 --- a/cmd/huaweicli/main.go +++ b/cmd/huaweicli/main.go @@ -5,11 +5,11 @@ import ( "os" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/huawei" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/util/huawei" _ "yunion.io/x/onecloud/pkg/util/huawei/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/ipmicli/main.go b/cmd/ipmicli/main.go index 84dbe1701f..42594f1669 100644 --- a/cmd/ipmicli/main.go +++ b/cmd/ipmicli/main.go @@ -8,10 +8,9 @@ import ( "yunion.io/x/structarg" "yunion.io/x/onecloud/pkg/baremetal/utils/ipmitool" + _ "yunion.io/x/onecloud/pkg/util/ipmitool/shell" "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/onecloud/pkg/util/ssh" - - _ "yunion.io/x/onecloud/pkg/util/ipmitool/shell" ) type BaseOptions struct { diff --git a/cmd/lbagent/main.go b/cmd/lbagent/main.go index 64065d2c44..f2842002e2 100644 --- a/cmd/lbagent/main.go +++ b/cmd/lbagent/main.go @@ -8,6 +8,7 @@ import ( "syscall" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/lbagent" ) diff --git a/cmd/openstackcli/main.go b/cmd/openstackcli/main.go index f84a58a666..97cfb5e1e1 100644 --- a/cmd/openstackcli/main.go +++ b/cmd/openstackcli/main.go @@ -5,11 +5,11 @@ import ( "os" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/openstack" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/util/openstack" _ "yunion.io/x/onecloud/pkg/util/openstack/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/qcloudcli/main.go b/cmd/qcloudcli/main.go index 6764f03e00..77f9e7bf5e 100644 --- a/cmd/qcloudcli/main.go +++ b/cmd/qcloudcli/main.go @@ -5,11 +5,11 @@ import ( "os" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/qcloud" - "yunion.io/x/onecloud/pkg/util/shellutils" "yunion.io/x/structarg" + "yunion.io/x/onecloud/pkg/util/qcloud" _ "yunion.io/x/onecloud/pkg/util/qcloud/shell" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type BaseOptions struct { diff --git a/cmd/region-dns/main.go b/cmd/region-dns/main.go index d194ba5bc2..d3f8ac37b8 100644 --- a/cmd/region-dns/main.go +++ b/cmd/region-dns/main.go @@ -1,6 +1,8 @@ package main import ( + "github.com/coredns/coredns/core/dnsserver" + "github.com/coredns/coredns/coremain" _ "github.com/coredns/coredns/plugin/cache" _ "github.com/coredns/coredns/plugin/chaos" _ "github.com/coredns/coredns/plugin/debug" @@ -17,9 +19,6 @@ import ( _ "github.com/coredns/coredns/plugin/trace" _ "github.com/mholt/caddy/startupshutdown" - "github.com/coredns/coredns/core/dnsserver" - "github.com/coredns/coredns/coremain" - _ "yunion.io/x/onecloud/pkg/dns" ) diff --git a/cmd/scheduler/app/server.go b/cmd/scheduler/app/server.go index e9edb3d6c6..3eaf29de64 100644 --- a/cmd/scheduler/app/server.go +++ b/cmd/scheduler/app/server.go @@ -8,7 +8,8 @@ import ( "net/http" "strconv" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" + "yunion.io/x/log" "yunion.io/x/pkg/util/prometheus" "yunion.io/x/pkg/utils" diff --git a/cmd/scheduler/main.go b/cmd/scheduler/main.go index ee1de25f74..383a6d328b 100644 --- a/cmd/scheduler/main.go +++ b/cmd/scheduler/main.go @@ -4,6 +4,7 @@ import ( "os" "yunion.io/x/log" + "yunion.io/x/onecloud/cmd/scheduler/app" ) diff --git a/cmd/scheduler/options/options.go b/cmd/scheduler/options/options.go index 6c243fc291..4576913468 100644 --- a/cmd/scheduler/options/options.go +++ b/cmd/scheduler/options/options.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/log" "yunion.io/x/pkg/util/version" diff --git a/pkg/appsrv/dispatcher/handlers.go b/pkg/appsrv/dispatcher/handlers.go index 0e7b9159a5..13e80708f1 100644 --- a/pkg/appsrv/dispatcher/handlers.go +++ b/pkg/appsrv/dispatcher/handlers.go @@ -2,9 +2,10 @@ package dispatcher import ( "context" - "net/http" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/mcclient/modules" ) diff --git a/pkg/appsrv/dispatcher/jointdispatcher.go b/pkg/appsrv/dispatcher/jointdispatcher.go index e3e4462706..2e6ab152b2 100644 --- a/pkg/appsrv/dispatcher/jointdispatcher.go +++ b/pkg/appsrv/dispatcher/jointdispatcher.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/appsrv/test/testapp.go b/pkg/appsrv/test/testapp.go index 540e43db87..370c889172 100644 --- a/pkg/appsrv/test/testapp.go +++ b/pkg/appsrv/test/testapp.go @@ -6,6 +6,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" ) diff --git a/pkg/baremetal/pxe/dhcp.go b/pkg/baremetal/pxe/dhcp.go index 1203fd501a..847d1e0a59 100644 --- a/pkg/baremetal/pxe/dhcp.go +++ b/pkg/baremetal/pxe/dhcp.go @@ -8,6 +8,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + o "yunion.io/x/onecloud/pkg/baremetal/options" "yunion.io/x/onecloud/pkg/cloudcommon/types" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/baremetal/utils/disktool/disktool_test.go b/pkg/baremetal/utils/disktool/disktool_test.go index 3d7a2fcc76..f3252d575d 100644 --- a/pkg/baremetal/utils/disktool/disktool_test.go +++ b/pkg/baremetal/utils/disktool/disktool_test.go @@ -4,10 +4,10 @@ import ( "testing" "yunion.io/x/log" + "yunion.io/x/pkg/util/stringutils" "yunion.io/x/onecloud/pkg/compute/baremetal" "yunion.io/x/onecloud/pkg/util/ssh" - "yunion.io/x/pkg/util/stringutils" ) var ( diff --git a/pkg/baremetal/utils/raid/drivers/drivers.go b/pkg/baremetal/utils/raid/drivers/drivers.go index d46d8941ee..ab7518dbcd 100644 --- a/pkg/baremetal/utils/raid/drivers/drivers.go +++ b/pkg/baremetal/utils/raid/drivers/drivers.go @@ -3,12 +3,11 @@ package drivers import ( "fmt" + "yunion.io/x/onecloud/pkg/baremetal/utils/raid" _ "yunion.io/x/onecloud/pkg/baremetal/utils/raid/hpssactl" _ "yunion.io/x/onecloud/pkg/baremetal/utils/raid/megactl" _ "yunion.io/x/onecloud/pkg/baremetal/utils/raid/mvcli" _ "yunion.io/x/onecloud/pkg/baremetal/utils/raid/sas2iru" - - "yunion.io/x/onecloud/pkg/baremetal/utils/raid" "yunion.io/x/onecloud/pkg/compute/baremetal" "yunion.io/x/onecloud/pkg/util/ssh" ) diff --git a/pkg/cloudcommon/cronman/cronman.go b/pkg/cloudcommon/cronman/cronman.go index f9fa6cc936..b67649e939 100644 --- a/pkg/cloudcommon/cronman/cronman.go +++ b/pkg/cloudcommon/cronman/cronman.go @@ -7,6 +7,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/cloudcommon/db/adminsharablevirtual.go b/pkg/cloudcommon/db/adminsharablevirtual.go index 13bd2ed27c..5d15005c8e 100644 --- a/pkg/cloudcommon/db/adminsharablevirtual.go +++ b/pkg/cloudcommon/db/adminsharablevirtual.go @@ -4,9 +4,10 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/utils" ) type SAdminSharableVirtualResourceBase struct { diff --git a/pkg/cloudcommon/db/db_joint_dispatcher.go b/pkg/cloudcommon/db/db_joint_dispatcher.go index 80a524b2fb..228efdc639 100644 --- a/pkg/cloudcommon/db/db_joint_dispatcher.go +++ b/pkg/cloudcommon/db/db_joint_dispatcher.go @@ -7,13 +7,13 @@ 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/mcclient/modules" "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/modules" ) type DBJointModelDispatcher struct { diff --git a/pkg/cloudcommon/db/interface.go b/pkg/cloudcommon/db/interface.go index 57f4cf7959..0a81400637 100644 --- a/pkg/cloudcommon/db/interface.go +++ b/pkg/cloudcommon/db/interface.go @@ -5,11 +5,11 @@ import ( "net/http" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/sqlchemy" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/mcclient" ) type IModelManager interface { diff --git a/pkg/cloudcommon/db/jointbase.go b/pkg/cloudcommon/db/jointbase.go index e380befff5..f93a00ff73 100644 --- a/pkg/cloudcommon/db/jointbase.go +++ b/pkg/cloudcommon/db/jointbase.go @@ -7,9 +7,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/reflectutils" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/mcclient" ) type SJointResourceBase struct { diff --git a/pkg/cloudcommon/db/lockman/example/main.go b/pkg/cloudcommon/db/lockman/example/main.go index f19777f17b..5cd78c0cdc 100644 --- a/pkg/cloudcommon/db/lockman/example/main.go +++ b/pkg/cloudcommon/db/lockman/example/main.go @@ -2,13 +2,13 @@ package main import ( "context" + "math/rand" "sync" "time" "yunion.io/x/log" "yunion.io/x/pkg/util/stringutils" - "math/rand" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) diff --git a/pkg/cloudcommon/db/lockman/fifo.go b/pkg/cloudcommon/db/lockman/fifo.go index ee39ef2200..cbace2ca31 100644 --- a/pkg/cloudcommon/db/lockman/fifo.go +++ b/pkg/cloudcommon/db/lockman/fifo.go @@ -2,6 +2,7 @@ package lockman import ( "container/list" + "yunion.io/x/log" ) diff --git a/pkg/cloudcommon/db/lockman/inmemory.go b/pkg/cloudcommon/db/lockman/inmemory.go index e9b7b66b6f..32a0ad3235 100644 --- a/pkg/cloudcommon/db/lockman/inmemory.go +++ b/pkg/cloudcommon/db/lockman/inmemory.go @@ -2,9 +2,9 @@ package lockman import ( "context" + "runtime/debug" "sync" - "runtime/debug" "yunion.io/x/log" ) diff --git a/pkg/cloudcommon/db/metadata.go b/pkg/cloudcommon/db/metadata.go index b6ac604efe..69fe984f30 100644 --- a/pkg/cloudcommon/db/metadata.go +++ b/pkg/cloudcommon/db/metadata.go @@ -8,10 +8,10 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/stringutils" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/cloudcommon/db/namevalidator.go b/pkg/cloudcommon/db/namevalidator.go index ca4fa056e4..d72ca405f3 100644 --- a/pkg/cloudcommon/db/namevalidator.go +++ b/pkg/cloudcommon/db/namevalidator.go @@ -3,9 +3,10 @@ package db import ( "fmt" + "yunion.io/x/pkg/util/stringutils" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/pkg/util/stringutils" ) func isNameUnique(manager IModelManager, owner string, name string) bool { diff --git a/pkg/cloudcommon/db/resourcebase.go b/pkg/cloudcommon/db/resourcebase.go index 810dc6d221..ef055459d9 100644 --- a/pkg/cloudcommon/db/resourcebase.go +++ b/pkg/cloudcommon/db/resourcebase.go @@ -4,9 +4,10 @@ import ( "context" "time" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/timeutils" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/mcclient" ) type SResourceBase struct { diff --git a/pkg/cloudcommon/db/sharablevirtual.go b/pkg/cloudcommon/db/sharablevirtual.go index c19791b3ba..3f36bcbefd 100644 --- a/pkg/cloudcommon/db/sharablevirtual.go +++ b/pkg/cloudcommon/db/sharablevirtual.go @@ -4,8 +4,9 @@ import ( "context" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/mcclient" ) type SSharableVirtualResourceBase struct { diff --git a/pkg/cloudcommon/db/standalone.go b/pkg/cloudcommon/db/standalone.go index dc13c87673..a57e84d9cc 100644 --- a/pkg/cloudcommon/db/standalone.go +++ b/pkg/cloudcommon/db/standalone.go @@ -6,12 +6,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/regutils" "yunion.io/x/pkg/util/stringutils" "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" ) type SStandaloneResourceBase struct { diff --git a/pkg/cloudcommon/db/statusstandalone.go b/pkg/cloudcommon/db/statusstandalone.go index 751abe7d9c..f96f67e7ec 100644 --- a/pkg/cloudcommon/db/statusstandalone.go +++ b/pkg/cloudcommon/db/statusstandalone.go @@ -3,6 +3,7 @@ package db import ( "context" "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/pkg/utils" diff --git a/pkg/cloudcommon/db/taskman/interface.go b/pkg/cloudcommon/db/taskman/interface.go index 5c4d82c3d1..b306503614 100644 --- a/pkg/cloudcommon/db/taskman/interface.go +++ b/pkg/cloudcommon/db/taskman/interface.go @@ -5,6 +5,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/cloudcommon/db/taskman/localtaskworker.go b/pkg/cloudcommon/db/taskman/localtaskworker.go index edd78634b8..a260fef566 100644 --- a/pkg/cloudcommon/db/taskman/localtaskworker.go +++ b/pkg/cloudcommon/db/taskman/localtaskworker.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" ) diff --git a/pkg/cloudcommon/db/tenantcache.go b/pkg/cloudcommon/db/tenantcache.go index ee42bc40fc..8eabde53b1 100644 --- a/pkg/cloudcommon/db/tenantcache.go +++ b/pkg/cloudcommon/db/tenantcache.go @@ -8,11 +8,9 @@ import ( "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" - "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/httputils" ) diff --git a/pkg/cloudcommon/etcd/etcd.go b/pkg/cloudcommon/etcd/etcd.go index 17d0493957..63fc262ab6 100644 --- a/pkg/cloudcommon/etcd/etcd.go +++ b/pkg/cloudcommon/etcd/etcd.go @@ -2,13 +2,15 @@ package etcd import ( "context" + "crypto/tls" "errors" + "fmt" "time" - "crypto/tls" - "fmt" "go.etcd.io/etcd/clientv3" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/seclib2" ) diff --git a/pkg/cloudcommon/etcd/models/base/basemanager.go b/pkg/cloudcommon/etcd/models/base/basemanager.go index 1e4fba587d..72a70e6c27 100644 --- a/pkg/cloudcommon/etcd/models/base/basemanager.go +++ b/pkg/cloudcommon/etcd/models/base/basemanager.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "net/http" "reflect" "strings" @@ -11,7 +12,6 @@ import ( "yunion.io/x/log" "yunion.io/x/pkg/util/stringutils" - "net/http" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/cloudcommon/etcd" ) diff --git a/pkg/cloudcommon/etcd/models/serviceregistries.go b/pkg/cloudcommon/etcd/models/serviceregistries.go index a4e4adf658..1624dc2eb5 100644 --- a/pkg/cloudcommon/etcd/models/serviceregistries.go +++ b/pkg/cloudcommon/etcd/models/serviceregistries.go @@ -6,6 +6,7 @@ import ( "strconv" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/etcd/models/base" ) diff --git a/pkg/cloudcommon/etcd/test/etcdtest.go b/pkg/cloudcommon/etcd/test/etcdtest.go index 39f0574354..ccb41507b5 100644 --- a/pkg/cloudcommon/etcd/test/etcdtest.go +++ b/pkg/cloudcommon/etcd/test/etcdtest.go @@ -3,7 +3,9 @@ package main import ( "context" "time" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/etcd" ) diff --git a/pkg/cloudcommon/policy/global.go b/pkg/cloudcommon/policy/global.go index dda18cfa39..9ab1d7bd3d 100644 --- a/pkg/cloudcommon/policy/global.go +++ b/pkg/cloudcommon/policy/global.go @@ -2,6 +2,7 @@ package policy import ( "time" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" ) diff --git a/pkg/cloudir/service/service.go b/pkg/cloudir/service/service.go index ff07cc1334..97ac69d5cf 100644 --- a/pkg/cloudir/service/service.go +++ b/pkg/cloudir/service/service.go @@ -2,6 +2,7 @@ package service import ( "os" + "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon" diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index 1e3465e31c..b37d27b638 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -2,12 +2,12 @@ package cloudprovider import ( "context" - "fmt" - "errors" + "fmt" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/cloudprovider/instance.go b/pkg/cloudprovider/instance.go index ea83502983..1efbf65435 100644 --- a/pkg/cloudprovider/instance.go +++ b/pkg/cloudprovider/instance.go @@ -2,6 +2,7 @@ package cloudprovider import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/ansible" "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/cloudinit" diff --git a/pkg/cloutpost/service/service.go b/pkg/cloutpost/service/service.go index d684ebf817..e2162cff0d 100644 --- a/pkg/cloutpost/service/service.go +++ b/pkg/cloutpost/service/service.go @@ -2,6 +2,7 @@ package service import ( "os" + "yunion.io/x/log" "yunion.io/x/onecloud/pkg/cloudcommon" diff --git a/pkg/compute/hostdrivers/huawei.go b/pkg/compute/hostdrivers/huawei.go index 0a9e69075a..7cf37bcd5d 100644 --- a/pkg/compute/hostdrivers/huawei.go +++ b/pkg/compute/hostdrivers/huawei.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" ) diff --git a/pkg/compute/hostdrivers/openstack.go b/pkg/compute/hostdrivers/openstack.go index 22972cf356..a8f89ec7bb 100644 --- a/pkg/compute/hostdrivers/openstack.go +++ b/pkg/compute/hostdrivers/openstack.go @@ -2,6 +2,7 @@ package hostdrivers import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" ) diff --git a/pkg/compute/hostdrivers/qcloud.go b/pkg/compute/hostdrivers/qcloud.go index 455359e6cf..71f8cbb108 100644 --- a/pkg/compute/hostdrivers/qcloud.go +++ b/pkg/compute/hostdrivers/qcloud.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/compute/models/baremetalagents.go b/pkg/compute/models/baremetalagents.go index 6ed07413b7..f2c7bb36ac 100644 --- a/pkg/compute/models/baremetalagents.go +++ b/pkg/compute/models/baremetalagents.go @@ -2,15 +2,16 @@ package models import ( "context" + "database/sql" "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/util/regutils" - "yunion.io/x/log" - "database/sql" ) const ( @@ -199,4 +200,4 @@ func (manager *SBaremetalagentManager) GetAgent(agentType TAgentType, zoneId str } } return &agents[0] -} \ No newline at end of file +} diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 79aebb863e..fc53e80a7b 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -8,14 +8,14 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/mcclient" "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/cloudprovider" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/compute/models/dynamicschedtags.go b/pkg/compute/models/dynamicschedtags.go index d337916ca2..92922ff48b 100644 --- a/pkg/compute/models/dynamicschedtags.go +++ b/pkg/compute/models/dynamicschedtags.go @@ -2,12 +2,11 @@ package models 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/httperrors" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/compute/models/groupguests.go b/pkg/compute/models/groupguests.go index 1160d81613..daae8f4878 100644 --- a/pkg/compute/models/groupguests.go +++ b/pkg/compute/models/groupguests.go @@ -4,9 +4,9 @@ import ( "context" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SGroupguestManager struct { diff --git a/pkg/compute/models/groupnetworks.go b/pkg/compute/models/groupnetworks.go index ff496a7390..cce0d89551 100644 --- a/pkg/compute/models/groupnetworks.go +++ b/pkg/compute/models/groupnetworks.go @@ -5,9 +5,9 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SGroupnetworkManager struct { diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index a2df08d235..98bf93451d 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -12,7 +12,6 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/pkg/tristate" "yunion.io/x/pkg/util/fileutils" "yunion.io/x/pkg/util/regutils" @@ -29,6 +28,7 @@ import ( "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules/notify" + "yunion.io/x/onecloud/pkg/util/billing" "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/onecloud/pkg/util/logclient" "yunion.io/x/onecloud/pkg/util/seclib2" diff --git a/pkg/compute/models/guestdrivers.go b/pkg/compute/models/guestdrivers.go index fb805804ca..9bb4f822c6 100644 --- a/pkg/compute/models/guestdrivers.go +++ b/pkg/compute/models/guestdrivers.go @@ -2,11 +2,11 @@ package models import ( "context" - "time" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/compute/models/guestsecgroups.go b/pkg/compute/models/guestsecgroups.go index 2c59c62132..954870d5d9 100644 --- a/pkg/compute/models/guestsecgroups.go +++ b/pkg/compute/models/guestsecgroups.go @@ -5,6 +5,7 @@ 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/mcclient" diff --git a/pkg/compute/models/hostjoints.go b/pkg/compute/models/hostjoints.go index ccc1aaabab..ba14d5420a 100644 --- a/pkg/compute/models/hostjoints.go +++ b/pkg/compute/models/hostjoints.go @@ -4,9 +4,9 @@ import ( "context" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SHostJointsManager struct { diff --git a/pkg/compute/models/hostschedtags.go b/pkg/compute/models/hostschedtags.go index c909a6efdb..71c80e69fc 100644 --- a/pkg/compute/models/hostschedtags.go +++ b/pkg/compute/models/hostschedtags.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/models/hostwires.go b/pkg/compute/models/hostwires.go index 944cc0961b..083f6bf59f 100644 --- a/pkg/compute/models/hostwires.go +++ b/pkg/compute/models/hostwires.go @@ -4,10 +4,11 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/sqlchemy" ) type SHostwireManager struct { diff --git a/pkg/compute/models/initdb.go b/pkg/compute/models/initdb.go index 693031881c..498d9336df 100644 --- a/pkg/compute/models/initdb.go +++ b/pkg/compute/models/initdb.go @@ -2,6 +2,7 @@ package models import ( "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 806593000d..e394f12636 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -8,12 +8,13 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudcommon/db" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/util/regutils" "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" + + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/compute/models/keypairs.go b/pkg/compute/models/keypairs.go index cb5c0de1aa..3d82e617fe 100644 --- a/pkg/compute/models/keypairs.go +++ b/pkg/compute/models/keypairs.go @@ -3,16 +3,17 @@ package models import ( "context" + "golang.org/x/crypto/ssh" + "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" "yunion.io/x/sqlchemy" - "golang.org/x/crypto/ssh" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/seclib2" - "yunion.io/x/pkg/utils" ) type SKeypairManager struct { diff --git a/pkg/compute/models/managedresource.go b/pkg/compute/models/managedresource.go index 2a2e31b217..b71d2ef4fb 100644 --- a/pkg/compute/models/managedresource.go +++ b/pkg/compute/models/managedresource.go @@ -1,13 +1,13 @@ package models import ( + "database/sql" "fmt" "strings" "yunion.io/x/jsonutils" "yunion.io/x/sqlchemy" - "database/sql" "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/models/netinterfaces.go b/pkg/compute/models/netinterfaces.go index fdbd53cbaa..ca8e7ea684 100644 --- a/pkg/compute/models/netinterfaces.go +++ b/pkg/compute/models/netinterfaces.go @@ -6,9 +6,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/util/regutils" ) type SNetInterface struct { diff --git a/pkg/compute/models/quotas.go b/pkg/compute/models/quotas.go index 2c8ccdbc06..b4bd5bd7dc 100644 --- a/pkg/compute/models/quotas.go +++ b/pkg/compute/models/quotas.go @@ -6,9 +6,10 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/tristate" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" "yunion.io/x/onecloud/pkg/compute/options" - "yunion.io/x/pkg/tristate" ) var QuotaManager *quotas.SQuotaManager diff --git a/pkg/compute/models/regiondrivers.go b/pkg/compute/models/regiondrivers.go index 63d45408d4..84bd44241c 100644 --- a/pkg/compute/models/regiondrivers.go +++ b/pkg/compute/models/regiondrivers.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/models/reservedips.go b/pkg/compute/models/reservedips.go index 67da0dc345..a6e7d620df 100644 --- a/pkg/compute/models/reservedips.go +++ b/pkg/compute/models/reservedips.go @@ -5,10 +5,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/sqlchemy" ) type SReservedipManager struct { diff --git a/pkg/compute/models/storagedrivers.go b/pkg/compute/models/storagedrivers.go index 370036b4bd..35bf541691 100644 --- a/pkg/compute/models/storagedrivers.go +++ b/pkg/compute/models/storagedrivers.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/regiondrivers/qcloud.go b/pkg/compute/regiondrivers/qcloud.go index c4617cf423..1caade6f7e 100644 --- a/pkg/compute/regiondrivers/qcloud.go +++ b/pkg/compute/regiondrivers/qcloud.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/service/service.go b/pkg/compute/service/service.go index 67cc96a8b3..1b4611551c 100644 --- a/pkg/compute/service/service.go +++ b/pkg/compute/service/service.go @@ -8,9 +8,15 @@ import ( "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon" + "yunion.io/x/onecloud/pkg/cloudcommon/cronman" + "yunion.io/x/onecloud/pkg/cloudcommon/db" _ "yunion.io/x/onecloud/pkg/compute/guestdrivers" _ "yunion.io/x/onecloud/pkg/compute/hostdrivers" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/options" _ "yunion.io/x/onecloud/pkg/compute/regiondrivers" + "yunion.io/x/onecloud/pkg/compute/skus" _ "yunion.io/x/onecloud/pkg/compute/storagedrivers" _ "yunion.io/x/onecloud/pkg/compute/tasks" _ "yunion.io/x/onecloud/pkg/util/aliyun/provider" @@ -20,13 +26,6 @@ import ( _ "yunion.io/x/onecloud/pkg/util/huawei/provider" _ "yunion.io/x/onecloud/pkg/util/openstack/provider" _ "yunion.io/x/onecloud/pkg/util/qcloud/provider" - - "yunion.io/x/onecloud/pkg/cloudcommon" - "yunion.io/x/onecloud/pkg/cloudcommon/cronman" - "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/compute/skus" ) func StartService() { diff --git a/pkg/compute/sshkeys/handler.go b/pkg/compute/sshkeys/handler.go index 85f8777933..cc14fd68d7 100644 --- a/pkg/compute/sshkeys/handler.go +++ b/pkg/compute/sshkeys/handler.go @@ -7,6 +7,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/cloudcommon/consts" diff --git a/pkg/compute/storagedrivers/base.go b/pkg/compute/storagedrivers/base.go index aa519a0df2..e093297b98 100644 --- a/pkg/compute/storagedrivers/base.go +++ b/pkg/compute/storagedrivers/base.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/storagedrivers/local.go b/pkg/compute/storagedrivers/local.go index 2e443bbac9..cb59630d0d 100644 --- a/pkg/compute/storagedrivers/local.go +++ b/pkg/compute/storagedrivers/local.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/compute/storagedrivers/nfs.go b/pkg/compute/storagedrivers/nfs.go index ee6b61debf..b4a933a0b1 100644 --- a/pkg/compute/storagedrivers/nfs.go +++ b/pkg/compute/storagedrivers/nfs.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/compute/options" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/compute/storagedrivers/rbd.go b/pkg/compute/storagedrivers/rbd.go index be7fdbc711..7d63261066 100644 --- a/pkg/compute/storagedrivers/rbd.go +++ b/pkg/compute/storagedrivers/rbd.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/compute/tasks/baremetal_delete_task.go b/pkg/compute/tasks/baremetal_delete_task.go index cdbb887fbd..2b9cf3e888 100644 --- a/pkg/compute/tasks/baremetal_delete_task.go +++ b/pkg/compute/tasks/baremetal_delete_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_maintenance_task.go b/pkg/compute/tasks/baremetal_maintenance_task.go index 3e990d19d3..2fca8b50dc 100644 --- a/pkg/compute/tasks/baremetal_maintenance_task.go +++ b/pkg/compute/tasks/baremetal_maintenance_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_prepare_task.go b/pkg/compute/tasks/baremetal_prepare_task.go index 79cd189345..dd39aa3a58 100644 --- a/pkg/compute/tasks/baremetal_prepare_task.go +++ b/pkg/compute/tasks/baremetal_prepare_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_server_rebuild_root_task.go b/pkg/compute/tasks/baremetal_server_rebuild_root_task.go index fe78fcec7a..2c6b992c97 100644 --- a/pkg/compute/tasks/baremetal_server_rebuild_root_task.go +++ b/pkg/compute/tasks/baremetal_server_rebuild_root_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_server_reset_task.go b/pkg/compute/tasks/baremetal_server_reset_task.go index af3f90945a..d317fcb4a9 100644 --- a/pkg/compute/tasks/baremetal_server_reset_task.go +++ b/pkg/compute/tasks/baremetal_server_reset_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/compute/tasks/baremetal_server_start_task.go b/pkg/compute/tasks/baremetal_server_start_task.go index a9bba2c15a..80f510a4d5 100644 --- a/pkg/compute/tasks/baremetal_server_start_task.go +++ b/pkg/compute/tasks/baremetal_server_start_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_server_stop_task.go b/pkg/compute/tasks/baremetal_server_stop_task.go index a963c147e1..d31e46553b 100644 --- a/pkg/compute/tasks/baremetal_server_stop_task.go +++ b/pkg/compute/tasks/baremetal_server_stop_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_server_sync_status_task.go b/pkg/compute/tasks/baremetal_server_sync_status_task.go index 4c5c89d6fd..4dde3d8782 100644 --- a/pkg/compute/tasks/baremetal_server_sync_status_task.go +++ b/pkg/compute/tasks/baremetal_server_sync_status_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_sync_status_task.go b/pkg/compute/tasks/baremetal_sync_status_task.go index eba6ea3378..503e930eea 100644 --- a/pkg/compute/tasks/baremetal_sync_status_task.go +++ b/pkg/compute/tasks/baremetal_sync_status_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go b/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go index c2edb2615b..f05e9dd2a1 100644 --- a/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go +++ b/pkg/compute/tasks/baremetal_unconvert_hypervisor_task.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/baremetal_unmaintenance_task.go b/pkg/compute/tasks/baremetal_unmaintenance_task.go index dd03201a05..013483d959 100644 --- a/pkg/compute/tasks/baremetal_unmaintenance_task.go +++ b/pkg/compute/tasks/baremetal_unmaintenance_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/cloud_account_import_task.go b/pkg/compute/tasks/cloud_account_import_task.go index 0117fc2500..9446ef2133 100644 --- a/pkg/compute/tasks/cloud_account_import_task.go +++ b/pkg/compute/tasks/cloud_account_import_task.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/cloud_account_sync_task.go b/pkg/compute/tasks/cloud_account_sync_task.go index 5869316d9d..df335913c0 100644 --- a/pkg/compute/tasks/cloud_account_sync_task.go +++ b/pkg/compute/tasks/cloud_account_sync_task.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/cloud_provider_sync_info_task.go b/pkg/compute/tasks/cloud_provider_sync_info_task.go index 852d01468f..f0f231a00a 100644 --- a/pkg/compute/tasks/cloud_provider_sync_info_task.go +++ b/pkg/compute/tasks/cloud_provider_sync_info_task.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/compare" "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/appsrv" @@ -17,7 +18,6 @@ import ( "yunion.io/x/onecloud/pkg/compute/skus" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/logclient" - "yunion.io/x/pkg/util/compare" ) type CloudProviderSyncInfoTask struct { diff --git a/pkg/compute/tasks/eip_deallocate_task.go b/pkg/compute/tasks/eip_deallocate_task.go index 15d2b53938..fa761121cd 100644 --- a/pkg/compute/tasks/eip_deallocate_task.go +++ b/pkg/compute/tasks/eip_deallocate_task.go @@ -8,9 +8,8 @@ import ( "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/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type EipDeallocateTask struct { diff --git a/pkg/compute/tasks/guest_backup_tasks.go b/pkg/compute/tasks/guest_backup_tasks.go index b88784323a..844115af63 100644 --- a/pkg/compute/tasks/guest_backup_tasks.go +++ b/pkg/compute/tasks/guest_backup_tasks.go @@ -5,11 +5,12 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "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/utils" ) type GuestSwitchToBackupTask struct { diff --git a/pkg/compute/tasks/guest_create_disk_task.go b/pkg/compute/tasks/guest_create_disk_task.go index e976e13a6b..87addf7f80 100644 --- a/pkg/compute/tasks/guest_create_disk_task.go +++ b/pkg/compute/tasks/guest_create_disk_task.go @@ -6,8 +6,8 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_deploy_task.go b/pkg/compute/tasks/guest_deploy_task.go index 9285ee57ba..3d0659e21e 100644 --- a/pkg/compute/tasks/guest_deploy_task.go +++ b/pkg/compute/tasks/guest_deploy_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_reset_task.go b/pkg/compute/tasks/guest_reset_task.go index 07b45c26fb..b1c415e1c5 100644 --- a/pkg/compute/tasks/guest_reset_task.go +++ b/pkg/compute/tasks/guest_reset_task.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_save_image_task.go b/pkg/compute/tasks/guest_save_image_task.go index c6c13bfc2b..e2be71c58d 100644 --- a/pkg/compute/tasks/guest_save_image_task.go +++ b/pkg/compute/tasks/guest_save_image_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_start_task.go b/pkg/compute/tasks/guest_start_task.go index 522386879b..55c8255b89 100644 --- a/pkg/compute/tasks/guest_start_task.go +++ b/pkg/compute/tasks/guest_start_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_stop_task.go b/pkg/compute/tasks/guest_stop_task.go index 7b984dcda1..568280433e 100644 --- a/pkg/compute/tasks/guest_stop_task.go +++ b/pkg/compute/tasks/guest_stop_task.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/guest_syncstatus_task.go b/pkg/compute/tasks/guest_syncstatus_task.go index b957a79c7e..fb475cd028 100644 --- a/pkg/compute/tasks/guest_syncstatus_task.go +++ b/pkg/compute/tasks/guest_syncstatus_task.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/tasks/host_storage_attach_task.go b/pkg/compute/tasks/host_storage_attach_task.go index 604908b70d..e19de3ac2b 100644 --- a/pkg/compute/tasks/host_storage_attach_task.go +++ b/pkg/compute/tasks/host_storage_attach_task.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/host_storage_detach_task.go b/pkg/compute/tasks/host_storage_detach_task.go index 61081a6f13..04c38423f7 100644 --- a/pkg/compute/tasks/host_storage_detach_task.go +++ b/pkg/compute/tasks/host_storage_detach_task.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/network_create_task.go b/pkg/compute/tasks/network_create_task.go index f22fec944c..aede76b0ab 100644 --- a/pkg/compute/tasks/network_create_task.go +++ b/pkg/compute/tasks/network_create_task.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/tasks/network_delete_task.go b/pkg/compute/tasks/network_delete_task.go index 58c0532d3c..3de71cee29 100644 --- a/pkg/compute/tasks/network_delete_task.go +++ b/pkg/compute/tasks/network_delete_task.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/tasks/security_group_delete_task.go b/pkg/compute/tasks/security_group_delete_task.go index 54fe0fc2e2..20ed0065b0 100644 --- a/pkg/compute/tasks/security_group_delete_task.go +++ b/pkg/compute/tasks/security_group_delete_task.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/compute/models" diff --git a/pkg/compute/tasks/storage_uncache_image_task.go b/pkg/compute/tasks/storage_uncache_image_task.go index aa9a0a3cd9..0895fa5b04 100644 --- a/pkg/compute/tasks/storage_uncache_image_task.go +++ b/pkg/compute/tasks/storage_uncache_image_task.go @@ -6,10 +6,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "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" ) diff --git a/pkg/compute/tasks/vpc_create_task.go b/pkg/compute/tasks/vpc_create_task.go index 1164090984..cec53d1209 100644 --- a/pkg/compute/tasks/vpc_create_task.go +++ b/pkg/compute/tasks/vpc_create_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/compute/tasks/vpc_delete_task.go b/pkg/compute/tasks/vpc_delete_task.go index e5b90a9b29..3883055586 100644 --- a/pkg/compute/tasks/vpc_delete_task.go +++ b/pkg/compute/tasks/vpc_delete_task.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" "yunion.io/x/onecloud/pkg/cloudprovider" diff --git a/pkg/dns/parse.go b/pkg/dns/parse.go index 1db458494f..d25e8f150c 100644 --- a/pkg/dns/parse.go +++ b/pkg/dns/parse.go @@ -7,8 +7,9 @@ import ( "github.com/coredns/coredns/request" "github.com/miekg/dns" - "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/pkg/tristate" + + "yunion.io/x/onecloud/pkg/compute/models" ) type recordRequest struct { diff --git a/pkg/hostimage/host_image_service.go b/pkg/hostimage/host_image_service.go index 4b6d1b4e62..6a82a0d019 100644 --- a/pkg/hostimage/host_image_service.go +++ b/pkg/hostimage/host_image_service.go @@ -10,15 +10,16 @@ import ( "strings" "time" + "github.com/pierrec/lz4" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient/auth" - - "github.com/pierrec/lz4" ) type SHostImageOptions struct { diff --git a/pkg/hostman/downloader/guest_downloader.go b/pkg/hostman/downloader/guest_downloader.go index ac071bd724..cb6d7e83b4 100644 --- a/pkg/hostman/downloader/guest_downloader.go +++ b/pkg/hostman/downloader/guest_downloader.go @@ -6,6 +6,7 @@ import ( "path" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/options" "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/tarutils" diff --git a/pkg/hostman/downloader/image_downloader.go b/pkg/hostman/downloader/image_downloader.go index 7e44c1d5d8..7a869db2cc 100644 --- a/pkg/hostman/downloader/image_downloader.go +++ b/pkg/hostman/downloader/image_downloader.go @@ -5,11 +5,12 @@ import ( "os" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/hostman/storageman" "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/qemuimg" "yunion.io/x/onecloud/pkg/util/tarutils" - "yunion.io/x/pkg/utils" ) type SImageDownloadProvider struct { diff --git a/pkg/hostman/guestfs/fsdriver/android.go b/pkg/hostman/guestfs/fsdriver/android.go index 31a5989153..b47f870e43 100644 --- a/pkg/hostman/guestfs/fsdriver/android.go +++ b/pkg/hostman/guestfs/fsdriver/android.go @@ -6,6 +6,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/sshkeys" ) diff --git a/pkg/hostman/guestfs/fsdriver/esxi.go b/pkg/hostman/guestfs/fsdriver/esxi.go index d6deca7142..b3e86016e8 100644 --- a/pkg/hostman/guestfs/fsdriver/esxi.go +++ b/pkg/hostman/guestfs/fsdriver/esxi.go @@ -2,6 +2,7 @@ package fsdriver import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/sshkeys" "yunion.io/x/onecloud/pkg/util/seclib2" ) diff --git a/pkg/hostman/guestfs/fsdriver/linux.go b/pkg/hostman/guestfs/fsdriver/linux.go index 60c95bda1e..cfa773c1ba 100644 --- a/pkg/hostman/guestfs/fsdriver/linux.go +++ b/pkg/hostman/guestfs/fsdriver/linux.go @@ -9,6 +9,7 @@ import ( "syscall" yaml "gopkg.in/yaml.v2" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/hostman/guestfs/fsdriver/macos.go b/pkg/hostman/guestfs/fsdriver/macos.go index 9d2cfd1620..753e35bf6e 100644 --- a/pkg/hostman/guestfs/fsdriver/macos.go +++ b/pkg/hostman/guestfs/fsdriver/macos.go @@ -6,11 +6,12 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudcommon/sshkeys" "yunion.io/x/onecloud/pkg/util/macutils" "yunion.io/x/onecloud/pkg/util/seclib2" "yunion.io/x/onecloud/pkg/util/stringutils2" - "yunion.io/x/pkg/utils" ) type SMacOSRootFs struct { diff --git a/pkg/hostman/guestfs/fsdriver/windows.go b/pkg/hostman/guestfs/fsdriver/windows.go index 3cda2352d7..88aa4bbbbf 100644 --- a/pkg/hostman/guestfs/fsdriver/windows.go +++ b/pkg/hostman/guestfs/fsdriver/windows.go @@ -10,6 +10,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudcommon/sshkeys" "yunion.io/x/onecloud/pkg/cloudcommon/types" "yunion.io/x/onecloud/pkg/hostman/options" @@ -19,7 +21,6 @@ import ( "yunion.io/x/onecloud/pkg/util/stringutils2" "yunion.io/x/onecloud/pkg/util/version" "yunion.io/x/onecloud/pkg/util/winutils" - "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/hostman/guestman/guesthelper.go b/pkg/hostman/guestman/guesthelper.go index 6323f424ba..f35143343d 100644 --- a/pkg/hostman/guestman/guesthelper.go +++ b/pkg/hostman/guestman/guesthelper.go @@ -2,6 +2,7 @@ package guestman import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/hostman/storageman" ) diff --git a/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go b/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go index 1bc798e5d4..cbf4e3fe27 100644 --- a/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go +++ b/pkg/hostman/hostinfo/hostdhcp/dhcprelay.go @@ -7,6 +7,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/dhcp" ) diff --git a/pkg/hostman/hostinfo/hostinfohelper.go b/pkg/hostman/hostinfo/hostinfohelper.go index aff17cd4e1..dec77447a0 100644 --- a/pkg/hostman/hostinfo/hostinfohelper.go +++ b/pkg/hostman/hostinfo/hostinfohelper.go @@ -12,6 +12,7 @@ import ( "github.com/shirou/gopsutil/cpu" "github.com/shirou/gopsutil/mem" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/hostman/hostinfo/hostpinger.go b/pkg/hostman/hostinfo/hostpinger.go index 78616274dd..9aa3fafb16 100644 --- a/pkg/hostman/hostinfo/hostpinger.go +++ b/pkg/hostman/hostinfo/hostpinger.go @@ -5,6 +5,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/mcclient/modules" diff --git a/pkg/hostman/hostmetrics/hostmetrics.go b/pkg/hostman/hostmetrics/hostmetrics.go index a84e823885..efd8bfb6ba 100644 --- a/pkg/hostman/hostmetrics/hostmetrics.go +++ b/pkg/hostman/hostmetrics/hostmetrics.go @@ -12,6 +12,7 @@ import ( "github.com/shirou/gopsutil/host" psnet "github.com/shirou/gopsutil/net" "github.com/shirou/gopsutil/process" + "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/util/netutils" diff --git a/pkg/hostman/kubehandler.go b/pkg/hostman/kubehandler.go index 96fe71e994..d33561705a 100644 --- a/pkg/hostman/kubehandler.go +++ b/pkg/hostman/kubehandler.go @@ -6,6 +6,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/hostman/system_service" diff --git a/pkg/hostman/monitor/hmp.go b/pkg/hostman/monitor/hmp.go index a48269ac46..a65adaeba5 100644 --- a/pkg/hostman/monitor/hmp.go +++ b/pkg/hostman/monitor/hmp.go @@ -11,6 +11,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/regutils2" ) diff --git a/pkg/hostman/storageman/disk_local.go b/pkg/hostman/storageman/disk_local.go index 4fab39f418..bc889e21ff 100644 --- a/pkg/hostman/storageman/disk_local.go +++ b/pkg/hostman/storageman/disk_local.go @@ -8,6 +8,8 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/cloudcommon/storagetypes" "yunion.io/x/onecloud/pkg/hostman/hostutils" @@ -18,7 +20,6 @@ import ( "yunion.io/x/onecloud/pkg/util/fuseutils" "yunion.io/x/onecloud/pkg/util/procutils" "yunion.io/x/onecloud/pkg/util/qemuimg" - "yunion.io/x/pkg/utils" ) var _ALTER_SUFFIX_ = ".alter" diff --git a/pkg/hostman/storageman/disk_rbd.go b/pkg/hostman/storageman/disk_rbd.go index 609d55096b..6d05ed6f13 100644 --- a/pkg/hostman/storageman/disk_rbd.go +++ b/pkg/hostman/storageman/disk_rbd.go @@ -5,12 +5,14 @@ import ( "fmt" "github.com/ceph/go-ceph/rbd" + "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/cloudcommon/storagetypes" "yunion.io/x/onecloud/pkg/hostman/hostutils" - "yunion.io/x/pkg/utils" ) type SRBDDisk struct { diff --git a/pkg/hostman/storageman/imagecache_local.go b/pkg/hostman/storageman/imagecache_local.go index 8a0dc6b66f..a08a050316 100644 --- a/pkg/hostman/storageman/imagecache_local.go +++ b/pkg/hostman/storageman/imagecache_local.go @@ -11,6 +11,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/hostman/storageman/remotefile" "yunion.io/x/onecloud/pkg/mcclient/auth" diff --git a/pkg/hostman/storageman/imagecache_rbd.go b/pkg/hostman/storageman/imagecache_rbd.go index cb634c24bd..cea70d9ca3 100644 --- a/pkg/hostman/storageman/imagecache_rbd.go +++ b/pkg/hostman/storageman/imagecache_rbd.go @@ -6,6 +6,7 @@ import ( "sync" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/hostman/options" "yunion.io/x/onecloud/pkg/hostman/storageman/remotefile" diff --git a/pkg/hostman/storageman/imagecachemanager_local.go b/pkg/hostman/storageman/imagecachemanager_local.go index dad28e3640..2e8970ec38 100644 --- a/pkg/hostman/storageman/imagecachemanager_local.go +++ b/pkg/hostman/storageman/imagecachemanager_local.go @@ -8,10 +8,11 @@ import ( "sync" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/procutils" - "yunion.io/x/pkg/util/regutils" ) type SLocalImageCacheManager struct { diff --git a/pkg/hostman/storageman/imagecachemanager_rbd.go b/pkg/hostman/storageman/imagecachemanager_rbd.go index 695e63f6c3..a3fffb54d3 100644 --- a/pkg/hostman/storageman/imagecachemanager_rbd.go +++ b/pkg/hostman/storageman/imagecachemanager_rbd.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/hostutils" ) diff --git a/pkg/hostman/storageman/remotefile/remotefile.go b/pkg/hostman/storageman/remotefile/remotefile.go index 410aad5ba2..5e4685e15f 100644 --- a/pkg/hostman/storageman/remotefile/remotefile.go +++ b/pkg/hostman/storageman/remotefile/remotefile.go @@ -10,6 +10,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient/auth" "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/httputils" diff --git a/pkg/hostman/storageman/storage_base.go b/pkg/hostman/storageman/storage_base.go index 1f8fc27009..da7c6fc3f5 100644 --- a/pkg/hostman/storageman/storage_base.go +++ b/pkg/hostman/storageman/storage_base.go @@ -8,6 +8,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/hostutils" ) diff --git a/pkg/hostman/storageman/storage_rbd.go b/pkg/hostman/storageman/storage_rbd.go index e4b87729d3..76374a2336 100644 --- a/pkg/hostman/storageman/storage_rbd.go +++ b/pkg/hostman/storageman/storage_rbd.go @@ -9,8 +9,11 @@ import ( "github.com/ceph/go-ceph/rados" "github.com/ceph/go-ceph/rbd" + "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudcommon/storagetypes" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/hostman/guestfs/fsdriver" @@ -19,7 +22,6 @@ import ( "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/onecloud/pkg/util/procutils" "yunion.io/x/onecloud/pkg/util/qemutils" - "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/hostman/storageman/storagehandler.go b/pkg/hostman/storageman/storagehandler.go index d86b38c7e0..8be8a46743 100644 --- a/pkg/hostman/storageman/storagehandler.go +++ b/pkg/hostman/storageman/storagehandler.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/hostman/hostutils" "yunion.io/x/onecloud/pkg/httperrors" diff --git a/pkg/hostman/system_service/fluentbit.go b/pkg/hostman/system_service/fluentbit.go index df2bf43f00..1ccc9b26d4 100644 --- a/pkg/hostman/system_service/fluentbit.go +++ b/pkg/hostman/system_service/fluentbit.go @@ -6,6 +6,7 @@ import ( "strings" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/hostman/options" ) diff --git a/pkg/hostman/system_service/system_service.go b/pkg/hostman/system_service/system_service.go index 60f1381a3d..f20fe80fa3 100644 --- a/pkg/hostman/system_service/system_service.go +++ b/pkg/hostman/system_service/system_service.go @@ -4,6 +4,7 @@ import ( "strings" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/procutils" ) diff --git a/pkg/httperrors/httperrors.go b/pkg/httperrors/httperrors.go index 2f8ff9d05d..5dabe93f25 100644 --- a/pkg/httperrors/httperrors.go +++ b/pkg/httperrors/httperrors.go @@ -4,6 +4,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/image/models/initdb.go b/pkg/image/models/initdb.go index 7ba836838a..f86ae2ec10 100644 --- a/pkg/image/models/initdb.go +++ b/pkg/image/models/initdb.go @@ -2,6 +2,7 @@ package models import ( "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) diff --git a/pkg/image/service/service.go b/pkg/image/service/service.go index 8e891f01dd..c98cc441bc 100644 --- a/pkg/image/service/service.go +++ b/pkg/image/service/service.go @@ -9,13 +9,12 @@ import ( "yunion.io/x/log" - _ "yunion.io/x/onecloud/pkg/image/tasks" - "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/cloudcommon/cronman" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/image/models" "yunion.io/x/onecloud/pkg/image/options" + _ "yunion.io/x/onecloud/pkg/image/tasks" "yunion.io/x/onecloud/pkg/image/torrent" "yunion.io/x/onecloud/pkg/util/fileutils2" ) diff --git a/pkg/image/tasks/image_delete_task.go b/pkg/image/tasks/image_delete_task.go index 09e7d75b2a..585f77766d 100644 --- a/pkg/image/tasks/image_delete_task.go +++ b/pkg/image/tasks/image_delete_task.go @@ -3,6 +3,7 @@ package tasks import ( "context" "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/mcclient/auth/middleware.go b/pkg/mcclient/auth/middleware.go index e01649696b..fcbc7f2ef6 100644 --- a/pkg/mcclient/auth/middleware.go +++ b/pkg/mcclient/auth/middleware.go @@ -5,10 +5,10 @@ import ( "net/http" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" "yunion.io/x/onecloud/pkg/appsrv" "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/mcclient.go b/pkg/mcclient/mcclient.go index a447d4ba50..d93e52d859 100644 --- a/pkg/mcclient/mcclient.go +++ b/pkg/mcclient/mcclient.go @@ -12,9 +12,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/onecloud/pkg/util/seclib2" - "yunion.io/x/pkg/gotypes" ) type Client struct { diff --git a/pkg/mcclient/modules/base.go b/pkg/mcclient/modules/base.go index d3c2ff35b1..efcd49ff6b 100644 --- a/pkg/mcclient/modules/base.go +++ b/pkg/mcclient/modules/base.go @@ -8,6 +8,7 @@ import ( "strings" "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 ec4cec8fb4..45cd44c7b1 100644 --- a/pkg/mcclient/modules/cache.go +++ b/pkg/mcclient/modules/cache.go @@ -4,6 +4,7 @@ import ( "fmt" "sync" "time" + "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/mcclient/modules/filter.go b/pkg/mcclient/modules/filter.go index 1fcf759561..b4a44fa46b 100644 --- a/pkg/mcclient/modules/filter.go +++ b/pkg/mcclient/modules/filter.go @@ -3,6 +3,7 @@ package modules import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/joint.go b/pkg/mcclient/modules/joint.go index 4e69e7d10b..a45cf49a70 100644 --- a/pkg/mcclient/modules/joint.go +++ b/pkg/mcclient/modules/joint.go @@ -5,6 +5,7 @@ import ( "net/url" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_alarmevents.go b/pkg/mcclient/modules/mod_alarmevents.go index 56292a6cc2..1472d874ff 100644 --- a/pkg/mcclient/modules/mod_alarmevents.go +++ b/pkg/mcclient/modules/mod_alarmevents.go @@ -2,6 +2,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_capabilities.go b/pkg/mcclient/modules/mod_capabilities.go index 4b6fa33124..bb470fd3b9 100644 --- a/pkg/mcclient/modules/mod_capabilities.go +++ b/pkg/mcclient/modules/mod_capabilities.go @@ -2,6 +2,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_cloudregions.go b/pkg/mcclient/modules/mod_cloudregions.go index c8919290e3..6f0324d50e 100644 --- a/pkg/mcclient/modules/mod_cloudregions.go +++ b/pkg/mcclient/modules/mod_cloudregions.go @@ -1,9 +1,10 @@ package modules import ( + "sort" + "yunion.io/x/jsonutils" - "sort" "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_contacts.go b/pkg/mcclient/modules/mod_contacts.go index af48f980e5..33945b7a7e 100644 --- a/pkg/mcclient/modules/mod_contacts.go +++ b/pkg/mcclient/modules/mod_contacts.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_domains.go b/pkg/mcclient/modules/mod_domains.go index b437969cb4..25ac84594c 100644 --- a/pkg/mcclient/modules/mod_domains.go +++ b/pkg/mcclient/modules/mod_domains.go @@ -5,10 +5,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/util/httputils" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type DomainManager struct { diff --git a/pkg/mcclient/modules/mod_endpoints.go b/pkg/mcclient/modules/mod_endpoints.go index 3cf043e59e..4bcb8d6fb2 100644 --- a/pkg/mcclient/modules/mod_endpoints.go +++ b/pkg/mcclient/modules/mod_endpoints.go @@ -2,6 +2,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_hosts.go b/pkg/mcclient/modules/mod_hosts.go index 4fddee1706..fad795f353 100644 --- a/pkg/mcclient/modules/mod_hosts.go +++ b/pkg/mcclient/modules/mod_hosts.go @@ -4,13 +4,14 @@ import ( "fmt" "regexp" "strings" - "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/log" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) const MACAddressPattern = `(([a-fA-F0-9]{2}[:-]){5}([a-fA-F0-9]{2}))` diff --git a/pkg/mcclient/modules/mod_images.go b/pkg/mcclient/modules/mod_images.go index ea1bbfa10a..820b465775 100644 --- a/pkg/mcclient/modules/mod_images.go +++ b/pkg/mcclient/modules/mod_images.go @@ -9,11 +9,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type ImageManager struct { diff --git a/pkg/mcclient/modules/mod_infos.go b/pkg/mcclient/modules/mod_infos.go index f4fdd90813..9cba9000dc 100644 --- a/pkg/mcclient/modules/mod_infos.go +++ b/pkg/mcclient/modules/mod_infos.go @@ -6,6 +6,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_license.go b/pkg/mcclient/modules/mod_license.go index 45dd1c904a..0fab734e02 100644 --- a/pkg/mcclient/modules/mod_license.go +++ b/pkg/mcclient/modules/mod_license.go @@ -6,6 +6,7 @@ import ( "net/http" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_nodes.go b/pkg/mcclient/modules/mod_nodes.go index 82e36dca57..5ec2704ae4 100644 --- a/pkg/mcclient/modules/mod_nodes.go +++ b/pkg/mcclient/modules/mod_nodes.go @@ -5,6 +5,7 @@ import ( "net/url" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_performances.go b/pkg/mcclient/modules/mod_performances.go index ce585a2a2e..176eb168c0 100644 --- a/pkg/mcclient/modules/mod_performances.go +++ b/pkg/mcclient/modules/mod_performances.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_policies.go b/pkg/mcclient/modules/mod_policies.go index 5b2227f60f..0e0e81f9d0 100644 --- a/pkg/mcclient/modules/mod_policies.go +++ b/pkg/mcclient/modules/mod_policies.go @@ -2,6 +2,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_projects.go b/pkg/mcclient/modules/mod_projects.go index 4e44a6bb5e..cfcc230b01 100644 --- a/pkg/mcclient/modules/mod_projects.go +++ b/pkg/mcclient/modules/mod_projects.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "yunion.io/x/onecloud/pkg/util/httputils" - "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type ProjectManagerV3 struct { diff --git a/pkg/mcclient/modules/mod_quotas.go b/pkg/mcclient/modules/mod_quotas.go index 2eec59e1fd..aba29558fe 100644 --- a/pkg/mcclient/modules/mod_quotas.go +++ b/pkg/mcclient/modules/mod_quotas.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_recipients.go b/pkg/mcclient/modules/mod_recipients.go index 2defc01c50..22836253ce 100644 --- a/pkg/mcclient/modules/mod_recipients.go +++ b/pkg/mcclient/modules/mod_recipients.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_reservedips.go b/pkg/mcclient/modules/mod_reservedips.go index bcd09ca9b6..1c02bc06dd 100644 --- a/pkg/mcclient/modules/mod_reservedips.go +++ b/pkg/mcclient/modules/mod_reservedips.go @@ -5,6 +5,7 @@ import ( "sync" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_roleassignments.go b/pkg/mcclient/modules/mod_roleassignments.go index 7a9b70a028..b99a42dcf3 100644 --- a/pkg/mcclient/modules/mod_roleassignments.go +++ b/pkg/mcclient/modules/mod_roleassignments.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_roles.go b/pkg/mcclient/modules/mod_roles.go index c928d1897f..08e0d89a12 100644 --- a/pkg/mcclient/modules/mod_roles.go +++ b/pkg/mcclient/modules/mod_roles.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/onecloud/pkg/util/httputils" ) diff --git a/pkg/mcclient/modules/mod_schedtags.go b/pkg/mcclient/modules/mod_schedtags.go index f7d2ebf3b5..88f7230069 100644 --- a/pkg/mcclient/modules/mod_schedtags.go +++ b/pkg/mcclient/modules/mod_schedtags.go @@ -4,6 +4,7 @@ import ( "sync" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_scheduler.go b/pkg/mcclient/modules/mod_scheduler.go index 62a0c4f1cd..2d3eb74ad6 100644 --- a/pkg/mcclient/modules/mod_scheduler.go +++ b/pkg/mcclient/modules/mod_scheduler.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_servers.go b/pkg/mcclient/modules/mod_servers.go index 95e75b4f0a..cb81ee70a0 100644 --- a/pkg/mcclient/modules/mod_servers.go +++ b/pkg/mcclient/modules/mod_servers.go @@ -4,10 +4,11 @@ import ( "fmt" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/util/seclib2" "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/seclib2" ) type ServerManager struct { diff --git a/pkg/mcclient/modules/mod_servicehosts.go b/pkg/mcclient/modules/mod_servicehosts.go index 104ce2fbb9..3f94fa5ae3 100644 --- a/pkg/mcclient/modules/mod_servicehosts.go +++ b/pkg/mcclient/modules/mod_servicehosts.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_specs.go b/pkg/mcclient/modules/mod_specs.go index 5543c2d01d..4aababe112 100644 --- a/pkg/mcclient/modules/mod_specs.go +++ b/pkg/mcclient/modules/mod_specs.go @@ -6,8 +6,9 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/mcclient" ) type SpecsManager struct { diff --git a/pkg/mcclient/modules/mod_sshkeypairs.go b/pkg/mcclient/modules/mod_sshkeypairs.go index 335d59907e..efe21ad1b8 100644 --- a/pkg/mcclient/modules/mod_sshkeypairs.go +++ b/pkg/mcclient/modules/mod_sshkeypairs.go @@ -2,7 +2,9 @@ package modules import ( "fmt" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_stastics.go b/pkg/mcclient/modules/mod_stastics.go index 2c1b68c8f0..d3ea1d803c 100644 --- a/pkg/mcclient/modules/mod_stastics.go +++ b/pkg/mcclient/modules/mod_stastics.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_treenodes.go b/pkg/mcclient/modules/mod_treenodes.go index 72623da688..e39af3a22f 100644 --- a/pkg/mcclient/modules/mod_treenodes.go +++ b/pkg/mcclient/modules/mod_treenodes.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_updates.go b/pkg/mcclient/modules/mod_updates.go index 1b9bb561e3..a559c10bb1 100644 --- a/pkg/mcclient/modules/mod_updates.go +++ b/pkg/mcclient/modules/mod_updates.go @@ -2,6 +2,7 @@ package modules import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_usages.go b/pkg/mcclient/modules/mod_usages.go index 1fea693be7..3c1af82266 100644 --- a/pkg/mcclient/modules/mod_usages.go +++ b/pkg/mcclient/modules/mod_usages.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_users.go b/pkg/mcclient/modules/mod_users.go index 727f3d1908..3ecd588287 100644 --- a/pkg/mcclient/modules/mod_users.go +++ b/pkg/mcclient/modules/mod_users.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_vncproxy.go b/pkg/mcclient/modules/mod_vncproxy.go index e6331b1961..7337e9fefb 100644 --- a/pkg/mcclient/modules/mod_vncproxy.go +++ b/pkg/mcclient/modules/mod_vncproxy.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/mod_webconsole.go b/pkg/mcclient/modules/mod_webconsole.go index 148be7fe80..2ee7f2d362 100644 --- a/pkg/mcclient/modules/mod_webconsole.go +++ b/pkg/mcclient/modules/mod_webconsole.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/modules.go b/pkg/mcclient/modules/modules.go index 323420c63f..726254069e 100644 --- a/pkg/mcclient/modules/modules.go +++ b/pkg/mcclient/modules/modules.go @@ -6,6 +6,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) diff --git a/pkg/mcclient/modules/resource.go b/pkg/mcclient/modules/resource.go index 4c1b1da5f2..b092dfc49a 100644 --- a/pkg/mcclient/modules/resource.go +++ b/pkg/mcclient/modules/resource.go @@ -6,11 +6,11 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/httperrors" - "yunion.io/x/onecloud/pkg/util/httputils" - "yunion.io/x/log" + + "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type TResourceFilter func(*mcclient.ClientSession, jsonutils.JSONObject, jsonutils.JSONObject) (jsonutils.JSONObject, error) diff --git a/pkg/mcclient/options/loadbalancerbackendgroups.go b/pkg/mcclient/options/loadbalancerbackendgroups.go index 0553ab46da..c4e1219b62 100644 --- a/pkg/mcclient/options/loadbalancerbackendgroups.go +++ b/pkg/mcclient/options/loadbalancerbackendgroups.go @@ -6,8 +6,9 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/compute/consts" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/compute/consts" ) type LoadbalancerBackendGroupCreateOptions struct { diff --git a/pkg/mcclient/session.go b/pkg/mcclient/session.go index 46b5c0e42d..54c35771af 100644 --- a/pkg/mcclient/session.go +++ b/pkg/mcclient/session.go @@ -12,8 +12,9 @@ import ( "time" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/util/httputils" ) const ( diff --git a/pkg/mcclient/tokenman.go b/pkg/mcclient/tokenman.go index e94c443fa4..978552b53b 100644 --- a/pkg/mcclient/tokenman.go +++ b/pkg/mcclient/tokenman.go @@ -2,6 +2,7 @@ package mcclient import ( "github.com/golang-plus/uuid" + "yunion.io/x/log" ) diff --git a/pkg/proxy/http.go b/pkg/proxy/http.go index 87318cecca..c90c13f651 100644 --- a/pkg/proxy/http.go +++ b/pkg/proxy/http.go @@ -8,6 +8,7 @@ import ( "net/url" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" ) diff --git a/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go index 20ddba352a..f58bd3c8b0 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go @@ -1,9 +1,10 @@ package baremetal import ( + "yunion.io/x/pkg/util/sets" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" "yunion.io/x/onecloud/pkg/scheduler/core" - "yunion.io/x/pkg/util/sets" ) var ( diff --git a/pkg/scheduler/algorithm/predicates/guest/status_predicate.go b/pkg/scheduler/algorithm/predicates/guest/status_predicate.go index 0eadfd5565..fefbae80e8 100644 --- a/pkg/scheduler/algorithm/predicates/guest/status_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/status_predicate.go @@ -1,10 +1,9 @@ package guest import ( + "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" "yunion.io/x/onecloud/pkg/scheduler/core" - - "yunion.io/x/onecloud/pkg/compute/models" ) const ( diff --git a/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go b/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go index c4d7a6ccfe..0a57a74285 100644 --- a/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go @@ -4,9 +4,10 @@ import ( "fmt" "strings" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" "yunion.io/x/onecloud/pkg/scheduler/core" - "yunion.io/x/pkg/utils" ) // StoragePredicate used to filter whether the storage capacity of the diff --git a/pkg/scheduler/algorithm/predicates/k8s/host_status_predicate.go b/pkg/scheduler/algorithm/predicates/k8s/host_status_predicate.go index d7463902cf..97aca5a025 100644 --- a/pkg/scheduler/algorithm/predicates/k8s/host_status_predicate.go +++ b/pkg/scheduler/algorithm/predicates/k8s/host_status_predicate.go @@ -3,7 +3,7 @@ package k8s import ( "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/guest" diff --git a/pkg/scheduler/algorithm/predicates/k8s/k8s.go b/pkg/scheduler/algorithm/predicates/k8s/k8s.go index 657c49d89e..896cd2f3d6 100644 --- a/pkg/scheduler/algorithm/predicates/k8s/k8s.go +++ b/pkg/scheduler/algorithm/predicates/k8s/k8s.go @@ -3,7 +3,7 @@ package k8s import ( "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" diff --git a/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go b/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go index 46e9612138..835ff0a74a 100644 --- a/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go +++ b/pkg/scheduler/algorithm/predicates/k8s/network_predicate.go @@ -3,7 +3,7 @@ package k8s import ( "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" "yunion.io/x/pkg/util/errors" diff --git a/pkg/scheduler/algorithm/predicates/k8s/volume_predicate.go b/pkg/scheduler/algorithm/predicates/k8s/volume_predicate.go index 95fe32dc4e..e238bf8fba 100644 --- a/pkg/scheduler/algorithm/predicates/k8s/volume_predicate.go +++ b/pkg/scheduler/algorithm/predicates/k8s/volume_predicate.go @@ -3,7 +3,7 @@ package k8s import ( "fmt" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/pkg/scheduler/algorithm/predicates/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go index 4131f1d9ff..0ec853f20d 100644 --- a/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -5,6 +5,7 @@ import ( "strings" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/algorithm" "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" "yunion.io/x/onecloud/pkg/scheduler/core" diff --git a/pkg/scheduler/algorithmprovider/baremetal.go b/pkg/scheduler/algorithmprovider/baremetal.go index f2cd386339..3f237855e3 100644 --- a/pkg/scheduler/algorithmprovider/baremetal.go +++ b/pkg/scheduler/algorithmprovider/baremetal.go @@ -1,10 +1,11 @@ package algorithmprovider import ( + "yunion.io/x/pkg/util/sets" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" predicatebm "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/baremetal" "yunion.io/x/onecloud/pkg/scheduler/factory" - "yunion.io/x/pkg/util/sets" ) func init() { diff --git a/pkg/scheduler/algorithmprovider/defaults.go b/pkg/scheduler/algorithmprovider/defaults.go index 2eec8ec4ed..54f6670b63 100644 --- a/pkg/scheduler/algorithmprovider/defaults.go +++ b/pkg/scheduler/algorithmprovider/defaults.go @@ -1,11 +1,12 @@ package algorithmprovider import ( + "yunion.io/x/pkg/util/sets" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" predicateguest "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates/guest" priorityguest "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities/guest" "yunion.io/x/onecloud/pkg/scheduler/factory" - "yunion.io/x/pkg/util/sets" ) func init() { diff --git a/pkg/scheduler/api/candidate.go b/pkg/scheduler/api/candidate.go index 7f2e41d733..07ba0aca02 100644 --- a/pkg/scheduler/api/candidate.go +++ b/pkg/scheduler/api/candidate.go @@ -3,7 +3,7 @@ package api import ( "strconv" - "github.com/bitly/go-simplejson" + simplejson "github.com/bitly/go-simplejson" "yunion.io/x/log" ) diff --git a/pkg/scheduler/api/cleanup.go b/pkg/scheduler/api/cleanup.go index 70ef8cf435..3546013f72 100644 --- a/pkg/scheduler/api/cleanup.go +++ b/pkg/scheduler/api/cleanup.go @@ -1,8 +1,6 @@ package api -import ( - "github.com/bitly/go-simplejson" -) +import simplejson "github.com/bitly/go-simplejson" type CleanupArgs struct { ResType string diff --git a/pkg/scheduler/api/completed.go b/pkg/scheduler/api/completed.go index af0b6cb4e5..d628d0fda8 100644 --- a/pkg/scheduler/api/completed.go +++ b/pkg/scheduler/api/completed.go @@ -1,8 +1,6 @@ package api -import ( - "github.com/bitly/go-simplejson" -) +import simplejson "github.com/bitly/go-simplejson" type CompletedNotifyArgs struct { SessionID string diff --git a/pkg/scheduler/api/history.go b/pkg/scheduler/api/history.go index f9646d50eb..7f79a252ee 100644 --- a/pkg/scheduler/api/history.go +++ b/pkg/scheduler/api/history.go @@ -3,7 +3,7 @@ package api import ( "strconv" - "github.com/bitly/go-simplejson" + simplejson "github.com/bitly/go-simplejson" ) type HistoryArgs struct { diff --git a/pkg/scheduler/api/sched.go b/pkg/scheduler/api/sched.go index 0245b1ce77..98f23d3dfc 100644 --- a/pkg/scheduler/api/sched.go +++ b/pkg/scheduler/api/sched.go @@ -6,7 +6,7 @@ import ( "strconv" "strings" - "github.com/bitly/go-simplejson" + simplejson "github.com/bitly/go-simplejson" "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/scheduler/cache/candidate/baremetals.go b/pkg/scheduler/cache/candidate/baremetals.go index 9ab2489da5..8109ee0589 100644 --- a/pkg/scheduler/cache/candidate/baremetals.go +++ b/pkg/scheduler/cache/candidate/baremetals.go @@ -8,6 +8,7 @@ import ( fjson "github.com/json-iterator/go" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/compute/baremetal" "yunion.io/x/onecloud/pkg/scheduler/cache" "yunion.io/x/onecloud/pkg/scheduler/cache/db" diff --git a/pkg/scheduler/cache/candidate/default.go b/pkg/scheduler/cache/candidate/default.go index db62721dd7..7c9dc7e967 100644 --- a/pkg/scheduler/cache/candidate/default.go +++ b/pkg/scheduler/cache/candidate/default.go @@ -7,10 +7,11 @@ import ( "time" "yunion.io/x/log" + u "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/onecloud/pkg/scheduler/cache" "yunion.io/x/onecloud/pkg/scheduler/db/models" - u "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/cache/candidate/hosts.go b/pkg/scheduler/cache/candidate/hosts.go index 6be549ff64..7b3b331698 100644 --- a/pkg/scheduler/cache/candidate/hosts.go +++ b/pkg/scheduler/cache/candidate/hosts.go @@ -9,16 +9,16 @@ import ( "time" "yunion.io/x/log" - o "yunion.io/x/onecloud/cmd/scheduler/options" - "yunion.io/x/onecloud/pkg/scheduler/cache" - "yunion.io/x/onecloud/pkg/scheduler/cache/db" - "yunion.io/x/onecloud/pkg/scheduler/db/models" "yunion.io/x/pkg/util/errors" "yunion.io/x/pkg/util/sets" "yunion.io/x/pkg/util/workqueue" "yunion.io/x/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache/db" "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) type HostDesc struct { diff --git a/pkg/scheduler/cache/db/default.go b/pkg/scheduler/cache/db/default.go index c1e34a95a0..bf0e208ebb 100644 --- a/pkg/scheduler/cache/db/default.go +++ b/pkg/scheduler/cache/db/default.go @@ -3,10 +3,11 @@ package db import ( "time" + u "yunion.io/x/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/onecloud/pkg/scheduler/cache" "yunion.io/x/onecloud/pkg/scheduler/db/models" - u "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/cache/sync/default.go b/pkg/scheduler/cache/sync/default.go index 8d6f8121bf..49627d8fd7 100644 --- a/pkg/scheduler/cache/sync/default.go +++ b/pkg/scheduler/cache/sync/default.go @@ -1,10 +1,11 @@ package sync import ( + u "yunion.io/x/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/onecloud/pkg/scheduler/cache" networks_db "yunion.io/x/onecloud/pkg/scheduler/cache/sync/networks/db" - u "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/cache/sync/network.go b/pkg/scheduler/cache/sync/network.go index 27dce799e6..c0b8d67129 100644 --- a/pkg/scheduler/cache/sync/network.go +++ b/pkg/scheduler/cache/sync/network.go @@ -1,8 +1,9 @@ package sync import ( - "yunion.io/x/onecloud/pkg/scheduler/db/models" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) const ( diff --git a/pkg/scheduler/cache/sync/network_data.go b/pkg/scheduler/cache/sync/network_data.go index f2f6b6c33b..fd656327bf 100644 --- a/pkg/scheduler/cache/sync/network_data.go +++ b/pkg/scheduler/cache/sync/network_data.go @@ -4,8 +4,9 @@ import ( "fmt" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/scheduler/db/models" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) const ( diff --git a/pkg/scheduler/cache/sync/networks/db/db.go b/pkg/scheduler/cache/sync/networks/db/db.go index 15c06dc436..8df68fe0f1 100644 --- a/pkg/scheduler/cache/sync/networks/db/db.go +++ b/pkg/scheduler/cache/sync/networks/db/db.go @@ -5,6 +5,7 @@ import ( "strings" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index f5533ef3e4..82ec975994 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -10,11 +10,12 @@ import ( "time" "yunion.io/x/log" - o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/pkg/util/errors" gp "yunion.io/x/pkg/util/goroutine_pool" utiltrace "yunion.io/x/pkg/util/trace" "yunion.io/x/pkg/util/workqueue" + + o "yunion.io/x/onecloud/cmd/scheduler/options" ) const ( diff --git a/pkg/scheduler/data_manager/candidate_manager.go b/pkg/scheduler/data_manager/candidate_manager.go index 8ec27d8b11..57e8afaaf2 100644 --- a/pkg/scheduler/data_manager/candidate_manager.go +++ b/pkg/scheduler/data_manager/candidate_manager.go @@ -4,12 +4,13 @@ import ( "fmt" "time" + "yunion.io/x/pkg/util/ttlpool" + "yunion.io/x/onecloud/pkg/scheduler/cache" candidatecache "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" dbcache "yunion.io/x/onecloud/pkg/scheduler/cache/db" synccache "yunion.io/x/onecloud/pkg/scheduler/cache/sync" "yunion.io/x/onecloud/pkg/scheduler/core" - "yunion.io/x/pkg/util/ttlpool" ) type CandidateGetArgs struct { diff --git a/pkg/scheduler/data_manager/network_manager.go b/pkg/scheduler/data_manager/network_manager.go index e6c52c8dbb..168f17111c 100644 --- a/pkg/scheduler/data_manager/network_manager.go +++ b/pkg/scheduler/data_manager/network_manager.go @@ -4,6 +4,7 @@ import ( "sync" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/cache" synccache "yunion.io/x/onecloud/pkg/scheduler/cache/sync" networks_db "yunion.io/x/onecloud/pkg/scheduler/cache/sync/networks/db" diff --git a/pkg/scheduler/data_manager/reserved_algorithm.go b/pkg/scheduler/data_manager/reserved_algorithm.go index cd129a32aa..bebd6e5c3c 100644 --- a/pkg/scheduler/data_manager/reserved_algorithm.go +++ b/pkg/scheduler/data_manager/reserved_algorithm.go @@ -1,8 +1,9 @@ package data_manager import ( - candidatecache "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" "yunion.io/x/pkg/utils" + + candidatecache "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" ) type ResAlgorithm interface { diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go index f5f5ac71ca..9d17599eaa 100644 --- a/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -3,8 +3,9 @@ package factory import ( "fmt" - "yunion.io/x/onecloud/pkg/scheduler/core" "yunion.io/x/pkg/util/sets" + + "yunion.io/x/onecloud/pkg/scheduler/core" ) func GetAlgorithmProvider(name string) (*AlgorithmProviderConfig, error) { diff --git a/pkg/scheduler/factory/plugins.go b/pkg/scheduler/factory/plugins.go index d56e410300..ad9ee151f2 100644 --- a/pkg/scheduler/factory/plugins.go +++ b/pkg/scheduler/factory/plugins.go @@ -6,8 +6,9 @@ import ( "sync" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/scheduler/core" "yunion.io/x/pkg/util/sets" + + "yunion.io/x/onecloud/pkg/scheduler/core" ) type AlgorithmProviderConfig struct { diff --git a/pkg/scheduler/handler/handler.go b/pkg/scheduler/handler/handler.go index 4cd1ce390c..62b9efe95d 100644 --- a/pkg/scheduler/handler/handler.go +++ b/pkg/scheduler/handler/handler.go @@ -6,10 +6,11 @@ import ( "net/http/httputil" "time" - "github.com/bitly/go-simplejson" - "gopkg.in/gin-gonic/gin.v1" + simplejson "github.com/bitly/go-simplejson" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" "yunion.io/x/onecloud/pkg/scheduler/core" "yunion.io/x/onecloud/pkg/scheduler/db/models" diff --git a/pkg/scheduler/handler/k8s_extender.go b/pkg/scheduler/handler/k8s_extender.go index 4a659a7fcd..f728d094ff 100644 --- a/pkg/scheduler/handler/k8s_extender.go +++ b/pkg/scheduler/handler/k8s_extender.go @@ -5,8 +5,8 @@ import ( "fmt" "net/http" - "gopkg.in/gin-gonic/gin.v1" - "k8s.io/api/core/v1" + gin "gopkg.in/gin-gonic/gin.v1" + v1 "k8s.io/api/core/v1" schedulerapi "k8s.io/kubernetes/pkg/scheduler/api/v1" "yunion.io/x/log" diff --git a/pkg/scheduler/handler/ping.go b/pkg/scheduler/handler/ping.go index 64e7ab7fce..cbe25bc93b 100644 --- a/pkg/scheduler/handler/ping.go +++ b/pkg/scheduler/handler/ping.go @@ -4,9 +4,10 @@ import ( "fmt" "net/http" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/log" + o "yunion.io/x/onecloud/cmd/scheduler/options" schedman "yunion.io/x/onecloud/pkg/scheduler/manager" ) diff --git a/pkg/scheduler/handler/version.go b/pkg/scheduler/handler/version.go index a770cfec11..995154c97c 100644 --- a/pkg/scheduler/handler/version.go +++ b/pkg/scheduler/handler/version.go @@ -3,7 +3,7 @@ package handler import ( "net/http" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/pkg/util/version" ) diff --git a/pkg/scheduler/manager/completed_queue.go b/pkg/scheduler/manager/completed_queue.go index 23f455a26c..b65a203a94 100644 --- a/pkg/scheduler/manager/completed_queue.go +++ b/pkg/scheduler/manager/completed_queue.go @@ -4,9 +4,10 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/onecloud/pkg/scheduler/api" - "yunion.io/x/pkg/utils" ) type CompletedManager struct { diff --git a/pkg/scheduler/manager/expire_queue.go b/pkg/scheduler/manager/expire_queue.go index d3d8ef912b..2069f0a27e 100644 --- a/pkg/scheduler/manager/expire_queue.go +++ b/pkg/scheduler/manager/expire_queue.go @@ -5,9 +5,10 @@ import ( "time" "yunion.io/x/log" + u "yunion.io/x/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/onecloud/pkg/scheduler/api" - u "yunion.io/x/pkg/utils" ) type ExpireManager struct { diff --git a/pkg/scheduler/manager/task_history.go b/pkg/scheduler/manager/task_history.go index 98dd41c641..9c234ee711 100644 --- a/pkg/scheduler/manager/task_history.go +++ b/pkg/scheduler/manager/task_history.go @@ -5,9 +5,10 @@ import ( "sync" "time" - o "yunion.io/x/onecloud/cmd/scheduler/options" "yunion.io/x/pkg/util/wait" u "yunion.io/x/pkg/utils" + + o "yunion.io/x/onecloud/cmd/scheduler/options" ) type HistoryItem struct { diff --git a/pkg/scheduler/manager/task_queue.go b/pkg/scheduler/manager/task_queue.go index 125ab24e21..06d1edd956 100644 --- a/pkg/scheduler/manager/task_queue.go +++ b/pkg/scheduler/manager/task_queue.go @@ -7,6 +7,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" "yunion.io/x/onecloud/pkg/scheduler/core" ) diff --git a/pkg/util/aliyun/image.go b/pkg/util/aliyun/image.go index 9cf95aebed..5b88b14be1 100644 --- a/pkg/util/aliyun/image.go +++ b/pkg/util/aliyun/image.go @@ -10,10 +10,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" - "yunion.io/x/pkg/utils" ) type ImageStatusType string diff --git a/pkg/util/aliyun/instancenic.go b/pkg/util/aliyun/instancenic.go index 9b77f904d1..13e4ef6243 100644 --- a/pkg/util/aliyun/instancenic.go +++ b/pkg/util/aliyun/instancenic.go @@ -1,8 +1,9 @@ package aliyun import ( - "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/pkg/util/netutils" + + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SInstanceNic struct { diff --git a/pkg/util/aliyun/keypair.go b/pkg/util/aliyun/keypair.go index 5be8d34d1b..4ac767d754 100644 --- a/pkg/util/aliyun/keypair.go +++ b/pkg/util/aliyun/keypair.go @@ -3,12 +3,13 @@ package aliyun import ( "encoding/json" "fmt" - "github.com/aokoli/goutils" - "golang.org/x/crypto/ssh" "strconv" "strings" "time" + "github.com/aokoli/goutils" + "golang.org/x/crypto/ssh" + "yunion.io/x/log" ) diff --git a/pkg/util/aliyun/loadbalanceracl.go b/pkg/util/aliyun/loadbalanceracl.go index 226040a686..c211acd6b7 100644 --- a/pkg/util/aliyun/loadbalanceracl.go +++ b/pkg/util/aliyun/loadbalanceracl.go @@ -3,6 +3,7 @@ package aliyun import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/util/aliyun/loadbalancerbackend.go b/pkg/util/aliyun/loadbalancerbackend.go index 61aba6ada0..23c35e16df 100644 --- a/pkg/util/aliyun/loadbalancerbackend.go +++ b/pkg/util/aliyun/loadbalancerbackend.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/aliyun/loadbalancerbackendgroup.go b/pkg/util/aliyun/loadbalancerbackendgroup.go index c0825f566a..be3f00c7d6 100644 --- a/pkg/util/aliyun/loadbalancerbackendgroup.go +++ b/pkg/util/aliyun/loadbalancerbackendgroup.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/aliyun/loadbalancerhttplistener.go b/pkg/util/aliyun/loadbalancerhttplistener.go index 501dd4b27d..ea2b4df9c7 100644 --- a/pkg/util/aliyun/loadbalancerhttplistener.go +++ b/pkg/util/aliyun/loadbalancerhttplistener.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/aliyun/loadbalancerhttpslistener.go b/pkg/util/aliyun/loadbalancerhttpslistener.go index 2dde32b0af..f7134ce3e7 100644 --- a/pkg/util/aliyun/loadbalancerhttpslistener.go +++ b/pkg/util/aliyun/loadbalancerhttpslistener.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/aliyun/loadbalancerlistenerrule.go b/pkg/util/aliyun/loadbalancerlistenerrule.go index ac69dbefdc..f32f595bdf 100644 --- a/pkg/util/aliyun/loadbalancerlistenerrule.go +++ b/pkg/util/aliyun/loadbalancerlistenerrule.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/util/aliyun/natgateway.go b/pkg/util/aliyun/natgateway.go index 48ba8d9799..7fbf6a3e85 100644 --- a/pkg/util/aliyun/natgateway.go +++ b/pkg/util/aliyun/natgateway.go @@ -2,8 +2,8 @@ package aliyun import ( "fmt" - "time" + "yunion.io/x/log" ) diff --git a/pkg/util/aliyun/routetable.go b/pkg/util/aliyun/routetable.go index 130ce85bb3..45cedb9e95 100644 --- a/pkg/util/aliyun/routetable.go +++ b/pkg/util/aliyun/routetable.go @@ -2,12 +2,12 @@ package aliyun import ( "fmt" + "strings" "time" "yunion.io/x/jsonutils" "yunion.io/x/log" - "strings" "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/util/aliyun/shell/routetable.go b/pkg/util/aliyun/shell/routetable.go index 72d57348bd..96a96a9974 100644 --- a/pkg/util/aliyun/shell/routetable.go +++ b/pkg/util/aliyun/shell/routetable.go @@ -2,6 +2,7 @@ package shell import ( "fmt" + "yunion.io/x/onecloud/pkg/util/aliyun" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/util/aliyun/storagecache.go b/pkg/util/aliyun/storagecache.go index ef5a6c8d12..5cbcfbf205 100644 --- a/pkg/util/aliyun/storagecache.go +++ b/pkg/util/aliyun/storagecache.go @@ -9,6 +9,7 @@ import ( "time" "github.com/aliyun/aliyun-oss-go-sdk/oss" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/util/aliyun/vswitch.go b/pkg/util/aliyun/vswitch.go index 6db526fceb..6dc5506d1c 100644 --- a/pkg/util/aliyun/vswitch.go +++ b/pkg/util/aliyun/vswitch.go @@ -1,6 +1,7 @@ package aliyun import ( + "fmt" "strings" "time" @@ -9,7 +10,6 @@ import ( "yunion.io/x/pkg/util/netutils" "yunion.io/x/pkg/utils" - "fmt" "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/aliyun/wrapper.go b/pkg/util/aliyun/wrapper.go index cd466acdc5..dac95bda9f 100644 --- a/pkg/util/aliyun/wrapper.go +++ b/pkg/util/aliyun/wrapper.go @@ -3,12 +3,12 @@ package aliyun import ( "errors" - "yunion.io/x/jsonutils" - "yunion.io/x/log" - "github.com/aliyun/alibaba-cloud-sdk-go/sdk" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses" + + "yunion.io/x/jsonutils" + "yunion.io/x/log" ) func processCommonRequest(client *sdk.Client, req *requests.CommonRequest) (response *responses.CommonResponse, err error) { diff --git a/pkg/util/aws/eip.go b/pkg/util/aws/eip.go index 8ac7d7e1ee..6ec9a4113e 100644 --- a/pkg/util/aws/eip.go +++ b/pkg/util/aws/eip.go @@ -5,6 +5,7 @@ import ( "time" "github.com/aws/aws-sdk-go/service/ec2" + "yunion.io/x/jsonutils" "yunion.io/x/log" diff --git a/pkg/util/aws/provider/provider.go b/pkg/util/aws/provider/provider.go index cf9a3c543f..df9df64053 100644 --- a/pkg/util/aws/provider/provider.go +++ b/pkg/util/aws/provider/provider.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/util/azure/provider/provider.go b/pkg/util/azure/provider/provider.go index 936827e17c..8686af613c 100644 --- a/pkg/util/azure/provider/provider.go +++ b/pkg/util/azure/provider/provider.go @@ -5,6 +5,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/util/azure/shell/image.go b/pkg/util/azure/shell/image.go index 54abeb4ce0..e4532d8fd2 100644 --- a/pkg/util/azure/shell/image.go +++ b/pkg/util/azure/shell/image.go @@ -3,6 +3,7 @@ package shell import ( "fmt" "sort" + "yunion.io/x/onecloud/pkg/util/azure" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/util/cgrouputils/cpusetutils.go b/pkg/util/cgrouputils/cpusetutils.go index 99317dc4f6..a38e039697 100644 --- a/pkg/util/cgrouputils/cpusetutils.go +++ b/pkg/util/cgrouputils/cpusetutils.go @@ -8,6 +8,7 @@ import ( "sync" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/fileutils2" ) diff --git a/pkg/util/cgrouputils/cpuutils.go b/pkg/util/cgrouputils/cpuutils.go index 32396c9421..523a9e80d6 100644 --- a/pkg/util/cgrouputils/cpuutils.go +++ b/pkg/util/cgrouputils/cpuutils.go @@ -7,7 +7,9 @@ import ( "strings" "github.com/shirou/gopsutil/process" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/fileutils2" ) diff --git a/pkg/util/conditionparser/parser_test.go b/pkg/util/conditionparser/parser_test.go index 156a0c426d..e65265a538 100644 --- a/pkg/util/conditionparser/parser_test.go +++ b/pkg/util/conditionparser/parser_test.go @@ -1,9 +1,9 @@ package conditionparser import ( + "go/parser" "testing" - "go/parser" "yunion.io/x/jsonutils" ) diff --git a/pkg/util/coreosutils/coreosutils.go b/pkg/util/coreosutils/coreosutils.go index 605a4ea78c..04ad1ed30c 100644 --- a/pkg/util/coreosutils/coreosutils.go +++ b/pkg/util/coreosutils/coreosutils.go @@ -6,6 +6,7 @@ import ( "strings" yaml "gopkg.in/yaml.v2" + "yunion.io/x/pkg/utils" ) diff --git a/pkg/util/esxi/shell/store.go b/pkg/util/esxi/shell/store.go index 068931368c..1334e48204 100644 --- a/pkg/util/esxi/shell/store.go +++ b/pkg/util/esxi/shell/store.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "os" + "yunion.io/x/onecloud/pkg/util/esxi" "yunion.io/x/onecloud/pkg/util/printutils" "yunion.io/x/onecloud/pkg/util/shellutils" diff --git a/pkg/util/esxi/shell/virtualmachine.go b/pkg/util/esxi/shell/virtualmachine.go index 0313cad264..7e0840c9ea 100644 --- a/pkg/util/esxi/shell/virtualmachine.go +++ b/pkg/util/esxi/shell/virtualmachine.go @@ -3,6 +3,7 @@ package shell import ( "context" "fmt" + "yunion.io/x/onecloud/pkg/util/esxi" "yunion.io/x/onecloud/pkg/util/printutils" "yunion.io/x/onecloud/pkg/util/shellutils" diff --git a/pkg/util/fileutils2/blkid.go b/pkg/util/fileutils2/blkid.go index 4a9dbf006a..f142a26113 100644 --- a/pkg/util/fileutils2/blkid.go +++ b/pkg/util/fileutils2/blkid.go @@ -3,6 +3,7 @@ package fileutils2 import ( "os/exec" "regexp" + "yunion.io/x/log" ) diff --git a/pkg/util/fileutils2/cheksum.go b/pkg/util/fileutils2/cheksum.go index 84d4053bd2..74a914320d 100644 --- a/pkg/util/fileutils2/cheksum.go +++ b/pkg/util/fileutils2/cheksum.go @@ -1,15 +1,14 @@ package fileutils2 import ( - "fmt" - "hash" - "io" - "os" - "crypto/md5" "crypto/sha1" "crypto/sha256" "crypto/sha512" + "fmt" + "hash" + "io" + "os" "yunion.io/x/log" ) diff --git a/pkg/util/fileutils2/fileutils.go b/pkg/util/fileutils2/fileutils.go index c35eb11d4e..4fcdaa05f4 100644 --- a/pkg/util/fileutils2/fileutils.go +++ b/pkg/util/fileutils2/fileutils.go @@ -17,9 +17,10 @@ import ( "golang.org/x/sys/unix" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/util/procutils" "yunion.io/x/onecloud/pkg/util/regutils2" - "yunion.io/x/pkg/utils" ) func Cleandir(sPath string, keepdir bool) error { diff --git a/pkg/util/fuseutils/fuseutils.go b/pkg/util/fuseutils/fuseutils.go index 8d1d2fbad5..870e589b23 100644 --- a/pkg/util/fuseutils/fuseutils.go +++ b/pkg/util/fuseutils/fuseutils.go @@ -8,6 +8,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/procutils" ) diff --git a/pkg/util/gin/middleware/error.go b/pkg/util/gin/middleware/error.go index 7b8806ff3d..e2b5ac2949 100644 --- a/pkg/util/gin/middleware/error.go +++ b/pkg/util/gin/middleware/error.go @@ -1,7 +1,7 @@ package middleware import ( - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" ) func ErrorHandler(c *gin.Context) { diff --git a/pkg/util/gin/middleware/keystone_auth.go b/pkg/util/gin/middleware/keystone_auth.go index 1c8fa5d8f0..66139c2a4e 100644 --- a/pkg/util/gin/middleware/keystone_auth.go +++ b/pkg/util/gin/middleware/keystone_auth.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/onecloud/pkg/mcclient/auth" ) diff --git a/pkg/util/gin/middleware/log.go b/pkg/util/gin/middleware/log.go index 92a7ecd592..90d2591a6b 100644 --- a/pkg/util/gin/middleware/log.go +++ b/pkg/util/gin/middleware/log.go @@ -3,7 +3,7 @@ package middleware import ( "time" - "gopkg.in/gin-gonic/gin.v1" + gin "gopkg.in/gin-gonic/gin.v1" "yunion.io/x/log" ) diff --git a/pkg/util/huawei/client/manager/manager.go b/pkg/util/huawei/client/manager/manager.go index 5fa16531a8..7408302af7 100644 --- a/pkg/util/huawei/client/manager/manager.go +++ b/pkg/util/huawei/client/manager/manager.go @@ -2,6 +2,7 @@ package manager import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/huawei/client/responses" ) diff --git a/pkg/util/huawei/client/modules/manager_resource.go b/pkg/util/huawei/client/modules/manager_resource.go index b293c4a0ab..6a427e2723 100644 --- a/pkg/util/huawei/client/modules/manager_resource.go +++ b/pkg/util/huawei/client/modules/manager_resource.go @@ -6,6 +6,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/huawei/client/manager" "yunion.io/x/onecloud/pkg/util/huawei/client/requests" "yunion.io/x/onecloud/pkg/util/huawei/client/responses" diff --git a/pkg/util/huawei/client/modules/mod_jobs.go b/pkg/util/huawei/client/modules/mod_jobs.go index 3dfd0de1a8..44669d29d1 100644 --- a/pkg/util/huawei/client/modules/mod_jobs.go +++ b/pkg/util/huawei/client/modules/mod_jobs.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/huawei/client/auth" "yunion.io/x/onecloud/pkg/util/huawei/client/responses" ) diff --git a/pkg/util/huawei/client/modules/mod_servers.go b/pkg/util/huawei/client/modules/mod_servers.go index a1cddb8e40..274d48198a 100644 --- a/pkg/util/huawei/client/modules/mod_servers.go +++ b/pkg/util/huawei/client/modules/mod_servers.go @@ -1,11 +1,12 @@ package modules import ( + "fmt" "strconv" - "fmt" "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/huawei/client/auth" "yunion.io/x/onecloud/pkg/util/huawei/client/responses" ) diff --git a/pkg/util/huawei/client/responses/responses.go b/pkg/util/huawei/client/responses/responses.go index 06ff8c2ccc..4214fd80ea 100644 --- a/pkg/util/huawei/client/responses/responses.go +++ b/pkg/util/huawei/client/responses/responses.go @@ -3,6 +3,7 @@ package responses import ( "regexp" "strings" + "yunion.io/x/jsonutils" ) diff --git a/pkg/util/huawei/client/responses/responses_test.go b/pkg/util/huawei/client/responses/responses_test.go index f161c64111..0a91401180 100644 --- a/pkg/util/huawei/client/responses/responses_test.go +++ b/pkg/util/huawei/client/responses/responses_test.go @@ -3,6 +3,7 @@ package responses import ( "fmt" "testing" + "yunion.io/x/jsonutils" ) diff --git a/pkg/util/huawei/eip.go b/pkg/util/huawei/eip.go index b0aa932fc3..e7687cb4f9 100644 --- a/pkg/util/huawei/eip.go +++ b/pkg/util/huawei/eip.go @@ -5,6 +5,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/huawei/host.go b/pkg/util/huawei/host.go index 550573b127..ae174f5648 100644 --- a/pkg/util/huawei/host.go +++ b/pkg/util/huawei/host.go @@ -5,6 +5,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/billing" diff --git a/pkg/util/huawei/huawei.go b/pkg/util/huawei/huawei.go index 6c6fb9b4d4..190812c6e5 100644 --- a/pkg/util/huawei/huawei.go +++ b/pkg/util/huawei/huawei.go @@ -3,6 +3,7 @@ package huawei import ( "fmt" "strings" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/huawei/client" diff --git a/pkg/util/huawei/instancenic.go b/pkg/util/huawei/instancenic.go index e12c15290f..66f18abc4a 100644 --- a/pkg/util/huawei/instancenic.go +++ b/pkg/util/huawei/instancenic.go @@ -2,9 +2,10 @@ package huawei import ( "yunion.io/x/log" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/huawei/client/modules" - "yunion.io/x/pkg/util/netutils" ) // =========================================== diff --git a/pkg/util/huawei/keypair.go b/pkg/util/huawei/keypair.go index e85731aeea..3ba5de3339 100644 --- a/pkg/util/huawei/keypair.go +++ b/pkg/util/huawei/keypair.go @@ -8,6 +8,7 @@ import ( "github.com/aokoli/goutils" "golang.org/x/crypto/ssh" + "yunion.io/x/jsonutils" ) diff --git a/pkg/util/huawei/network.go b/pkg/util/huawei/network.go index 7a71b3a8b5..9fe34d3ab9 100644 --- a/pkg/util/huawei/network.go +++ b/pkg/util/huawei/network.go @@ -3,10 +3,11 @@ package huawei import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/huawei/client/modules" - "yunion.io/x/pkg/util/netutils" ) /* diff --git a/pkg/util/huawei/order.go b/pkg/util/huawei/order.go index ff66b1932f..fa267b37d7 100644 --- a/pkg/util/huawei/order.go +++ b/pkg/util/huawei/order.go @@ -6,6 +6,7 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/util/huawei/project.go b/pkg/util/huawei/project.go index 2e0c99392a..ed443604a1 100644 --- a/pkg/util/huawei/project.go +++ b/pkg/util/huawei/project.go @@ -1,9 +1,9 @@ package huawei import ( + "fmt" "strings" - "fmt" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/huawei/client" ) diff --git a/pkg/util/huawei/provider/provider.go b/pkg/util/huawei/provider/provider.go index 532f05b00a..be744d5b7c 100644 --- a/pkg/util/huawei/provider/provider.go +++ b/pkg/util/huawei/provider/provider.go @@ -4,6 +4,7 @@ import ( "context" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/util/huawei/snapshot.go b/pkg/util/huawei/snapshot.go index ba9e3cd3e0..510c53cb2c 100644 --- a/pkg/util/huawei/snapshot.go +++ b/pkg/util/huawei/snapshot.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/huawei/storage.go b/pkg/util/huawei/storage.go index f43296318b..cd4beb8916 100644 --- a/pkg/util/huawei/storage.go +++ b/pkg/util/huawei/storage.go @@ -2,8 +2,10 @@ package huawei import ( "fmt" + "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/huawei/utils.go b/pkg/util/huawei/utils.go index f5976797f6..50855fdf67 100644 --- a/pkg/util/huawei/utils.go +++ b/pkg/util/huawei/utils.go @@ -2,16 +2,17 @@ package huawei import ( "fmt" - "reflect" "strings" + "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/onecloud/pkg/util/huawei/client/manager" "yunion.io/x/onecloud/pkg/util/huawei/client/responses" - "yunion.io/x/pkg/utils" ) // 常用的方法 diff --git a/pkg/util/huawei/vpc.go b/pkg/util/huawei/vpc.go index 6677881c58..67202c9cbc 100644 --- a/pkg/util/huawei/vpc.go +++ b/pkg/util/huawei/vpc.go @@ -4,6 +4,7 @@ import ( "strings" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/huawei/wire.go b/pkg/util/huawei/wire.go index 475e548609..65b89d444d 100644 --- a/pkg/util/huawei/wire.go +++ b/pkg/util/huawei/wire.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" ) diff --git a/pkg/util/huawei/zone.go b/pkg/util/huawei/zone.go index 3c42f550c0..a60ddb6f76 100644 --- a/pkg/util/huawei/zone.go +++ b/pkg/util/huawei/zone.go @@ -1,11 +1,12 @@ package huawei import ( + "fmt" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" - - "fmt" ) var StorageTypes = []string{ diff --git a/pkg/util/netutils2/macutils_test.go b/pkg/util/netutils2/macutils_test.go index 5edfbb8296..0b3a250173 100644 --- a/pkg/util/netutils2/macutils_test.go +++ b/pkg/util/netutils2/macutils_test.go @@ -2,6 +2,7 @@ package netutils2 import ( "testing" + "yunion.io/x/pkg/util/netutils" ) diff --git a/pkg/util/openstack/disk.go b/pkg/util/openstack/disk.go index c043fb2c5a..183fbb1549 100644 --- a/pkg/util/openstack/disk.go +++ b/pkg/util/openstack/disk.go @@ -6,6 +6,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/openstack/flavor.go b/pkg/util/openstack/flavor.go index 9c516b8fb4..9050b36634 100644 --- a/pkg/util/openstack/flavor.go +++ b/pkg/util/openstack/flavor.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/openstack/host.go b/pkg/util/openstack/host.go index b66e219c71..39c39b32ae 100644 --- a/pkg/util/openstack/host.go +++ b/pkg/util/openstack/host.go @@ -4,10 +4,11 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/version" - "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/util/openstack/image.go b/pkg/util/openstack/image.go index 399b5d81be..b71f169dfc 100644 --- a/pkg/util/openstack/image.go +++ b/pkg/util/openstack/image.go @@ -6,9 +6,10 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" - "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/util/openstack/instance.go b/pkg/util/openstack/instance.go index f98d48634d..d6ade4400d 100644 --- a/pkg/util/openstack/instance.go +++ b/pkg/util/openstack/instance.go @@ -7,10 +7,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/billing" - "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/util/openstack/keypaire.go b/pkg/util/openstack/keypaire.go index 10f68d414f..b43c18d2b1 100644 --- a/pkg/util/openstack/keypaire.go +++ b/pkg/util/openstack/keypaire.go @@ -4,9 +4,10 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/util/version" - "yunion.io/x/pkg/utils" ) type SKeypair struct { diff --git a/pkg/util/openstack/network.go b/pkg/util/openstack/network.go index 43512a7e3a..c9120a6176 100644 --- a/pkg/util/openstack/network.go +++ b/pkg/util/openstack/network.go @@ -5,9 +5,10 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" - "yunion.io/x/pkg/util/netutils" ) type AllocationPool struct { diff --git a/pkg/util/openstack/openstack.go b/pkg/util/openstack/openstack.go index 4ddd33fcef..cef9e90023 100644 --- a/pkg/util/openstack/openstack.go +++ b/pkg/util/openstack/openstack.go @@ -9,6 +9,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/mcclient" diff --git a/pkg/util/openstack/quota.go b/pkg/util/openstack/quota.go index a911749590..53e0dbc8a4 100644 --- a/pkg/util/openstack/quota.go +++ b/pkg/util/openstack/quota.go @@ -2,6 +2,7 @@ package openstack import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/version" ) diff --git a/pkg/util/openstack/region.go b/pkg/util/openstack/region.go index 9a1010ba4d..da93a36297 100644 --- a/pkg/util/openstack/region.go +++ b/pkg/util/openstack/region.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" "yunion.io/x/onecloud/pkg/util/httputils" diff --git a/pkg/util/openstack/securitygroup.go b/pkg/util/openstack/securitygroup.go index 9ab548f845..0ae29b398d 100644 --- a/pkg/util/openstack/securitygroup.go +++ b/pkg/util/openstack/securitygroup.go @@ -9,10 +9,11 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" - "yunion.io/x/onecloud/pkg/cloudprovider" - "yunion.io/x/onecloud/pkg/util/httputils" "yunion.io/x/pkg/util/secrules" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/util/httputils" ) type SSecurityGroupRule struct { diff --git a/pkg/util/openstack/snapshot.go b/pkg/util/openstack/snapshot.go index 265daeef8e..3b6b33c5fc 100644 --- a/pkg/util/openstack/snapshot.go +++ b/pkg/util/openstack/snapshot.go @@ -2,6 +2,7 @@ package openstack import ( "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/openstack/vpc.go b/pkg/util/openstack/vpc.go index 1ecfab8245..74131ba0d0 100644 --- a/pkg/util/openstack/vpc.go +++ b/pkg/util/openstack/vpc.go @@ -4,6 +4,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/openstack/zone.go b/pkg/util/openstack/zone.go index efa9368635..e96dd7a423 100644 --- a/pkg/util/openstack/zone.go +++ b/pkg/util/openstack/zone.go @@ -7,6 +7,7 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/models" ) diff --git a/pkg/util/printutils/printgetter.go b/pkg/util/printutils/printgetter.go index 1765efd1ee..ef05b1e1a6 100644 --- a/pkg/util/printutils/printgetter.go +++ b/pkg/util/printutils/printgetter.go @@ -6,9 +6,10 @@ import ( "strings" "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient/modules" "yunion.io/x/pkg/gotypes" "yunion.io/x/pkg/utils" + + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func getter2json(obj interface{}) jsonutils.JSONObject { diff --git a/pkg/util/qcloud/instance.go b/pkg/util/qcloud/instance.go index 8feea35642..581e8d5592 100644 --- a/pkg/util/qcloud/instance.go +++ b/pkg/util/qcloud/instance.go @@ -1,11 +1,10 @@ package qcloud import ( + "context" "fmt" "time" - "context" - "yunion.io/x/jsonutils" "yunion.io/x/log" "yunion.io/x/pkg/utils" diff --git a/pkg/util/qcloud/loadbalancer_backend.go b/pkg/util/qcloud/loadbalancer_backend.go index 51cf72e28b..ab3d37772b 100755 --- a/pkg/util/qcloud/loadbalancer_backend.go +++ b/pkg/util/qcloud/loadbalancer_backend.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/qcloud/loadbalancer_listener.go b/pkg/util/qcloud/loadbalancer_listener.go index 6081ccad7a..d1c54cf852 100755 --- a/pkg/util/qcloud/loadbalancer_listener.go +++ b/pkg/util/qcloud/loadbalancer_listener.go @@ -7,6 +7,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/qcloud/loadbalancer_listenerrule.go b/pkg/util/qcloud/loadbalancer_listenerrule.go index fe1e8a8bf8..7a45c010b7 100755 --- a/pkg/util/qcloud/loadbalancer_listenerrule.go +++ b/pkg/util/qcloud/loadbalancer_listenerrule.go @@ -5,6 +5,7 @@ import ( "time" "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" "yunion.io/x/onecloud/pkg/compute/consts" ) diff --git a/pkg/util/qcloud/shell/cos.go b/pkg/util/qcloud/shell/cos.go index 374244b2e0..78e8411757 100644 --- a/pkg/util/qcloud/shell/cos.go +++ b/pkg/util/qcloud/shell/cos.go @@ -5,6 +5,7 @@ import ( "os" coslib "github.com/nelsonken/cos-go-sdk-v5/cos" + "yunion.io/x/onecloud/pkg/util/qcloud" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/util/qcloud/shell/image.go b/pkg/util/qcloud/shell/image.go index b28e46a915..e9b5dc01ce 100644 --- a/pkg/util/qcloud/shell/image.go +++ b/pkg/util/qcloud/shell/image.go @@ -4,6 +4,7 @@ import ( "fmt" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/qcloud" "yunion.io/x/onecloud/pkg/util/shellutils" ) diff --git a/pkg/util/seclib2/crypto.go b/pkg/util/seclib2/crypto.go index 7e15b58509..212d4bf01c 100644 --- a/pkg/util/seclib2/crypto.go +++ b/pkg/util/seclib2/crypto.go @@ -1,17 +1,17 @@ package seclib2 import ( - "crypto/rand" - "crypto/rsa" - "crypto/sha1" - - "golang.org/x/crypto/ssh" - "crypto" "crypto/dsa" "crypto/ecdsa" + "crypto/rand" + "crypto/rsa" + "crypto/sha1" "encoding/base64" "fmt" + + "golang.org/x/crypto/ssh" + "yunion.io/x/log" ) diff --git a/pkg/util/seclib2/ssh.go b/pkg/util/seclib2/ssh.go index 0019c0d6f7..020e192868 100644 --- a/pkg/util/seclib2/ssh.go +++ b/pkg/util/seclib2/ssh.go @@ -1,16 +1,16 @@ package seclib2 import ( + "crypto/dsa" "crypto/rand" "crypto/rsa" "crypto/x509" + "encoding/asn1" "encoding/pem" + "math/big" - "crypto/dsa" "golang.org/x/crypto/ssh" - "encoding/asn1" - "math/big" "yunion.io/x/log" ) diff --git a/pkg/util/seclib2/ssh_test.go b/pkg/util/seclib2/ssh_test.go index 0672b7ce41..b57e4394da 100644 --- a/pkg/util/seclib2/ssh_test.go +++ b/pkg/util/seclib2/ssh_test.go @@ -4,8 +4,9 @@ import ( "crypto/x509" "encoding/pem" "fmt" - "golang.org/x/crypto/ssh" "testing" + + "golang.org/x/crypto/ssh" ) func TestGenerateRSASSHKeypair(t *testing.T) { diff --git a/pkg/util/tarutils/tarutils.go b/pkg/util/tarutils/tarutils.go index 67da0ada42..9f0666ac93 100644 --- a/pkg/util/tarutils/tarutils.go +++ b/pkg/util/tarutils/tarutils.go @@ -5,6 +5,7 @@ import ( "path/filepath" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/procutils" ) diff --git a/pkg/util/winutils/winutils.go b/pkg/util/winutils/winutils.go index b6da6b74e2..aa0ec86805 100644 --- a/pkg/util/winutils/winutils.go +++ b/pkg/util/winutils/winutils.go @@ -14,10 +14,11 @@ import ( "time" "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/onecloud/pkg/util/fileutils2" "yunion.io/x/onecloud/pkg/util/procutils" "yunion.io/x/onecloud/pkg/util/regutils2" - "yunion.io/x/pkg/utils" ) var _CHNTPW_PATH string diff --git a/pkg/webconsole/command/ssh_command.go b/pkg/webconsole/command/ssh_command.go index b59a78c77b..f1931015c9 100644 --- a/pkg/webconsole/command/ssh_command.go +++ b/pkg/webconsole/command/ssh_command.go @@ -10,13 +10,14 @@ import ( "time" "github.com/coredns/coredns/plugin/pkg/log" - "yunion.io/x/jsonutils" - "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/onecloud/pkg/util/ansible" - o "yunion.io/x/onecloud/pkg/webconsole/options" + "yunion.io/x/jsonutils" + + "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/ansible" + o "yunion.io/x/onecloud/pkg/webconsole/options" ) type SSHtoolSol struct { diff --git a/pkg/webconsole/service/service.go b/pkg/webconsole/service/service.go index 18be70cd1a..43e165e3ac 100644 --- a/pkg/webconsole/service/service.go +++ b/pkg/webconsole/service/service.go @@ -2,6 +2,7 @@ package service import ( "net" + "net/http" "net/url" "os" "strconv" @@ -10,7 +11,6 @@ import ( "yunion.io/x/log" - "net/http" "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/webconsole" o "yunion.io/x/onecloud/pkg/webconsole/options" diff --git a/pkg/yunionconf/models/initdb.go b/pkg/yunionconf/models/initdb.go index caa5cad49c..3b15c3b5cd 100644 --- a/pkg/yunionconf/models/initdb.go +++ b/pkg/yunionconf/models/initdb.go @@ -2,6 +2,7 @@ package models import ( "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) diff --git a/pkg/yunionconf/models/parameters.go b/pkg/yunionconf/models/parameters.go index 52dc9c1f1d..f957f45ee9 100644 --- a/pkg/yunionconf/models/parameters.go +++ b/pkg/yunionconf/models/parameters.go @@ -5,14 +5,15 @@ import ( "yunion.io/x/jsonutils" "yunion.io/x/log" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/cloudcommon/policy" "yunion.io/x/onecloud/pkg/httperrors" "yunion.io/x/onecloud/pkg/mcclient" - "yunion.io/x/pkg/util/timeutils" - "yunion.io/x/pkg/utils" - "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/yunionconf/service/service.go b/pkg/yunionconf/service/service.go index 48914b08bd..c822043a40 100644 --- a/pkg/yunionconf/service/service.go +++ b/pkg/yunionconf/service/service.go @@ -3,12 +3,12 @@ package service import ( "os" - "yunion.io/x/onecloud/pkg/cloudcommon/consts" - _ "github.com/go-sql-driver/mysql" "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon" + "yunion.io/x/onecloud/pkg/cloudcommon/consts" "yunion.io/x/onecloud/pkg/cloudcommon/db" "yunion.io/x/onecloud/pkg/yunionconf" "yunion.io/x/onecloud/pkg/yunionconf/models"