From 22411ffb53ef2b86313d4ddc55c595aa68cfc241 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Sat, 11 Aug 2018 14:28:18 +0800 Subject: [PATCH] path move: github.com/yunionio -> yunion.io/x --- Gopkg.lock | 127 ++++++++-------- Gopkg.toml | 18 ++- Makefile | 4 +- cmd/aliyuncli/main.go | 10 +- cmd/climc/climc.go | 14 +- cmd/climc/promputils/executor.go | 4 +- cmd/climc/shell/actions.go | 6 +- cmd/climc/shell/alarmevents.go | 6 +- cmd/climc/shell/alarmlogs.go | 6 +- cmd/climc/shell/alarms.go | 6 +- cmd/climc/shell/alarmtemplates.go | 6 +- cmd/climc/shell/baremetalnetworks.go | 6 +- cmd/climc/shell/baremetalstorages.go | 4 +- cmd/climc/shell/cachedimages.go | 4 +- cmd/climc/shell/cloudproviders.go | 6 +- cmd/climc/shell/cloudregions.go | 6 +- cmd/climc/shell/contactgroups.go | 4 +- cmd/climc/shell/contacts.go | 6 +- cmd/climc/shell/current.go | 2 +- cmd/climc/shell/disks.go | 6 +- cmd/climc/shell/dnsrecords.go | 6 +- cmd/climc/shell/domains.go | 6 +- cmd/climc/shell/email_config.go | 6 +- cmd/climc/shell/endpoints.go | 6 +- cmd/climc/shell/events.go | 8 +- cmd/climc/shell/groups.go | 6 +- cmd/climc/shell/hostcachedimages.go | 6 +- cmd/climc/shell/hosts.go | 6 +- cmd/climc/shell/hoststorages.go | 6 +- cmd/climc/shell/hostwires.go | 6 +- cmd/climc/shell/images.go | 6 +- cmd/climc/shell/instances.go | 4 +- cmd/climc/shell/isolatedevices.go | 6 +- cmd/climc/shell/k8s/clusters.go | 6 +- cmd/climc/shell/k8s/k8s.go | 10 +- cmd/climc/shell/k8s/nodes.go | 6 +- cmd/climc/shell/k8s/pods.go | 4 +- cmd/climc/shell/keypairs.go | 6 +- cmd/climc/shell/keystoneutils.go | 6 +- cmd/climc/shell/labels.go | 6 +- cmd/climc/shell/metric_types.go | 4 +- cmd/climc/shell/metrics.go | 4 +- cmd/climc/shell/monitor_metrics.go | 6 +- cmd/climc/shell/monitor_types.go | 4 +- cmd/climc/shell/monitorinputs.go | 4 +- cmd/climc/shell/monitortemplates.go | 6 +- cmd/climc/shell/networks.go | 6 +- cmd/climc/shell/nodes.go | 6 +- cmd/climc/shell/notification.go | 6 +- cmd/climc/shell/operations.go | 6 +- cmd/climc/shell/performances.go | 6 +- cmd/climc/shell/processes.go | 4 +- cmd/climc/shell/processlogs.go | 4 +- cmd/climc/shell/project_admin.go | 4 +- cmd/climc/shell/project_admin_candidates.go | 4 +- cmd/climc/shell/projects.go | 6 +- cmd/climc/shell/quotas.go | 6 +- cmd/climc/shell/rates.go | 6 +- cmd/climc/shell/recipient.go | 6 +- cmd/climc/shell/regions.go | 6 +- cmd/climc/shell/reservedips.go | 6 +- cmd/climc/shell/resource_details.go | 6 +- cmd/climc/shell/resource_fees.go | 6 +- cmd/climc/shell/role_assignments.go | 6 +- cmd/climc/shell/roles.go | 6 +- cmd/climc/shell/schedtaghosts.go | 4 +- cmd/climc/shell/schedtags.go | 6 +- cmd/climc/shell/schedulers.go | 6 +- cmd/climc/shell/secgrouprules.go | 6 +- cmd/climc/shell/secgroups.go | 6 +- cmd/climc/shell/serverdisks.go | 6 +- cmd/climc/shell/serverisolatedevices.go | 6 +- cmd/climc/shell/servernetworks.go | 6 +- cmd/climc/shell/servers.go | 6 +- cmd/climc/shell/service_hosts.go | 6 +- cmd/climc/shell/service_name_suggestions.go | 4 +- cmd/climc/shell/services.go | 6 +- cmd/climc/shell/servicetrees.go | 6 +- cmd/climc/shell/shell.go | 2 +- cmd/climc/shell/sms_configs.go | 6 +- cmd/climc/shell/specs.go | 6 +- cmd/climc/shell/storagecachedimages.go | 6 +- cmd/climc/shell/storagecaches.go | 6 +- cmd/climc/shell/storages.go | 6 +- cmd/climc/shell/tasks.go | 4 +- cmd/climc/shell/tenants.go | 4 +- cmd/climc/shell/treenodes.go | 6 +- cmd/climc/shell/usages.go | 6 +- cmd/climc/shell/users.go | 6 +- cmd/climc/shell/utils.go | 6 +- cmd/climc/shell/vcenters.go | 6 +- cmd/climc/shell/verification.go | 6 +- cmd/climc/shell/version.go | 4 +- cmd/climc/shell/vncproxy.go | 6 +- cmd/climc/shell/vpcs.go | 6 +- cmd/climc/shell/wires.go | 6 +- cmd/climc/shell/zones.go | 6 +- cmd/esxicli/main.go | 10 +- cmd/region-dns/main.go | 2 +- cmd/region/main.go | 2 +- cmd/scheduler/app/server.go | 20 +-- cmd/scheduler/main.go | 4 +- cmd/scheduler/options/options.go | 6 +- pkg/appctx/context.go | 2 +- pkg/appsrv/appsrv.go | 10 +- pkg/appsrv/context.go | 2 +- pkg/appsrv/dispatcher/dispatcher.go | 12 +- pkg/appsrv/dispatcher/handlers.go | 6 +- pkg/appsrv/dispatcher/jointdispatcher.go | 12 +- pkg/appsrv/fetch.go | 2 +- pkg/appsrv/handlers.go | 2 +- pkg/appsrv/send.go | 4 +- pkg/appsrv/stats.go | 2 +- pkg/appsrv/workers.go | 2 +- pkg/cloudcommon/app.go | 4 +- pkg/cloudcommon/auth.go | 2 +- pkg/cloudcommon/database.go | 6 +- pkg/cloudcommon/db/adminsharablevirtual.go | 8 +- pkg/cloudcommon/db/db_dispatcher.go | 26 ++-- pkg/cloudcommon/db/db_joint_dispatcher.go | 12 +- pkg/cloudcommon/db/enabledstatusstandalone.go | 6 +- pkg/cloudcommon/db/fetch.go | 6 +- pkg/cloudcommon/db/interface.go | 8 +- pkg/cloudcommon/db/jointbase.go | 10 +- pkg/cloudcommon/db/lockman/inmemory.go | 4 +- pkg/cloudcommon/db/lockman/inmemory_test.go | 2 +- pkg/cloudcommon/db/lockman/noop.go | 2 +- pkg/cloudcommon/db/metadata.go | 8 +- pkg/cloudcommon/db/modelbase.go | 6 +- pkg/cloudcommon/db/models.go | 4 +- pkg/cloudcommon/db/namevalidator.go | 4 +- pkg/cloudcommon/db/opslog.go | 10 +- pkg/cloudcommon/db/quotas/handler.go | 14 +- pkg/cloudcommon/db/quotas/quotas.go | 8 +- pkg/cloudcommon/db/quotas/stores.go | 6 +- pkg/cloudcommon/db/resourcebase.go | 6 +- pkg/cloudcommon/db/sharablevirtual.go | 6 +- pkg/cloudcommon/db/standalone.go | 16 +- pkg/cloudcommon/db/statusstandalone.go | 4 +- pkg/cloudcommon/db/taskman/coordinator.go | 8 +- pkg/cloudcommon/db/taskman/handler.go | 8 +- pkg/cloudcommon/db/taskman/interface.go | 4 +- pkg/cloudcommon/db/taskman/localtaskworker.go | 6 +- pkg/cloudcommon/db/taskman/subtasks.go | 6 +- pkg/cloudcommon/db/taskman/taskobjs.go | 4 +- pkg/cloudcommon/db/taskman/tasks.go | 24 +-- pkg/cloudcommon/db/tenantcache.go | 8 +- pkg/cloudcommon/db/usercache.go | 4 +- pkg/cloudcommon/db/virtualjointbase.go | 12 +- pkg/cloudcommon/db/virtualresource.go | 16 +- pkg/cloudcommon/notifyclient/notify.go | 4 +- pkg/cloudcommon/options.go | 8 +- pkg/cloudprovider/cloudprovider.go | 4 +- pkg/cloudprovider/resources.go | 4 +- pkg/compute/guestdrivers/aliyun.go | 20 +-- pkg/compute/guestdrivers/baremetals.go | 10 +- pkg/compute/guestdrivers/base.go | 14 +- pkg/compute/guestdrivers/esxi.go | 2 +- pkg/compute/guestdrivers/kvm.go | 10 +- pkg/compute/guestdrivers/managedvirtual.go | 12 +- pkg/compute/guestdrivers/virtualization.go | 14 +- pkg/compute/handlers.go | 16 +- pkg/compute/models/cachedimages.go | 22 +-- pkg/compute/models/cloudproviders.go | 18 +-- pkg/compute/models/cloudregions.go | 16 +- pkg/compute/models/disks.go | 32 ++-- pkg/compute/models/dnsrecords.go | 14 +- pkg/compute/models/groupguests.go | 6 +- pkg/compute/models/groupjoints.go | 2 +- pkg/compute/models/groupnetworks.go | 8 +- pkg/compute/models/groups.go | 2 +- pkg/compute/models/guestcdrom.go | 6 +- pkg/compute/models/guestdisks.go | 8 +- pkg/compute/models/guestdrivers.go | 10 +- pkg/compute/models/guestjoints.go | 2 +- pkg/compute/models/guestnetworks.go | 18 +-- pkg/compute/models/guests.go | 44 +++--- pkg/compute/models/hostjoints.go | 6 +- pkg/compute/models/hostnetworks.go | 8 +- pkg/compute/models/hosts.go | 32 ++-- pkg/compute/models/hostschedtags.go | 8 +- pkg/compute/models/hoststorages.go | 12 +- pkg/compute/models/hostwires.go | 10 +- pkg/compute/models/inframanagers.go | 4 +- pkg/compute/models/initdb.go | 4 +- pkg/compute/models/isolated_devices.go | 16 +- pkg/compute/models/keypairs.go | 10 +- pkg/compute/models/managedresource.go | 2 +- pkg/compute/models/netinterfaces.go | 10 +- pkg/compute/models/networks.go | 30 ++-- pkg/compute/models/quotas.go | 8 +- pkg/compute/models/reservedips.go | 12 +- pkg/compute/models/schedtags.go | 14 +- pkg/compute/models/secgrouprules.go | 16 +- pkg/compute/models/secgroups.go | 12 +- pkg/compute/models/storagecachedimages.go | 16 +- pkg/compute/models/storagecaches.go | 16 +- pkg/compute/models/storages.go | 20 +-- pkg/compute/models/usage.go | 6 +- pkg/compute/models/vcenters.go | 6 +- pkg/compute/models/vpcs.go | 20 +-- pkg/compute/models/wires.go | 16 +- pkg/compute/models/zones.go | 18 +-- pkg/compute/options/options.go | 2 +- pkg/compute/service/service.go | 20 +-- .../baremetal_convert_hypervisor_task.go | 10 +- .../tasks/cloud_provider_sync_info_task.go | 14 +- pkg/compute/tasks/disk_base_task.go | 4 +- pkg/compute/tasks/disk_delete_task.go | 10 +- pkg/compute/tasks/guest_base_task.go | 4 +- pkg/compute/tasks/guest_batch_create_task.go | 20 +-- pkg/compute/tasks/guest_create_task.go | 12 +- pkg/compute/tasks/guest_delete_task.go | 14 +- pkg/compute/tasks/guest_deploy_task.go | 10 +- .../tasks/guest_detach_all_disks_task.go | 8 +- pkg/compute/tasks/guest_detach_disk_task.go | 6 +- pkg/compute/tasks/guest_insert_iso_task.go | 6 +- pkg/compute/tasks/guest_start_task.go | 8 +- pkg/compute/tasks/guest_stop_task.go | 10 +- pkg/compute/tasks/guest_syncstatus_task.go | 12 +- pkg/compute/tasks/guest_undeploy_task.go | 10 +- pkg/compute/tasks/network_create_task.go | 12 +- pkg/compute/tasks/network_delete_task.go | 12 +- pkg/compute/tasks/storage_cache_image_task.go | 8 +- .../tasks/storage_uncache_image_task.go | 8 +- pkg/compute/tasks/vpc_create_task.go | 12 +- pkg/compute/tasks/vpc_delete_task.go | 12 +- pkg/compute/usages/handler.go | 22 +-- pkg/dns/dns.go | 12 +- pkg/dns/parse.go | 4 +- pkg/dns/reverse.go | 4 +- pkg/dns/setup.go | 2 +- pkg/httperrors/errors.go | 2 +- pkg/httperrors/httperrors.go | 4 +- pkg/mcclient/auth/auth.go | 6 +- pkg/mcclient/auth/middleware.go | 10 +- pkg/mcclient/mcclient.go | 4 +- pkg/mcclient/modules/base.go | 8 +- pkg/mcclient/modules/joint.go | 4 +- pkg/mcclient/modules/k8s/base.go | 2 +- pkg/mcclient/modules/k8s/cluster.go | 2 +- pkg/mcclient/modules/k8s/event.go | 2 +- pkg/mcclient/modules/k8s/node.go | 2 +- pkg/mcclient/modules/k8s/pod.go | 2 +- pkg/mcclient/modules/mod_alarmevents.go | 4 +- pkg/mcclient/modules/mod_contacts.go | 4 +- pkg/mcclient/modules/mod_domains.go | 8 +- pkg/mcclient/modules/mod_groups.go | 2 +- pkg/mcclient/modules/mod_hosts.go | 6 +- pkg/mcclient/modules/mod_images.go | 12 +- pkg/mcclient/modules/mod_infos.go | 4 +- pkg/mcclient/modules/mod_license.go | 4 +- pkg/mcclient/modules/mod_nodes.go | 4 +- pkg/mcclient/modules/mod_performances.go | 4 +- pkg/mcclient/modules/mod_projects.go | 6 +- pkg/mcclient/modules/mod_quotas.go | 4 +- pkg/mcclient/modules/mod_recipients.go | 4 +- pkg/mcclient/modules/mod_reservedips.go | 4 +- pkg/mcclient/modules/mod_roleassignments.go | 4 +- pkg/mcclient/modules/mod_roles.go | 6 +- pkg/mcclient/modules/mod_schedtags.go | 4 +- pkg/mcclient/modules/mod_scheduler.go | 4 +- pkg/mcclient/modules/mod_servers.go | 6 +- pkg/mcclient/modules/mod_servicehosts.go | 4 +- pkg/mcclient/modules/mod_specs.go | 6 +- pkg/mcclient/modules/mod_stastics.go | 4 +- pkg/mcclient/modules/mod_treenodes.go | 4 +- pkg/mcclient/modules/mod_usages.go | 4 +- pkg/mcclient/modules/mod_users.go | 6 +- pkg/mcclient/modules/mod_vncproxy.go | 4 +- pkg/mcclient/modules/modules.go | 4 +- pkg/mcclient/modules/resource.go | 8 +- pkg/mcclient/modules/version.go | 2 +- pkg/mcclient/session.go | 6 +- pkg/mcclient/token.go | 2 +- pkg/mcclient/tokenman.go | 2 +- pkg/mcclient/tokensimple.go | 4 +- pkg/proxy/http.go | 4 +- pkg/scheduler/algorithm/helper.go | 4 +- .../predicates/aggregate_predicate.go | 8 +- .../algorithm/predicates/baremetal/base.go | 6 +- .../predicates/baremetal/cpu_predicate.go | 4 +- .../predicates/baremetal/memory_predicate.go | 4 +- .../predicates/baremetal/network_predicate.go | 8 +- .../predicates/baremetal/status_predicate.go | 6 +- .../predicates/baremetal/storage_predicate.go | 8 +- .../predicates/guest/cpu_predicate.go | 4 +- .../predicates/guest/group_predicate.go | 4 +- .../predicates/guest/hypervisor_predicate.go | 8 +- .../guest/isolated_device_predicate.go | 4 +- .../predicates/guest/memory_predicate.go | 4 +- .../predicates/guest/migrate_predicate.go | 4 +- .../predicates/guest/nest_predicate.go | 4 +- .../predicates/guest/network_predicate.go | 10 +- .../predicates/guest/status_predicate.go | 4 +- .../predicates/guest/storage_predicate.go | 6 +- .../algorithm/predicates/predicates.go | 10 +- .../priorities/guest/avoid_same_cluster.go | 4 +- .../priorities/guest/avoid_same_host.go | 4 +- .../algorithm/priorities/guest/capacity.go | 4 +- .../algorithm/priorities/guest/creating.go | 4 +- .../algorithm/priorities/guest/lowload.go | 4 +- .../algorithm/priorities/priorities.go | 6 +- pkg/scheduler/algorithmprovider/baremetal.go | 8 +- pkg/scheduler/algorithmprovider/defaults.go | 10 +- pkg/scheduler/api/candidate.go | 2 +- pkg/scheduler/api/sched.go | 6 +- pkg/scheduler/api/types.go | 2 +- pkg/scheduler/cache/cache.go | 6 +- pkg/scheduler/cache/candidate/baremetals.go | 12 +- pkg/scheduler/cache/candidate/candidate.go | 2 +- .../cache/candidate/candidate_test.go | 8 +- pkg/scheduler/cache/candidate/default.go | 10 +- pkg/scheduler/cache/candidate/desc.go | 8 +- pkg/scheduler/cache/candidate/hosts.go | 20 +-- pkg/scheduler/cache/candidate/interface.go | 2 +- pkg/scheduler/cache/db/db.go | 2 +- pkg/scheduler/cache/db/default.go | 8 +- pkg/scheduler/cache/group_manager.go | 2 +- pkg/scheduler/cache/item.go | 2 +- pkg/scheduler/cache/sync/default.go | 8 +- pkg/scheduler/cache/sync/network.go | 4 +- pkg/scheduler/cache/sync/network_data.go | 6 +- pkg/scheduler/cache/sync/networks/db/db.go | 4 +- pkg/scheduler/cache/sync/sync.go | 2 +- pkg/scheduler/core/context.go | 4 +- pkg/scheduler/core/generic_scheduler.go | 12 +- pkg/scheduler/core/resource.go | 2 +- pkg/scheduler/core/types.go | 4 +- .../data_manager/candidate_manager.go | 12 +- pkg/scheduler/data_manager/network_manager.go | 8 +- .../data_manager/reserved_algorithm.go | 4 +- pkg/scheduler/data_manager/reserved_pool.go | 2 +- pkg/scheduler/db/db.go | 2 +- pkg/scheduler/db/models/default.go | 2 +- pkg/scheduler/db/models/disk.go | 2 +- pkg/scheduler/db/models/guest.go | 2 +- pkg/scheduler/db/models/host.go | 4 +- pkg/scheduler/db/models/networks.go | 2 +- pkg/scheduler/db/models/storage.go | 2 +- pkg/scheduler/factory/factory.go | 4 +- pkg/scheduler/factory/plugins.go | 6 +- pkg/scheduler/handler/handler.go | 10 +- pkg/scheduler/handler/ping.go | 6 +- pkg/scheduler/handler/version.go | 2 +- pkg/scheduler/manager/completed_queue.go | 8 +- pkg/scheduler/manager/expire_queue.go | 8 +- pkg/scheduler/manager/manager.go | 12 +- pkg/scheduler/manager/scheduler.go | 8 +- pkg/scheduler/manager/task_history.go | 6 +- pkg/scheduler/manager/task_queue.go | 6 +- pkg/scheduler/util/baremetal/diskconfig.go | 8 +- .../util/baremetal/diskconfig_test.go | 4 +- pkg/util/aliyun/aliyun.go | 8 +- pkg/util/aliyun/disk.go | 10 +- pkg/util/aliyun/host.go | 8 +- pkg/util/aliyun/image.go | 8 +- pkg/util/aliyun/instance.go | 14 +- pkg/util/aliyun/instancenic.go | 4 +- pkg/util/aliyun/instancetype.go | 2 +- pkg/util/aliyun/keypair.go | 2 +- pkg/util/aliyun/provider/provider.go | 8 +- pkg/util/aliyun/region.go | 10 +- pkg/util/aliyun/securitygroup.go | 6 +- pkg/util/aliyun/shell/disk.go | 4 +- pkg/util/aliyun/shell/image.go | 4 +- pkg/util/aliyun/shell/instance.go | 4 +- pkg/util/aliyun/shell/instancetype.go | 4 +- pkg/util/aliyun/shell/keypair.go | 4 +- pkg/util/aliyun/shell/oss.go | 4 +- pkg/util/aliyun/shell/printutils.go | 2 +- pkg/util/aliyun/shell/region.go | 4 +- pkg/util/aliyun/shell/routetable.go | 4 +- pkg/util/aliyun/shell/secgroup.go | 4 +- pkg/util/aliyun/shell/task.go | 4 +- pkg/util/aliyun/shell/vpc.go | 4 +- pkg/util/aliyun/shell/vrouter.go | 4 +- pkg/util/aliyun/shell/vswitch.go | 4 +- pkg/util/aliyun/shell/zone.go | 4 +- pkg/util/aliyun/storage.go | 8 +- pkg/util/aliyun/storagecache.go | 12 +- pkg/util/aliyun/task.go | 2 +- pkg/util/aliyun/vpc.go | 4 +- pkg/util/aliyun/vswitch.go | 12 +- pkg/util/aliyun/wire.go | 4 +- pkg/util/aliyun/zone.go | 6 +- pkg/util/esxi/datacenter.go | 2 +- pkg/util/esxi/host.go | 10 +- pkg/util/esxi/manager.go | 8 +- pkg/util/esxi/mobase.go | 4 +- pkg/util/esxi/provider/provider.go | 8 +- pkg/util/esxi/shell/datacenter.go | 4 +- pkg/util/esxi/shell/host.go | 4 +- pkg/util/esxi/shell/store.go | 4 +- pkg/util/esxi/shell/utils.go | 2 +- pkg/util/esxi/shell/virtualmachine.go | 6 +- pkg/util/esxi/storage.go | 6 +- pkg/util/esxi/virtualmachine.go | 6 +- pkg/util/gin/middleware/keystone_auth.go | 2 +- pkg/util/gin/middleware/log.go | 2 +- pkg/util/httputils/httputils.go | 8 +- pkg/util/printutils/printgetter.go | 6 +- pkg/util/printutils/printjson.go | 6 +- pkg/util/printutils/printobj.go | 4 +- .../yunionio/pkg/util/goroutine_pool/fake.go | 18 --- vendor/github.com/yunionio/sqlchemy/debug.go | 5 - .../x}/jsonutils/.gitignore | 0 .../x}/jsonutils/LICENSE | 0 .../x}/jsonutils/README.md | 0 .../x}/jsonutils/access.go | 2 +- .../x}/jsonutils/clone.go | 2 +- .../x}/jsonutils/dict.go | 0 vendor/yunion.io/x/jsonutils/doc.go | 1 + .../x}/jsonutils/equals.go | 2 +- .../x}/jsonutils/iszero.go | 0 .../x}/jsonutils/jsonutils.go | 2 +- .../x}/jsonutils/length.go | 0 .../x}/jsonutils/marshal.go | 10 +- .../x}/jsonutils/querystring.go | 2 +- .../x}/jsonutils/reflect.go | 2 +- .../x}/jsonutils/size.go | 0 .../x}/jsonutils/unmarshal.go | 12 +- .../x}/jsonutils/update.go | 0 .../x}/jsonutils/utils.go | 0 .../x}/jsonutils/yamlutils.go | 0 .../yunionio => yunion.io/x}/log/.gitignore | 0 .../yunionio => yunion.io/x}/log/LICENSE | 0 .../yunionio => yunion.io/x}/log/README.md | 2 +- vendor/yunion.io/x/log/doc.go | 1 + .../yunionio => yunion.io/x}/log/formatter.go | 0 .../x}/log/hooks/caller.go | 0 vendor/yunion.io/x/log/hooks/doc.go | 1 + .../x}/log/hooks/stdio.go | 0 .../yunionio => yunion.io/x}/log/log.go | 2 +- .../yunionio => yunion.io/x}/pkg/LICENSE | 0 vendor/yunion.io/x/pkg/gotypes/doc.go | 1 + .../x}/pkg/gotypes/gotypes.go | 9 +- .../x}/pkg/gotypes/serialize.go | 0 vendor/yunion.io/x/pkg/prettytable/doc.go | 1 + .../x}/pkg/prettytable/prettytable.go | 0 vendor/yunion.io/x/pkg/trace/doc.go | 1 + .../x}/pkg/trace/trace.go | 6 +- vendor/yunion.io/x/pkg/tristate/doc.go | 1 + .../x}/pkg/tristate/tristate.go | 0 vendor/yunion.io/x/pkg/util/cache/doc.go | 1 + .../x}/pkg/util/cache/expiration_cache.go | 4 +- .../pkg/util/cache/expiration_cache_fakes.go | 4 +- .../x}/pkg/util/cache/fifo.go | 2 +- .../x}/pkg/util/cache/index.go | 2 +- .../x}/pkg/util/cache/lru.go | 0 .../x}/pkg/util/cache/store.go | 0 .../x}/pkg/util/cache/thread_safe_store.go | 2 +- .../x}/pkg/util/clock/clock.go | 0 vendor/yunion.io/x/pkg/util/clock/doc.go | 1 + .../x}/pkg/util/compare/compare.go | 0 vendor/yunion.io/x/pkg/util/compare/doc.go | 1 + .../x}/pkg/util/compare/syncresults.go | 0 vendor/yunion.io/x/pkg/util/errors/doc.go | 1 + .../x}/pkg/util/errors/errors.go | 0 .../x}/pkg/util/errors/http_error.go | 0 vendor/yunion.io/x/pkg/util/fifoutils/doc.go | 1 + .../x}/pkg/util/fifoutils/fifoutils.go | 2 +- vendor/yunion.io/x/pkg/util/fileutils/doc.go | 1 + .../x}/pkg/util/fileutils/filesize.go | 2 +- .../yunion.io/x/pkg/util/filterclause/doc.go | 1 + .../x}/pkg/util/filterclause/filterclause.go | 6 +- .../x/pkg/util/goroutine_pool/doc.go | 1 + .../x}/pkg/util/goroutine_pool/gp.go | 4 +- vendor/yunion.io/x/pkg/util/netutils/doc.go | 1 + .../x}/pkg/util/netutils/netutils.go | 2 +- vendor/yunion.io/x/pkg/util/osprofile/doc.go | 1 + .../x}/pkg/util/osprofile/osprofile.go | 2 +- vendor/yunion.io/x/pkg/util/prometheus/doc.go | 1 + .../x}/pkg/util/prometheus/gin_handler.go | 0 .../yunion.io/x/pkg/util/reflectutils/doc.go | 1 + .../x}/pkg/util/reflectutils/reflectutils.go | 20 ++- vendor/yunion.io/x/pkg/util/regutils/doc.go | 1 + .../x}/pkg/util/regutils/regutils.go | 0 vendor/yunion.io/x/pkg/util/runtime/doc.go | 1 + .../x}/pkg/util/runtime/runtime.go | 2 +- vendor/yunion.io/x/pkg/util/seclib/doc.go | 1 + .../x}/pkg/util/seclib/seclib.go | 0 vendor/yunion.io/x/pkg/util/secrules/doc.go | 1 + .../x}/pkg/util/secrules/secrules.go | 20 +-- .../x}/pkg/util/sets/byte.go | 0 vendor/yunion.io/x/pkg/util/sets/doc.go | 1 + .../x}/pkg/util/sets/empty.go | 0 .../x}/pkg/util/sets/int.go | 0 .../x}/pkg/util/sets/int64.go | 0 .../x}/pkg/util/sets/string.go | 0 .../yunion.io/x/pkg/util/stringutils/doc.go | 1 + .../x}/pkg/util/stringutils/stringutils.go | 6 +- vendor/yunion.io/x/pkg/util/sysutils/doc.go | 1 + .../x}/pkg/util/sysutils/storagetypes.go | 0 vendor/yunion.io/x/pkg/util/timeutils/doc.go | 1 + .../x}/pkg/util/timeutils/timeutils.go | 2 +- vendor/yunion.io/x/pkg/util/trace/doc.go | 1 + .../x}/pkg/util/trace/trace.go | 2 +- vendor/yunion.io/x/pkg/util/ttlpool/doc.go | 1 + .../x}/pkg/util/ttlpool/pool.go | 4 +- .../x}/pkg/util/version/base.go | 0 vendor/yunion.io/x/pkg/util/version/doc.go | 1 + .../x}/pkg/util/version/version.go | 0 vendor/yunion.io/x/pkg/util/wait/doc.go | 1 + .../x}/pkg/util/wait/wait.go | 2 +- vendor/yunion.io/x/pkg/util/workqueue/doc.go | 1 + .../x}/pkg/util/workqueue/parallelizer.go | 2 +- .../x}/pkg/utils/crypt.go | 0 vendor/yunion.io/x/pkg/utils/doc.go | 1 + .../x}/pkg/utils/misc.go | 0 .../yunionio => yunion.io/x}/pkg/utils/net.go | 0 .../x}/pkg/utils/pidfile.go | 0 .../x}/pkg/utils/tags.go | 0 .../x}/pkg/utils/utils.go | 0 .../x}/pkg/utils/uuid.go | 2 +- .../x}/pkg/utils/wait_group.go | 0 .../yunionio => yunion.io/x}/sqlchemy/LICENSE | 0 .../x}/sqlchemy/README.md | 0 .../x}/sqlchemy/column.go | 39 +++-- .../x}/sqlchemy/conditions.go | 22 +-- .../x}/sqlchemy/const.go | 0 vendor/yunion.io/x/sqlchemy/debug.go | 29 ++++ vendor/yunion.io/x/sqlchemy/doc.go | 1 + .../x}/sqlchemy/errors.go | 0 vendor/yunion.io/x/sqlchemy/field_update.go | 143 ++++++++++++++++++ .../x}/sqlchemy/filter.go | 0 .../x}/sqlchemy/functions.go | 0 .../x}/sqlchemy/insert.go | 49 +++++- .../x}/sqlchemy/parser.go | 12 +- .../x}/sqlchemy/query.go | 4 +- .../x}/sqlchemy/rawquery.go | 0 .../x}/sqlchemy/reflect.go | 10 +- .../yunionio => yunion.io/x}/sqlchemy/sql.go | 2 +- .../yunionio => yunion.io/x}/sqlchemy/sync.go | 4 +- .../x}/sqlchemy/table.go | 4 +- .../x}/sqlchemy/tablealias.go | 0 .../x}/sqlchemy/update.go | 6 +- .../x}/structarg/.gitignore | 0 .../x}/structarg/LICENSE | 0 .../x}/structarg/README.md | 0 vendor/yunion.io/x/structarg/doc.go | 1 + .../x}/structarg/structarg.go | 6 +- 542 files changed, 1848 insertions(+), 1612 deletions(-) delete mode 100644 vendor/github.com/yunionio/pkg/util/goroutine_pool/fake.go delete mode 100644 vendor/github.com/yunionio/sqlchemy/debug.go rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/.gitignore (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/LICENSE (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/README.md (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/access.go (99%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/clone.go (95%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/dict.go (100%) create mode 100644 vendor/yunion.io/x/jsonutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/equals.go (96%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/iszero.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/jsonutils.go (99%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/length.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/marshal.go (96%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/querystring.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/reflect.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/size.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/unmarshal.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/update.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/utils.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/jsonutils/yamlutils.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/log/.gitignore (100%) rename vendor/{github.com/yunionio => yunion.io/x}/log/LICENSE (100%) rename vendor/{github.com/yunionio => yunion.io/x}/log/README.md (93%) create mode 100644 vendor/yunion.io/x/log/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/log/formatter.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/log/hooks/caller.go (100%) create mode 100644 vendor/yunion.io/x/log/hooks/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/log/hooks/stdio.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/log/log.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/LICENSE (100%) create mode 100644 vendor/yunion.io/x/pkg/gotypes/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/gotypes/gotypes.go (97%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/gotypes/serialize.go (100%) create mode 100644 vendor/yunion.io/x/pkg/prettytable/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/prettytable/prettytable.go (100%) create mode 100644 vendor/yunion.io/x/pkg/trace/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/trace/trace.go (98%) create mode 100644 vendor/yunion.io/x/pkg/tristate/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/tristate/tristate.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/cache/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/expiration_cache.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/expiration_cache_fakes.go (92%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/fifo.go (99%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/index.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/lru.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/store.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/cache/thread_safe_store.go (99%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/clock/clock.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/clock/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/compare/compare.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/compare/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/compare/syncresults.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/errors/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/errors/errors.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/errors/http_error.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/fifoutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/fifoutils/fifoutils.go (96%) create mode 100644 vendor/yunion.io/x/pkg/util/fileutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/fileutils/filesize.go (96%) create mode 100644 vendor/yunion.io/x/pkg/util/filterclause/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/filterclause/filterclause.go (95%) create mode 100644 vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/goroutine_pool/gp.go (98%) create mode 100644 vendor/yunion.io/x/pkg/util/netutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/netutils/netutils.go (99%) create mode 100644 vendor/yunion.io/x/pkg/util/osprofile/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/osprofile/osprofile.go (98%) create mode 100644 vendor/yunion.io/x/pkg/util/prometheus/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/prometheus/gin_handler.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/reflectutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/reflectutils/reflectutils.go (90%) create mode 100644 vendor/yunion.io/x/pkg/util/regutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/regutils/regutils.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/runtime/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/runtime/runtime.go (99%) create mode 100644 vendor/yunion.io/x/pkg/util/seclib/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/seclib/seclib.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/secrules/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/secrules/secrules.go (88%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sets/byte.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/sets/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sets/empty.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sets/int.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sets/int64.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sets/string.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/stringutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/stringutils/stringutils.go (91%) create mode 100644 vendor/yunion.io/x/pkg/util/sysutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/sysutils/storagetypes.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/timeutils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/timeutils/timeutils.go (98%) create mode 100644 vendor/yunion.io/x/pkg/util/trace/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/trace/trace.go (98%) create mode 100644 vendor/yunion.io/x/pkg/util/ttlpool/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/ttlpool/pool.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/version/base.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/version/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/version/version.go (100%) create mode 100644 vendor/yunion.io/x/pkg/util/wait/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/wait/wait.go (99%) create mode 100644 vendor/yunion.io/x/pkg/util/workqueue/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/util/workqueue/parallelizer.go (92%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/crypt.go (100%) create mode 100644 vendor/yunion.io/x/pkg/utils/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/misc.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/net.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/pidfile.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/tags.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/utils.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/uuid.go (90%) rename vendor/{github.com/yunionio => yunion.io/x}/pkg/utils/wait_group.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/LICENSE (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/README.md (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/column.go (94%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/conditions.go (94%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/const.go (100%) create mode 100644 vendor/yunion.io/x/sqlchemy/debug.go create mode 100644 vendor/yunion.io/x/sqlchemy/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/errors.go (100%) create mode 100644 vendor/yunion.io/x/sqlchemy/field_update.go rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/filter.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/functions.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/insert.go (66%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/parser.go (92%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/query.go (99%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/rawquery.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/reflect.go (95%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/sql.go (95%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/sync.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/table.go (98%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/tablealias.go (100%) rename vendor/{github.com/yunionio => yunion.io/x}/sqlchemy/update.go (97%) rename vendor/{github.com/yunionio => yunion.io/x}/structarg/.gitignore (100%) rename vendor/{github.com/yunionio => yunion.io/x}/structarg/LICENSE (100%) rename vendor/{github.com/yunionio => yunion.io/x}/structarg/README.md (100%) create mode 100644 vendor/yunion.io/x/structarg/doc.go rename vendor/{github.com/yunionio => yunion.io/x}/structarg/structarg.go (99%) diff --git a/Gopkg.lock b/Gopkg.lock index dd3ce49855..eb4115111f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -566,68 +566,6 @@ ] revision = "bbd99532a768d2fe369079ceda730e30726ae1a6" -[[projects]] - branch = "release/2.0.0" - name = "github.com/yunionio/jsonutils" - packages = ["."] - revision = "0f3f30adfdac3dec6ffbbfb72116f6f908134f63" - -[[projects]] - branch = "master" - name = "github.com/yunionio/log" - packages = [ - ".", - "hooks" - ] - revision = "d2fe137411c230927e28dd82b1a3bcb618dbb28d" - -[[projects]] - name = "github.com/yunionio/pkg" - packages = [ - "gotypes", - "prettytable", - "trace", - "tristate", - "util/cache", - "util/clock", - "util/compare", - "util/errors", - "util/fifoutils", - "util/fileutils", - "util/filterclause", - "util/goroutine_pool", - "util/netutils", - "util/osprofile", - "util/prometheus", - "util/reflectutils", - "util/regutils", - "util/runtime", - "util/seclib", - "util/secrules", - "util/sets", - "util/stringutils", - "util/sysutils", - "util/timeutils", - "util/trace", - "util/ttlpool", - "util/version", - "util/wait", - "util/workqueue", - "utils" - ] - revision = "8c5eab6f0b758d3888fd9041419e38a5b1129725" - -[[projects]] - name = "github.com/yunionio/sqlchemy" - packages = ["."] - revision = "a14641a90b9e5c72868b7a8358d62ea1d83eab53" - -[[projects]] - branch = "master" - name = "github.com/yunionio/structarg" - packages = ["."] - revision = "7c3bbf8a77dc7b33ccad90087a296f3e34399d09" - [[projects]] branch = "master" name = "golang.org/x/crypto" @@ -902,9 +840,72 @@ revision = "7d04d0e2a0a1a4d4a1cd6baa432a2301492e4e65" version = "v8.0.0" +[[projects]] + branch = "master" + name = "yunion.io/x/jsonutils" + packages = ["."] + revision = "a86e16793be4a6f4c5ea9203e40c2a0a9361efb8" + +[[projects]] + branch = "master" + name = "yunion.io/x/log" + packages = [ + ".", + "hooks" + ] + revision = "a10b94c5038480920262e0f344656328434955a2" + +[[projects]] + name = "yunion.io/x/pkg" + packages = [ + "gotypes", + "prettytable", + "trace", + "tristate", + "util/cache", + "util/clock", + "util/compare", + "util/errors", + "util/fifoutils", + "util/fileutils", + "util/filterclause", + "util/goroutine_pool", + "util/netutils", + "util/osprofile", + "util/prometheus", + "util/reflectutils", + "util/regutils", + "util/runtime", + "util/seclib", + "util/secrules", + "util/sets", + "util/stringutils", + "util/sysutils", + "util/timeutils", + "util/trace", + "util/ttlpool", + "util/version", + "util/wait", + "util/workqueue", + "utils" + ] + revision = "07cad0cb1df5155b3bfa15079594d01050931554" + +[[projects]] + branch = "master" + name = "yunion.io/x/sqlchemy" + packages = ["."] + revision = "f6a47145f9b94ebff1517017e790f068698b5b5a" + +[[projects]] + branch = "master" + name = "yunion.io/x/structarg" + packages = ["."] + revision = "5f84a68c40a2d8eb923f0607f809cbda8d5b944a" + [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "aa5af605c21bc592cbc237ad3539bc2cd9bbe5b8495c6c2d22e4a3bd8b148633" + inputs-digest = "cff7836c426e8d0c9f6d7220994a2fbcd8b3fa2f4604e1aba3e9a0f50a0da98f" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 8a280cd277..3343180803 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -30,24 +30,26 @@ version = "0.2.2" [[constraint]] - branch = "release/2.0.0" - name = "github.com/yunionio/jsonutils" + branch = "master" + name = "yunion.io/x/jsonutils" [[constraint]] - revision = "a14641a90b9e5c72868b7a8358d62ea1d83eab53" - name = "github.com/yunionio/sqlchemy" + #revision = "a14641a90b9e5c72868b7a8358d62ea1d83eab53" + branch = "master" + name = "yunion.io/x/sqlchemy" [[constraint]] branch = "master" - name = "github.com/yunionio/log" + name = "yunion.io/x/log" [[constraint]] - revision = "8c5eab6f0b758d3888fd9041419e38a5b1129725" - name = "github.com/yunionio/pkg" + revision = "07cad0cb1df5155b3bfa15079594d01050931554" + #branch = "master" + name = "yunion.io/x/pkg" [[constraint]] branch = "master" - name = "github.com/yunionio/structarg" + name = "yunion.io/x/structarg" # client-go v8.0.0 uses apimachinery 103fd098999dc9c0c88536f5c9ad2e5da39373ae # and api 072894a440bdee3a891dea811fe42902311cd2a3 (see Godep.json). go dep diff --git a/Makefile b/Makefile index bb21232025..228037d447 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ ##################################################### -REPO_PREFIX := github.com/yunionio/onecloud +REPO_PREFIX := yunion.io/x/onecloud VENDOR_PATH := $(REPO_PREFIX)/vendor -VERSION_PKG := $(VENDOR_PATH)/github.com/yunionio/pkg/util/version +VERSION_PKG := $(VENDOR_PATH)/yunion.io/x/pkg/util/version ROOT_DIR := $(shell pwd) BUILD_DIR := $(ROOT_DIR)/_output BIN_DIR := $(BUILD_DIR)/bin diff --git a/cmd/aliyuncli/main.go b/cmd/aliyuncli/main.go index c7a71d84f7..f0252647de 100644 --- a/cmd/aliyuncli/main.go +++ b/cmd/aliyuncli/main.go @@ -4,12 +4,12 @@ import ( "fmt" "os" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" - "github.com/yunionio/structarg" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" + "yunion.io/x/structarg" - _ "github.com/yunionio/onecloud/pkg/util/aliyun/shell" + _ "yunion.io/x/onecloud/pkg/util/aliyun/shell" ) type BaseOptions struct { diff --git a/cmd/climc/climc.go b/cmd/climc/climc.go index 5559b5b96d..217724a188 100644 --- a/cmd/climc/climc.go +++ b/cmd/climc/climc.go @@ -6,14 +6,14 @@ import ( "strings" "github.com/c-bata/go-prompt" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/version" - "github.com/yunionio/structarg" + "yunion.io/x/log" + "yunion.io/x/pkg/util/version" + "yunion.io/x/structarg" - "github.com/yunionio/onecloud/cmd/climc/promputils" - "github.com/yunionio/onecloud/cmd/climc/shell" - _ "github.com/yunionio/onecloud/cmd/climc/shell/k8s" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/cmd/climc/promputils" + "yunion.io/x/onecloud/cmd/climc/shell" + _ "yunion.io/x/onecloud/cmd/climc/shell/k8s" + "yunion.io/x/onecloud/pkg/mcclient" ) type BaseOptions struct { diff --git a/cmd/climc/promputils/executor.go b/cmd/climc/promputils/executor.go index cf13f76cc1..7ef8e7dc89 100644 --- a/cmd/climc/promputils/executor.go +++ b/cmd/climc/promputils/executor.go @@ -9,9 +9,9 @@ import ( "regexp" "strings" - "github.com/yunionio/structarg" + "yunion.io/x/structarg" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) var ( diff --git a/cmd/climc/shell/actions.go b/cmd/climc/shell/actions.go index 8ac3dfa829..52c49ad006 100644 --- a/cmd/climc/shell/actions.go +++ b/cmd/climc/shell/actions.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type BaseActionListOptions struct { diff --git a/cmd/climc/shell/alarmevents.go b/cmd/climc/shell/alarmevents.go index 76fca555a8..488fe39599 100644 --- a/cmd/climc/shell/alarmevents.go +++ b/cmd/climc/shell/alarmevents.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/alarmlogs.go b/cmd/climc/shell/alarmlogs.go index e5e8d89d4a..9ceb4c8398 100644 --- a/cmd/climc/shell/alarmlogs.go +++ b/cmd/climc/shell/alarmlogs.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/alarms.go b/cmd/climc/shell/alarms.go index e13b26faeb..876fbdb714 100644 --- a/cmd/climc/shell/alarms.go +++ b/cmd/climc/shell/alarms.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/alarmtemplates.go b/cmd/climc/shell/alarmtemplates.go index b8a842ed37..fe5e88f93a 100644 --- a/cmd/climc/shell/alarmtemplates.go +++ b/cmd/climc/shell/alarmtemplates.go @@ -3,10 +3,10 @@ package shell import ( "strings" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/baremetalnetworks.go b/cmd/climc/shell/baremetalnetworks.go index b09ceb1e87..e50649b058 100644 --- a/cmd/climc/shell/baremetalnetworks.go +++ b/cmd/climc/shell/baremetalnetworks.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/baremetalstorages.go b/cmd/climc/shell/baremetalstorages.go index bf20ad452e..d2ff553bad 100644 --- a/cmd/climc/shell/baremetalstorages.go +++ b/cmd/climc/shell/baremetalstorages.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/cachedimages.go b/cmd/climc/shell/cachedimages.go index aba58cf6f8..8f0da36818 100644 --- a/cmd/climc/shell/cachedimages.go +++ b/cmd/climc/shell/cachedimages.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/cloudproviders.go b/cmd/climc/shell/cloudproviders.go index fae9483f5f..edfb638d90 100644 --- a/cmd/climc/shell/cloudproviders.go +++ b/cmd/climc/shell/cloudproviders.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/cloudregions.go b/cmd/climc/shell/cloudregions.go index 143d0720af..3093838000 100644 --- a/cmd/climc/shell/cloudregions.go +++ b/cmd/climc/shell/cloudregions.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/contactgroups.go b/cmd/climc/shell/contactgroups.go index 1c90f3471a..db2af9df11 100644 --- a/cmd/climc/shell/contactgroups.go +++ b/cmd/climc/shell/contactgroups.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/contacts.go b/cmd/climc/shell/contacts.go index df4a7ae588..69b000f0fa 100644 --- a/cmd/climc/shell/contacts.go +++ b/cmd/climc/shell/contacts.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/current.go b/cmd/climc/shell/current.go index 0328802930..05dc8b12f2 100644 --- a/cmd/climc/shell/current.go +++ b/cmd/climc/shell/current.go @@ -1,7 +1,7 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) func init() { diff --git a/cmd/climc/shell/disks.go b/cmd/climc/shell/disks.go index 35be0ab2bb..3f4d35033b 100644 --- a/cmd/climc/shell/disks.go +++ b/cmd/climc/shell/disks.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/dnsrecords.go b/cmd/climc/shell/dnsrecords.go index b692c588ae..45b7c923ff 100644 --- a/cmd/climc/shell/dnsrecords.go +++ b/cmd/climc/shell/dnsrecords.go @@ -3,10 +3,10 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type DNSRecordOptions struct { diff --git a/cmd/climc/shell/domains.go b/cmd/climc/shell/domains.go index c8e6490021..7d89136fb9 100644 --- a/cmd/climc/shell/domains.go +++ b/cmd/climc/shell/domains.go @@ -3,10 +3,10 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/email_config.go b/cmd/climc/shell/email_config.go index 1966116d7e..7425aec620 100644 --- a/cmd/climc/shell/email_config.go +++ b/cmd/climc/shell/email_config.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/endpoints.go b/cmd/climc/shell/endpoints.go index 94c86caac9..94a02de9c5 100644 --- a/cmd/climc/shell/endpoints.go +++ b/cmd/climc/shell/endpoints.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/events.go b/cmd/climc/shell/events.go index f23523ddec..f458f62e7c 100644 --- a/cmd/climc/shell/events.go +++ b/cmd/climc/shell/events.go @@ -1,11 +1,11 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/mcclient/modules/k8s" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules/k8s" ) type BaseEventListOptions struct { diff --git a/cmd/climc/shell/groups.go b/cmd/climc/shell/groups.go index e6172cb763..af83b483b5 100644 --- a/cmd/climc/shell/groups.go +++ b/cmd/climc/shell/groups.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/hostcachedimages.go b/cmd/climc/shell/hostcachedimages.go index eed415c0e8..fbfa6cc69c 100644 --- a/cmd/climc/shell/hostcachedimages.go +++ b/cmd/climc/shell/hostcachedimages.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/hosts.go b/cmd/climc/shell/hosts.go index 062074928b..1f12bc8433 100644 --- a/cmd/climc/shell/hosts.go +++ b/cmd/climc/shell/hosts.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/hoststorages.go b/cmd/climc/shell/hoststorages.go index 5bf0231862..3085b10d0a 100644 --- a/cmd/climc/shell/hoststorages.go +++ b/cmd/climc/shell/hoststorages.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/hostwires.go b/cmd/climc/shell/hostwires.go index f77d73d4ea..f27163f1a0 100644 --- a/cmd/climc/shell/hostwires.go +++ b/cmd/climc/shell/hostwires.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/images.go b/cmd/climc/shell/images.go index 890a443749..4f0ba0e672 100644 --- a/cmd/climc/shell/images.go +++ b/cmd/climc/shell/images.go @@ -6,9 +6,9 @@ import ( "os" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type ImageOptionalOptions struct { diff --git a/cmd/climc/shell/instances.go b/cmd/climc/shell/instances.go index eae7e9b6ef..ce2f6a7c70 100644 --- a/cmd/climc/shell/instances.go +++ b/cmd/climc/shell/instances.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/isolatedevices.go b/cmd/climc/shell/isolatedevices.go index 4c112bfbcf..65ddfddc19 100644 --- a/cmd/climc/shell/isolatedevices.go +++ b/cmd/climc/shell/isolatedevices.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/k8s/clusters.go b/cmd/climc/shell/k8s/clusters.go index 5f80721d5d..d85e2303a0 100644 --- a/cmd/climc/shell/k8s/clusters.go +++ b/cmd/climc/shell/k8s/clusters.go @@ -3,10 +3,10 @@ package k8s import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules/k8s" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules/k8s" ) func initCluster() { diff --git a/cmd/climc/shell/k8s/k8s.go b/cmd/climc/shell/k8s/k8s.go index 2d760f5adc..2e63757294 100644 --- a/cmd/climc/shell/k8s/k8s.go +++ b/cmd/climc/shell/k8s/k8s.go @@ -3,12 +3,12 @@ package k8s import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/cmd/climc/shell" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/mcclient/modules/k8s" - "github.com/yunionio/onecloud/pkg/util/printutils" + "yunion.io/x/onecloud/cmd/climc/shell" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules/k8s" + "yunion.io/x/onecloud/pkg/util/printutils" ) func init() { diff --git a/cmd/climc/shell/k8s/nodes.go b/cmd/climc/shell/k8s/nodes.go index 0edfab0940..9c3f840616 100644 --- a/cmd/climc/shell/k8s/nodes.go +++ b/cmd/climc/shell/k8s/nodes.go @@ -3,10 +3,10 @@ package k8s import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules/k8s" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules/k8s" ) func initNode() { diff --git a/cmd/climc/shell/k8s/pods.go b/cmd/climc/shell/k8s/pods.go index d3bc53a387..8d2fdd0d3b 100644 --- a/cmd/climc/shell/k8s/pods.go +++ b/cmd/climc/shell/k8s/pods.go @@ -3,8 +3,8 @@ package k8s import ( "fmt" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules/k8s" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules/k8s" ) func initPod() { diff --git a/cmd/climc/shell/keypairs.go b/cmd/climc/shell/keypairs.go index 9247656ef7..a13ae163a7 100644 --- a/cmd/climc/shell/keypairs.go +++ b/cmd/climc/shell/keypairs.go @@ -4,9 +4,9 @@ import ( "fmt" "io/ioutil" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/keystoneutils.go b/cmd/climc/shell/keystoneutils.go index 7159b242c3..0e6910a1a2 100644 --- a/cmd/climc/shell/keystoneutils.go +++ b/cmd/climc/shell/keystoneutils.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func getUserId(s *mcclient.ClientSession, user string, domain string) (string, error) { diff --git a/cmd/climc/shell/labels.go b/cmd/climc/shell/labels.go index dcf4070655..9a0a96e242 100644 --- a/cmd/climc/shell/labels.go +++ b/cmd/climc/shell/labels.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/metric_types.go b/cmd/climc/shell/metric_types.go index deb83981f6..a0268bce32 100644 --- a/cmd/climc/shell/metric_types.go +++ b/cmd/climc/shell/metric_types.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/metrics.go b/cmd/climc/shell/metrics.go index d77e15e406..0509bffbe4 100644 --- a/cmd/climc/shell/metrics.go +++ b/cmd/climc/shell/metrics.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/monitor_metrics.go b/cmd/climc/shell/monitor_metrics.go index d5c4f34a2f..a00de0d70b 100644 --- a/cmd/climc/shell/monitor_metrics.go +++ b/cmd/climc/shell/monitor_metrics.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/monitor_types.go b/cmd/climc/shell/monitor_types.go index ea43f89b31..7004926d28 100644 --- a/cmd/climc/shell/monitor_types.go +++ b/cmd/climc/shell/monitor_types.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/monitorinputs.go b/cmd/climc/shell/monitorinputs.go index 3268a805f9..e0bfc28a49 100644 --- a/cmd/climc/shell/monitorinputs.go +++ b/cmd/climc/shell/monitorinputs.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/monitortemplates.go b/cmd/climc/shell/monitortemplates.go index f683e92932..b89f32d7d9 100644 --- a/cmd/climc/shell/monitortemplates.go +++ b/cmd/climc/shell/monitortemplates.go @@ -3,9 +3,9 @@ package shell import ( "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/networks.go b/cmd/climc/shell/networks.go index db2d215bf1..fdf011d56f 100644 --- a/cmd/climc/shell/networks.go +++ b/cmd/climc/shell/networks.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/nodes.go b/cmd/climc/shell/nodes.go index 412f45cf21..fac2eb66c2 100644 --- a/cmd/climc/shell/nodes.go +++ b/cmd/climc/shell/nodes.go @@ -3,9 +3,9 @@ package shell import ( "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/notification.go b/cmd/climc/shell/notification.go index 07558bf5f7..b2b21af2b7 100644 --- a/cmd/climc/shell/notification.go +++ b/cmd/climc/shell/notification.go @@ -2,9 +2,9 @@ package shell import ( //"strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/operations.go b/cmd/climc/shell/operations.go index f2d7898272..cb08861efa 100644 --- a/cmd/climc/shell/operations.go +++ b/cmd/climc/shell/operations.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/performances.go b/cmd/climc/shell/performances.go index 4a6e2547bd..4f80a09b20 100644 --- a/cmd/climc/shell/performances.go +++ b/cmd/climc/shell/performances.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/processes.go b/cmd/climc/shell/processes.go index addc9ae5c4..84fbc5e82a 100644 --- a/cmd/climc/shell/processes.go +++ b/cmd/climc/shell/processes.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/processlogs.go b/cmd/climc/shell/processlogs.go index 1a15bffc34..d6c038962d 100644 --- a/cmd/climc/shell/processlogs.go +++ b/cmd/climc/shell/processlogs.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/project_admin.go b/cmd/climc/shell/project_admin.go index acabeeb74c..21f51564eb 100644 --- a/cmd/climc/shell/project_admin.go +++ b/cmd/climc/shell/project_admin.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/project_admin_candidates.go b/cmd/climc/shell/project_admin_candidates.go index b8706e5366..fcd6be3848 100644 --- a/cmd/climc/shell/project_admin_candidates.go +++ b/cmd/climc/shell/project_admin_candidates.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/projects.go b/cmd/climc/shell/projects.go index c2909137fd..8751c5b67d 100644 --- a/cmd/climc/shell/projects.go +++ b/cmd/climc/shell/projects.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/quotas.go b/cmd/climc/shell/quotas.go index 580f240086..b601988fe0 100644 --- a/cmd/climc/shell/quotas.go +++ b/cmd/climc/shell/quotas.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type QuotaBaseOptions struct { diff --git a/cmd/climc/shell/rates.go b/cmd/climc/shell/rates.go index 274c9fe7a9..d4c931c2e5 100644 --- a/cmd/climc/shell/rates.go +++ b/cmd/climc/shell/rates.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/recipient.go b/cmd/climc/shell/recipient.go index 3c5593fea7..5c81470bc9 100644 --- a/cmd/climc/shell/recipient.go +++ b/cmd/climc/shell/recipient.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/regions.go b/cmd/climc/shell/regions.go index d170038057..7c52616030 100644 --- a/cmd/climc/shell/regions.go +++ b/cmd/climc/shell/regions.go @@ -2,9 +2,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/reservedips.go b/cmd/climc/shell/reservedips.go index f1ad5ed669..0de0d0f9e8 100644 --- a/cmd/climc/shell/reservedips.go +++ b/cmd/climc/shell/reservedips.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/resource_details.go b/cmd/climc/shell/resource_details.go index b823cc1ce6..c0fc3eb309 100644 --- a/cmd/climc/shell/resource_details.go +++ b/cmd/climc/shell/resource_details.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/resource_fees.go b/cmd/climc/shell/resource_fees.go index 9e5386f598..08c8c324de 100644 --- a/cmd/climc/shell/resource_fees.go +++ b/cmd/climc/shell/resource_fees.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/role_assignments.go b/cmd/climc/shell/role_assignments.go index 4d08388c2d..f663a09fd0 100644 --- a/cmd/climc/shell/role_assignments.go +++ b/cmd/climc/shell/role_assignments.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/roles.go b/cmd/climc/shell/roles.go index db8896a4bc..cf7e7d71be 100644 --- a/cmd/climc/shell/roles.go +++ b/cmd/climc/shell/roles.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/schedtaghosts.go b/cmd/climc/shell/schedtaghosts.go index d80472cc17..9ff4f6a1aa 100644 --- a/cmd/climc/shell/schedtaghosts.go +++ b/cmd/climc/shell/schedtaghosts.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/schedtags.go b/cmd/climc/shell/schedtags.go index e1b5e59bdb..e0ec4648d5 100644 --- a/cmd/climc/shell/schedtags.go +++ b/cmd/climc/shell/schedtags.go @@ -2,9 +2,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/schedulers.go b/cmd/climc/shell/schedulers.go index fe28ff3f83..47cd7210cf 100644 --- a/cmd/climc/shell/schedulers.go +++ b/cmd/climc/shell/schedulers.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/secgrouprules.go b/cmd/climc/shell/secgrouprules.go index 17bd54c15c..eb9fd4b621 100644 --- a/cmd/climc/shell/secgrouprules.go +++ b/cmd/climc/shell/secgrouprules.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/secgroups.go b/cmd/climc/shell/secgroups.go index c41b882c2d..8090fe5610 100644 --- a/cmd/climc/shell/secgroups.go +++ b/cmd/climc/shell/secgroups.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/serverdisks.go b/cmd/climc/shell/serverdisks.go index b41a38ad93..eb8cab800d 100644 --- a/cmd/climc/shell/serverdisks.go +++ b/cmd/climc/shell/serverdisks.go @@ -2,9 +2,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/serverisolatedevices.go b/cmd/climc/shell/serverisolatedevices.go index c74b5c6e8f..995456df90 100644 --- a/cmd/climc/shell/serverisolatedevices.go +++ b/cmd/climc/shell/serverisolatedevices.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/servernetworks.go b/cmd/climc/shell/servernetworks.go index 4a2809c1ba..c867c57842 100644 --- a/cmd/climc/shell/servernetworks.go +++ b/cmd/climc/shell/servernetworks.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/servers.go b/cmd/climc/shell/servers.go index 9a5fc8df52..e6bccf2e57 100644 --- a/cmd/climc/shell/servers.go +++ b/cmd/climc/shell/servers.go @@ -5,9 +5,9 @@ import ( "io/ioutil" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type ServerDeployInfo struct { diff --git a/cmd/climc/shell/service_hosts.go b/cmd/climc/shell/service_hosts.go index 99f606e549..1e3a5d2cc9 100644 --- a/cmd/climc/shell/service_hosts.go +++ b/cmd/climc/shell/service_hosts.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/service_name_suggestions.go b/cmd/climc/shell/service_name_suggestions.go index 809d9682ed..23eb4e155b 100644 --- a/cmd/climc/shell/service_name_suggestions.go +++ b/cmd/climc/shell/service_name_suggestions.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/services.go b/cmd/climc/shell/services.go index cd56b7b763..88045fdcee 100644 --- a/cmd/climc/shell/services.go +++ b/cmd/climc/shell/services.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/servicetrees.go b/cmd/climc/shell/servicetrees.go index 655cb150f6..b89767b996 100644 --- a/cmd/climc/shell/servicetrees.go +++ b/cmd/climc/shell/servicetrees.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/shell.go b/cmd/climc/shell/shell.go index 7d3d47da2d..25caa0e188 100644 --- a/cmd/climc/shell/shell.go +++ b/cmd/climc/shell/shell.go @@ -2,7 +2,7 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" ) type CMD struct { diff --git a/cmd/climc/shell/sms_configs.go b/cmd/climc/shell/sms_configs.go index d8351c31a4..52c722f67f 100644 --- a/cmd/climc/shell/sms_configs.go +++ b/cmd/climc/shell/sms_configs.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/specs.go b/cmd/climc/shell/specs.go index a50e268a76..bdc61e7029 100644 --- a/cmd/climc/shell/specs.go +++ b/cmd/climc/shell/specs.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/storagecachedimages.go b/cmd/climc/shell/storagecachedimages.go index 724ea6d548..504826d14b 100644 --- a/cmd/climc/shell/storagecachedimages.go +++ b/cmd/climc/shell/storagecachedimages.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/storagecaches.go b/cmd/climc/shell/storagecaches.go index 8d61b0ab02..0e10d6ab75 100644 --- a/cmd/climc/shell/storagecaches.go +++ b/cmd/climc/shell/storagecaches.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/storages.go b/cmd/climc/shell/storages.go index d92902bec7..4608be45f9 100644 --- a/cmd/climc/shell/storages.go +++ b/cmd/climc/shell/storages.go @@ -3,9 +3,9 @@ package shell import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/tasks.go b/cmd/climc/shell/tasks.go index 6d8f4347f4..d4b3edafef 100644 --- a/cmd/climc/shell/tasks.go +++ b/cmd/climc/shell/tasks.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/tenants.go b/cmd/climc/shell/tenants.go index 3827c3ed7c..1d22e7281c 100644 --- a/cmd/climc/shell/tenants.go +++ b/cmd/climc/shell/tenants.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/treenodes.go b/cmd/climc/shell/treenodes.go index 44268a7490..8bbd156b13 100644 --- a/cmd/climc/shell/treenodes.go +++ b/cmd/climc/shell/treenodes.go @@ -4,9 +4,9 @@ import ( "fmt" "strconv" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/usages.go b/cmd/climc/shell/usages.go index e0507370d2..6a909cf124 100644 --- a/cmd/climc/shell/usages.go +++ b/cmd/climc/shell/usages.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type GeneralUsageOptions struct { diff --git a/cmd/climc/shell/users.go b/cmd/climc/shell/users.go index 876fc94656..c5adb8766c 100644 --- a/cmd/climc/shell/users.go +++ b/cmd/climc/shell/users.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/utils.go b/cmd/climc/shell/utils.go index 124e9ab92d..9d1fc2c620 100644 --- a/cmd/climc/shell/utils.go +++ b/cmd/climc/shell/utils.go @@ -1,10 +1,10 @@ package shell import ( - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/util/printutils" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/util/printutils" ) func printList(list *modules.ListResult, columns []string) { diff --git a/cmd/climc/shell/vcenters.go b/cmd/climc/shell/vcenters.go index 06e7f6e4f1..134ec4b253 100644 --- a/cmd/climc/shell/vcenters.go +++ b/cmd/climc/shell/vcenters.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/verification.go b/cmd/climc/shell/verification.go index c4dcade409..e0ff6c9601 100644 --- a/cmd/climc/shell/verification.go +++ b/cmd/climc/shell/verification.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/version.go b/cmd/climc/shell/version.go index 43db7059f4..5a28eaf0a5 100644 --- a/cmd/climc/shell/version.go +++ b/cmd/climc/shell/version.go @@ -2,8 +2,8 @@ package shell import ( "fmt" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/vncproxy.go b/cmd/climc/shell/vncproxy.go index b5537c9cbb..d3b0cd635c 100644 --- a/cmd/climc/shell/vncproxy.go +++ b/cmd/climc/shell/vncproxy.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/vpcs.go b/cmd/climc/shell/vpcs.go index 0c1f6c79fe..1cd7c4b9ae 100644 --- a/cmd/climc/shell/vpcs.go +++ b/cmd/climc/shell/vpcs.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/wires.go b/cmd/climc/shell/wires.go index a51190dcb2..09eb4f68c0 100644 --- a/cmd/climc/shell/wires.go +++ b/cmd/climc/shell/wires.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/climc/shell/zones.go b/cmd/climc/shell/zones.go index fe9d66f8e6..16cc1cf3e0 100644 --- a/cmd/climc/shell/zones.go +++ b/cmd/climc/shell/zones.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func init() { diff --git a/cmd/esxicli/main.go b/cmd/esxicli/main.go index e79ab69c64..a1be1866cd 100644 --- a/cmd/esxicli/main.go +++ b/cmd/esxicli/main.go @@ -4,13 +4,13 @@ import ( "fmt" "os" - "github.com/yunionio/log" - "github.com/yunionio/structarg" + "yunion.io/x/log" + "yunion.io/x/structarg" - "github.com/yunionio/onecloud/pkg/util/esxi" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/util/shellutils" - _ "github.com/yunionio/onecloud/pkg/util/esxi/shell" + _ "yunion.io/x/onecloud/pkg/util/esxi/shell" ) type BaseOptions struct { diff --git a/cmd/region-dns/main.go b/cmd/region-dns/main.go index fb295a365f..d194ba5bc2 100644 --- a/cmd/region-dns/main.go +++ b/cmd/region-dns/main.go @@ -20,7 +20,7 @@ import ( "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/coremain" - _ "github.com/yunionio/onecloud/pkg/dns" + _ "yunion.io/x/onecloud/pkg/dns" ) var directives = []string{ diff --git a/cmd/region/main.go b/cmd/region/main.go index 40e9b771f5..33e1591a9a 100644 --- a/cmd/region/main.go +++ b/cmd/region/main.go @@ -1,7 +1,7 @@ package main import ( - "github.com/yunionio/onecloud/pkg/compute/service" + "yunion.io/x/onecloud/pkg/compute/service" ) func main() { diff --git a/cmd/scheduler/app/server.go b/cmd/scheduler/app/server.go index 3c6d40ce9c..3dc1ce9a4f 100644 --- a/cmd/scheduler/app/server.go +++ b/cmd/scheduler/app/server.go @@ -8,18 +8,18 @@ import ( "net/http" "strconv" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/prometheus" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/prometheus" + "yunion.io/x/pkg/utils" "gopkg.in/gin-gonic/gin.v1" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - _ "github.com/yunionio/onecloud/pkg/scheduler/algorithmprovider" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - schedhandler "github.com/yunionio/onecloud/pkg/scheduler/handler" - schedman "github.com/yunionio/onecloud/pkg/scheduler/manager" - "github.com/yunionio/onecloud/pkg/util/gin/middleware" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/onecloud/pkg/mcclient/auth" + _ "yunion.io/x/onecloud/pkg/scheduler/algorithmprovider" + "yunion.io/x/onecloud/pkg/scheduler/db/models" + schedhandler "yunion.io/x/onecloud/pkg/scheduler/handler" + schedman "yunion.io/x/onecloud/pkg/scheduler/manager" + "yunion.io/x/onecloud/pkg/util/gin/middleware" ) type SchedulerServer struct { diff --git a/cmd/scheduler/main.go b/cmd/scheduler/main.go index 250156018f..ee1de25f74 100644 --- a/cmd/scheduler/main.go +++ b/cmd/scheduler/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/cmd/scheduler/app" + "yunion.io/x/log" + "yunion.io/x/onecloud/cmd/scheduler/app" ) func main() { diff --git a/cmd/scheduler/options/options.go b/cmd/scheduler/options/options.go index e089d1ab40..1eb42aa94e 100644 --- a/cmd/scheduler/options/options.go +++ b/cmd/scheduler/options/options.go @@ -6,9 +6,9 @@ import ( "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/version" - "github.com/yunionio/structarg" + "yunion.io/x/log" + "yunion.io/x/pkg/util/version" + "yunion.io/x/structarg" ) type SchedulerOptions struct { diff --git a/pkg/appctx/context.go b/pkg/appctx/context.go index 7f62ef31df..6d71244de2 100644 --- a/pkg/appctx/context.go +++ b/pkg/appctx/context.go @@ -3,7 +3,7 @@ package appctx import ( "context" - "github.com/yunionio/pkg/trace" + "yunion.io/x/pkg/trace" ) type AppContextKey string diff --git a/pkg/appsrv/appsrv.go b/pkg/appsrv/appsrv.go index f4abd39377..e37f5db8b1 100644 --- a/pkg/appsrv/appsrv.go +++ b/pkg/appsrv/appsrv.go @@ -9,11 +9,11 @@ import ( "sync" "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/proxy" - "github.com/yunionio/pkg/trace" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/proxy" + "yunion.io/x/pkg/trace" + "yunion.io/x/pkg/utils" ) type responseWriterResponse struct { diff --git a/pkg/appsrv/context.go b/pkg/appsrv/context.go index 133e879b6d..e82203721b 100644 --- a/pkg/appsrv/context.go +++ b/pkg/appsrv/context.go @@ -4,7 +4,7 @@ import ( "context" "database/sql" - "github.com/yunionio/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/appctx" ) func AppContextDB(ctx context.Context) *sql.DB { diff --git a/pkg/appsrv/dispatcher/dispatcher.go b/pkg/appsrv/dispatcher/dispatcher.go index c6356128d2..56cb359b66 100644 --- a/pkg/appsrv/dispatcher/dispatcher.go +++ b/pkg/appsrv/dispatcher/dispatcher.go @@ -5,12 +5,12 @@ import ( "fmt" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "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" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func AddModelDispatcher(prefix string, app *appsrv.Application, manager IModelDispatchHandler) { diff --git a/pkg/appsrv/dispatcher/handlers.go b/pkg/appsrv/dispatcher/handlers.go index 95a56900cf..02da3706b8 100644 --- a/pkg/appsrv/dispatcher/handlers.go +++ b/pkg/appsrv/dispatcher/handlers.go @@ -3,9 +3,9 @@ package dispatcher import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type IMiddlewareFilter interface { diff --git a/pkg/appsrv/dispatcher/jointdispatcher.go b/pkg/appsrv/dispatcher/jointdispatcher.go index c52e0b356a..4e3fd2e65e 100644 --- a/pkg/appsrv/dispatcher/jointdispatcher.go +++ b/pkg/appsrv/dispatcher/jointdispatcher.go @@ -5,12 +5,12 @@ import ( "fmt" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "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" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func AddJointModelDispatcher(prefix string, app *appsrv.Application, manager IJointModelDispatchHandler) { diff --git a/pkg/appsrv/fetch.go b/pkg/appsrv/fetch.go index dc9bae8e2f..c0e9a5bd6c 100644 --- a/pkg/appsrv/fetch.go +++ b/pkg/appsrv/fetch.go @@ -5,7 +5,7 @@ import ( "io/ioutil" "net/http" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" ) func Fetch(req *http.Request) ([]byte, error) { diff --git a/pkg/appsrv/handlers.go b/pkg/appsrv/handlers.go index d1b255b805..d8f92ca42d 100644 --- a/pkg/appsrv/handlers.go +++ b/pkg/appsrv/handlers.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/yunionio/pkg/util/version" + "yunion.io/x/pkg/util/version" ) type FilterHandler func(ctx context.Context, w http.ResponseWriter, r *http.Request) diff --git a/pkg/appsrv/send.go b/pkg/appsrv/send.go index 718d39328b..0921bde0f8 100644 --- a/pkg/appsrv/send.go +++ b/pkg/appsrv/send.go @@ -4,8 +4,8 @@ import ( "encoding/json" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" ) func Send(w http.ResponseWriter, text string) { diff --git a/pkg/appsrv/stats.go b/pkg/appsrv/stats.go index 7889d38a10..71fd86352b 100644 --- a/pkg/appsrv/stats.go +++ b/pkg/appsrv/stats.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" ) func doStatsHandler(stats *jsonutils.JSONArray, method, path string, hi, total *handlerInfo) { diff --git a/pkg/appsrv/workers.go b/pkg/appsrv/workers.go index afadbb0d24..675853be3d 100644 --- a/pkg/appsrv/workers.go +++ b/pkg/appsrv/workers.go @@ -4,7 +4,7 @@ import ( "runtime/debug" "sync" - "github.com/yunionio/log" + "yunion.io/x/log" ) type WorkerManager struct { diff --git a/pkg/cloudcommon/app.go b/pkg/cloudcommon/app.go index 57948dd815..c2cde3c76b 100644 --- a/pkg/cloudcommon/app.go +++ b/pkg/cloudcommon/app.go @@ -4,8 +4,8 @@ import ( "net" "strconv" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appsrv" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" ) func InitApp(options *Options) *appsrv.Application { diff --git a/pkg/cloudcommon/auth.go b/pkg/cloudcommon/auth.go index c4f914d83f..9c04ca8b71 100644 --- a/pkg/cloudcommon/auth.go +++ b/pkg/cloudcommon/auth.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/yunionio/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/auth" ) func InitAuth(options *Options, authComplete auth.AuthCompletedCallback) { diff --git a/pkg/cloudcommon/database.go b/pkg/cloudcommon/database.go index 1065de5704..fd2886a742 100644 --- a/pkg/cloudcommon/database.go +++ b/pkg/cloudcommon/database.go @@ -3,10 +3,10 @@ package cloudcommon import ( "database/sql" - "github.com/yunionio/log" - "github.com/yunionio/sqlchemy" + "yunion.io/x/log" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) func InitDB(options *DBOptions) { diff --git a/pkg/cloudcommon/db/adminsharablevirtual.go b/pkg/cloudcommon/db/adminsharablevirtual.go index 15b9723822..13bd2ed27c 100644 --- a/pkg/cloudcommon/db/adminsharablevirtual.go +++ b/pkg/cloudcommon/db/adminsharablevirtual.go @@ -3,10 +3,10 @@ package db import ( "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "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_dispatcher.go b/pkg/cloudcommon/db/db_dispatcher.go index b0b73f77cc..900774ba51 100644 --- a/pkg/cloudcommon/db/db_dispatcher.go +++ b/pkg/cloudcommon/db/db_dispatcher.go @@ -7,20 +7,20 @@ import ( "reflect" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/util/httputils" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/util/filterclause" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/util/httputils" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/util/filterclause" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type DBModelDispatcher struct { diff --git a/pkg/cloudcommon/db/db_joint_dispatcher.go b/pkg/cloudcommon/db/db_joint_dispatcher.go index f8b776b201..8b287f9544 100644 --- a/pkg/cloudcommon/db/db_joint_dispatcher.go +++ b/pkg/cloudcommon/db/db_joint_dispatcher.go @@ -5,13 +5,13 @@ import ( "database/sql" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "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" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type DBJointModelDispatcher struct { diff --git a/pkg/cloudcommon/db/enabledstatusstandalone.go b/pkg/cloudcommon/db/enabledstatusstandalone.go index a9f7f801d6..1528c09200 100644 --- a/pkg/cloudcommon/db/enabledstatusstandalone.go +++ b/pkg/cloudcommon/db/enabledstatusstandalone.go @@ -3,9 +3,9 @@ package db import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) type SEnabledStatusStandaloneResourceBase struct { diff --git a/pkg/cloudcommon/db/fetch.go b/pkg/cloudcommon/db/fetch.go index 43fb3733da..05f8f49f13 100644 --- a/pkg/cloudcommon/db/fetch.go +++ b/pkg/cloudcommon/db/fetch.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" ) func fetchById(manager IModelManager, idStr string) (IModel, error) { diff --git a/pkg/cloudcommon/db/interface.go b/pkg/cloudcommon/db/interface.go index e9de71647c..a269758eeb 100644 --- a/pkg/cloudcommon/db/interface.go +++ b/pkg/cloudcommon/db/interface.go @@ -3,11 +3,11 @@ package db import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type IModelManager interface { diff --git a/pkg/cloudcommon/db/jointbase.go b/pkg/cloudcommon/db/jointbase.go index 0277563390..b8c3bf4ef0 100644 --- a/pkg/cloudcommon/db/jointbase.go +++ b/pkg/cloudcommon/db/jointbase.go @@ -6,11 +6,11 @@ import ( "fmt" "reflect" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/sqlchemy" ) type SJointResourceBase struct { diff --git a/pkg/cloudcommon/db/lockman/inmemory.go b/pkg/cloudcommon/db/lockman/inmemory.go index 690162d70b..c9cf2befc9 100644 --- a/pkg/cloudcommon/db/lockman/inmemory.go +++ b/pkg/cloudcommon/db/lockman/inmemory.go @@ -5,8 +5,8 @@ import ( "runtime/debug" "sync" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/fifoutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/fifoutils" ) type SInMemoryLockOwner struct { diff --git a/pkg/cloudcommon/db/lockman/inmemory_test.go b/pkg/cloudcommon/db/lockman/inmemory_test.go index d995755f03..27ee308556 100644 --- a/pkg/cloudcommon/db/lockman/inmemory_test.go +++ b/pkg/cloudcommon/db/lockman/inmemory_test.go @@ -6,7 +6,7 @@ import ( "testing" "time" - "github.com/yunionio/pkg/util/stringutils" + "yunion.io/x/pkg/util/stringutils" ) type FakeObject struct { diff --git a/pkg/cloudcommon/db/lockman/noop.go b/pkg/cloudcommon/db/lockman/noop.go index 6149aa7671..2bef75649d 100644 --- a/pkg/cloudcommon/db/lockman/noop.go +++ b/pkg/cloudcommon/db/lockman/noop.go @@ -3,7 +3,7 @@ package lockman import ( "context" - "github.com/yunionio/log" + "yunion.io/x/log" ) type SNoopLockManager struct { diff --git a/pkg/cloudcommon/db/metadata.go b/pkg/cloudcommon/db/metadata.go index 5d9a858ced..5c0c98206d 100644 --- a/pkg/cloudcommon/db/metadata.go +++ b/pkg/cloudcommon/db/metadata.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/stringutils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/stringutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) const ( diff --git a/pkg/cloudcommon/db/modelbase.go b/pkg/cloudcommon/db/modelbase.go index 45e0830068..6b5f48f0aa 100644 --- a/pkg/cloudcommon/db/modelbase.go +++ b/pkg/cloudcommon/db/modelbase.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" ) type SModelBase struct { diff --git a/pkg/cloudcommon/db/models.go b/pkg/cloudcommon/db/models.go index 000f2887c4..0de2c8e409 100644 --- a/pkg/cloudcommon/db/models.go +++ b/pkg/cloudcommon/db/models.go @@ -3,8 +3,8 @@ package db import ( "fmt" - "github.com/yunionio/log" - "github.com/yunionio/sqlchemy" + "yunion.io/x/log" + "yunion.io/x/sqlchemy" ) var globalTables map[string]IModelManager diff --git a/pkg/cloudcommon/db/namevalidator.go b/pkg/cloudcommon/db/namevalidator.go index 4c2304f318..aef4032450 100644 --- a/pkg/cloudcommon/db/namevalidator.go +++ b/pkg/cloudcommon/db/namevalidator.go @@ -3,8 +3,8 @@ package db import ( "fmt" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/pkg/util/stringutils" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/pkg/util/stringutils" ) func isNameUnique(manager IModelManager, ownerProjId string, name string) bool { diff --git a/pkg/cloudcommon/db/opslog.go b/pkg/cloudcommon/db/opslog.go index 2afaef2974..11ad4edf6e 100644 --- a/pkg/cloudcommon/db/opslog.go +++ b/pkg/cloudcommon/db/opslog.go @@ -7,11 +7,11 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/stringutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/stringutils" + "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/cloudcommon/db/quotas/handler.go b/pkg/cloudcommon/db/quotas/handler.go index 35e982b086..6399dbe295 100644 --- a/pkg/cloudcommon/db/quotas/handler.go +++ b/pkg/cloudcommon/db/quotas/handler.go @@ -6,14 +6,14 @@ import ( "fmt" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient/auth" ) var _manager *SQuotaManager diff --git a/pkg/cloudcommon/db/quotas/quotas.go b/pkg/cloudcommon/db/quotas/quotas.go index d09b6c1007..b26700d073 100644 --- a/pkg/cloudcommon/db/quotas/quotas.go +++ b/pkg/cloudcommon/db/quotas/quotas.go @@ -4,11 +4,11 @@ import ( "context" "reflect" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/cloudcommon/db/quotas/stores.go b/pkg/cloudcommon/db/quotas/stores.go index 64da0f73af..86bfc41d00 100644 --- a/pkg/cloudcommon/db/quotas/stores.go +++ b/pkg/cloudcommon/db/quotas/stores.go @@ -3,10 +3,10 @@ package quotas import ( "context" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type IQuotaStore interface { diff --git a/pkg/cloudcommon/db/resourcebase.go b/pkg/cloudcommon/db/resourcebase.go index 97dd997f40..4c8bbcb480 100644 --- a/pkg/cloudcommon/db/resourcebase.go +++ b/pkg/cloudcommon/db/resourcebase.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/sqlchemy" ) type SResourceBase struct { diff --git a/pkg/cloudcommon/db/sharablevirtual.go b/pkg/cloudcommon/db/sharablevirtual.go index 601a10f605..33e8170198 100644 --- a/pkg/cloudcommon/db/sharablevirtual.go +++ b/pkg/cloudcommon/db/sharablevirtual.go @@ -3,9 +3,9 @@ package db import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" ) type SSharableVirtualResourceBase struct { diff --git a/pkg/cloudcommon/db/standalone.go b/pkg/cloudcommon/db/standalone.go index 9b96a175da..7cb0c94fa5 100644 --- a/pkg/cloudcommon/db/standalone.go +++ b/pkg/cloudcommon/db/standalone.go @@ -5,14 +5,14 @@ import ( "database/sql" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/util/stringutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "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" ) type SStandaloneResourceBase struct { diff --git a/pkg/cloudcommon/db/statusstandalone.go b/pkg/cloudcommon/db/statusstandalone.go index a5e6f469e3..cc7ea853a3 100644 --- a/pkg/cloudcommon/db/statusstandalone.go +++ b/pkg/cloudcommon/db/statusstandalone.go @@ -4,8 +4,8 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type SStatusStandaloneResourceBase struct { diff --git a/pkg/cloudcommon/db/taskman/coordinator.go b/pkg/cloudcommon/db/taskman/coordinator.go index 590354eb8d..064c0ff174 100644 --- a/pkg/cloudcommon/db/taskman/coordinator.go +++ b/pkg/cloudcommon/db/taskman/coordinator.go @@ -4,11 +4,11 @@ import ( "context" "reflect" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) /*type TaskStageFunc func(ctx context.Context, obj db.IStandaloneModel, body jsonutils.JSONObject) diff --git a/pkg/cloudcommon/db/taskman/handler.go b/pkg/cloudcommon/db/taskman/handler.go index 727277342f..cc5d5b95c2 100644 --- a/pkg/cloudcommon/db/taskman/handler.go +++ b/pkg/cloudcommon/db/taskman/handler.go @@ -1,11 +1,11 @@ package taskman import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/appsrv/dispatcher" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/appsrv/dispatcher" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) var taskWorkMan *appsrv.WorkerManager diff --git a/pkg/cloudcommon/db/taskman/interface.go b/pkg/cloudcommon/db/taskman/interface.go index c0fde5bd6b..39b56b2525 100644 --- a/pkg/cloudcommon/db/taskman/interface.go +++ b/pkg/cloudcommon/db/taskman/interface.go @@ -3,8 +3,8 @@ package taskman import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ITask interface { diff --git a/pkg/cloudcommon/db/taskman/localtaskworker.go b/pkg/cloudcommon/db/taskman/localtaskworker.go index 9ad85ed2c9..2e5ac395e9 100644 --- a/pkg/cloudcommon/db/taskman/localtaskworker.go +++ b/pkg/cloudcommon/db/taskman/localtaskworker.go @@ -4,9 +4,9 @@ import ( "fmt" "runtime/debug" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appsrv" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" ) var localTaskWorkerMan *appsrv.WorkerManager diff --git a/pkg/cloudcommon/db/taskman/subtasks.go b/pkg/cloudcommon/db/taskman/subtasks.go index 40b3c6d23b..cf82841cc8 100644 --- a/pkg/cloudcommon/db/taskman/subtasks.go +++ b/pkg/cloudcommon/db/taskman/subtasks.go @@ -1,10 +1,10 @@ package taskman import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" "database/sql" ) diff --git a/pkg/cloudcommon/db/taskman/taskobjs.go b/pkg/cloudcommon/db/taskman/taskobjs.go index e29b6179dd..5fd8aaf7bd 100644 --- a/pkg/cloudcommon/db/taskman/taskobjs.go +++ b/pkg/cloudcommon/db/taskman/taskobjs.go @@ -1,9 +1,9 @@ package taskman import ( - "github.com/yunionio/log" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type STaskObjectManager struct { diff --git a/pkg/cloudcommon/db/taskman/tasks.go b/pkg/cloudcommon/db/taskman/tasks.go index 0ebf6cb7eb..aa08e2a1e8 100644 --- a/pkg/cloudcommon/db/taskman/tasks.go +++ b/pkg/cloudcommon/db/taskman/tasks.go @@ -8,19 +8,19 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/util/httputils" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/pkg/util/stringutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/pkg/util/stringutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" ) const ( diff --git a/pkg/cloudcommon/db/tenantcache.go b/pkg/cloudcommon/db/tenantcache.go index e72db90e43..9fdf0866ea 100644 --- a/pkg/cloudcommon/db/tenantcache.go +++ b/pkg/cloudcommon/db/tenantcache.go @@ -4,11 +4,11 @@ import ( "context" "database/sql" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type STenantCacheManager struct { diff --git a/pkg/cloudcommon/db/usercache.go b/pkg/cloudcommon/db/usercache.go index c9ba42057a..917b5c8754 100644 --- a/pkg/cloudcommon/db/usercache.go +++ b/pkg/cloudcommon/db/usercache.go @@ -4,9 +4,9 @@ import ( "context" "database/sql" - "github.com/yunionio/log" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type SUserCacheManager struct { diff --git a/pkg/cloudcommon/db/virtualjointbase.go b/pkg/cloudcommon/db/virtualjointbase.go index 252c90bc18..e4a0d941c0 100644 --- a/pkg/cloudcommon/db/virtualjointbase.go +++ b/pkg/cloudcommon/db/virtualjointbase.go @@ -5,12 +5,12 @@ import ( "fmt" "reflect" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/sqlchemy" + "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/reflectutils" + "yunion.io/x/sqlchemy" ) type SVirtualJointResourceBase struct { diff --git a/pkg/cloudcommon/db/virtualresource.go b/pkg/cloudcommon/db/virtualresource.go index 6d1f94c3ba..28360ccb55 100644 --- a/pkg/cloudcommon/db/virtualresource.go +++ b/pkg/cloudcommon/db/virtualresource.go @@ -6,15 +6,15 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "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/timeutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" ) type SVirtualResourceBaseManager struct { diff --git a/pkg/cloudcommon/notifyclient/notify.go b/pkg/cloudcommon/notifyclient/notify.go index 2dd934d9f9..f0c189dd08 100644 --- a/pkg/cloudcommon/notifyclient/notify.go +++ b/pkg/cloudcommon/notifyclient/notify.go @@ -1,8 +1,8 @@ package notifyclient import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" ) const ( diff --git a/pkg/cloudcommon/options.go b/pkg/cloudcommon/options.go index 7dd07e76d4..7b91719b70 100644 --- a/pkg/cloudcommon/options.go +++ b/pkg/cloudcommon/options.go @@ -5,10 +5,10 @@ import ( "os" "path" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/version" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/structarg" + "yunion.io/x/log" + "yunion.io/x/pkg/util/version" + "yunion.io/x/pkg/utils" + "yunion.io/x/structarg" ) type Options struct { diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go index c09d83b059..048b9e0259 100644 --- a/pkg/cloudprovider/cloudprovider.go +++ b/pkg/cloudprovider/cloudprovider.go @@ -3,8 +3,8 @@ package cloudprovider import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" ) type ICloudProviderFactory interface { diff --git a/pkg/cloudprovider/resources.go b/pkg/cloudprovider/resources.go index 65bd784eb6..2ff3e397b9 100644 --- a/pkg/cloudprovider/resources.go +++ b/pkg/cloudprovider/resources.go @@ -3,8 +3,8 @@ package cloudprovider import ( "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ICloudResource interface { diff --git a/pkg/compute/guestdrivers/aliyun.go b/pkg/compute/guestdrivers/aliyun.go index 77933e033e..50ebab0f8d 100644 --- a/pkg/compute/guestdrivers/aliyun.go +++ b/pkg/compute/guestdrivers/aliyun.go @@ -5,17 +5,17 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/utils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/util/seclib2" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/util/seclib2" ) type SAliyunGuestDriver struct { diff --git a/pkg/compute/guestdrivers/baremetals.go b/pkg/compute/guestdrivers/baremetals.go index bbccb5def1..d91cb4c49f 100644 --- a/pkg/compute/guestdrivers/baremetals.go +++ b/pkg/compute/guestdrivers/baremetals.go @@ -3,12 +3,12 @@ package guestdrivers import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" ) type SBaremetalGuestDriver struct { diff --git a/pkg/compute/guestdrivers/base.go b/pkg/compute/guestdrivers/base.go index ca374ec2a0..6d10f94aa5 100644 --- a/pkg/compute/guestdrivers/base.go +++ b/pkg/compute/guestdrivers/base.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/tasks" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/tasks" ) type SBaseGuestDriver struct { diff --git a/pkg/compute/guestdrivers/esxi.go b/pkg/compute/guestdrivers/esxi.go index 4029074698..4d515c0f84 100644 --- a/pkg/compute/guestdrivers/esxi.go +++ b/pkg/compute/guestdrivers/esxi.go @@ -1,7 +1,7 @@ package guestdrivers import ( - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/models" ) type SESXiGuestDriver struct { diff --git a/pkg/compute/guestdrivers/kvm.go b/pkg/compute/guestdrivers/kvm.go index 26f6360e5d..4b43f4f79d 100644 --- a/pkg/compute/guestdrivers/kvm.go +++ b/pkg/compute/guestdrivers/kvm.go @@ -6,12 +6,12 @@ import ( "regexp" "strconv" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" ) type SKVMGuestDriver struct { diff --git a/pkg/compute/guestdrivers/managedvirtual.go b/pkg/compute/guestdrivers/managedvirtual.go index 844bc16907..486cca38ed 100644 --- a/pkg/compute/guestdrivers/managedvirtual.go +++ b/pkg/compute/guestdrivers/managedvirtual.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type SManagedVirtualizedGuestDriver struct { diff --git a/pkg/compute/guestdrivers/virtualization.go b/pkg/compute/guestdrivers/virtualization.go index 3d5ba86572..2ed28aca95 100644 --- a/pkg/compute/guestdrivers/virtualization.go +++ b/pkg/compute/guestdrivers/virtualization.go @@ -5,14 +5,14 @@ import ( "fmt" "regexp" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" ) type SVirtualizedGuestDriver struct { diff --git a/pkg/compute/handlers.go b/pkg/compute/handlers.go index 3acc9048e4..2cf6dc6115 100644 --- a/pkg/compute/handlers.go +++ b/pkg/compute/handlers.go @@ -1,15 +1,15 @@ package compute import ( - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/appsrv/dispatcher" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/appsrv/dispatcher" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/usages" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/usages" ) func InitHandlers(app *appsrv.Application) { diff --git a/pkg/compute/models/cachedimages.go b/pkg/compute/models/cachedimages.go index f3fc768fcf..b1a9cbdf56 100644 --- a/pkg/compute/models/cachedimages.go +++ b/pkg/compute/models/cachedimages.go @@ -6,18 +6,18 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/sqlchemy" + "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/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/compute/options" ) const ( diff --git a/pkg/compute/models/cloudproviders.go b/pkg/compute/models/cloudproviders.go index bac94dc7d9..4b24aabaa0 100644 --- a/pkg/compute/models/cloudproviders.go +++ b/pkg/compute/models/cloudproviders.go @@ -6,16 +6,16 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/pkg/utils" + "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/timeutils" + "yunion.io/x/pkg/utils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" ) const ( diff --git a/pkg/compute/models/cloudregions.go b/pkg/compute/models/cloudregions.go index 1d39eca8dd..3ac4efcade 100644 --- a/pkg/compute/models/cloudregions.go +++ b/pkg/compute/models/cloudregions.go @@ -4,15 +4,15 @@ import ( "context" "database/sql" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/sqlchemy" + "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/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudprovider" ) const ( diff --git a/pkg/compute/models/disks.go b/pkg/compute/models/disks.go index 9d362c69ef..578f388a8f 100644 --- a/pkg/compute/models/disks.go +++ b/pkg/compute/models/disks.go @@ -7,23 +7,23 @@ import ( "path" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/pkg/util/fileutils" - "github.com/yunionio/pkg/util/osprofile" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/util/sysutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/fileutils" + "yunion.io/x/pkg/util/osprofile" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/util/sysutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" ) const ( diff --git a/pkg/compute/models/dnsrecords.go b/pkg/compute/models/dnsrecords.go index 7d8bb67237..a1177a3401 100644 --- a/pkg/compute/models/dnsrecords.go +++ b/pkg/compute/models/dnsrecords.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" ) type SDnsRecordManager struct { diff --git a/pkg/compute/models/groupguests.go b/pkg/compute/models/groupguests.go index af1dfb32c7..63b5223a83 100644 --- a/pkg/compute/models/groupguests.go +++ b/pkg/compute/models/groupguests.go @@ -3,10 +3,10 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SGroupguestManager struct { diff --git a/pkg/compute/models/groupjoints.go b/pkg/compute/models/groupjoints.go index f759cf43ef..cb3e5c5936 100644 --- a/pkg/compute/models/groupjoints.go +++ b/pkg/compute/models/groupjoints.go @@ -1,6 +1,6 @@ package models -import "github.com/yunionio/onecloud/pkg/cloudcommon/db" +import "yunion.io/x/onecloud/pkg/cloudcommon/db" type SGroupJointsManager struct { db.SVirtualJointResourceBaseManager diff --git a/pkg/compute/models/groupnetworks.go b/pkg/compute/models/groupnetworks.go index 3686aea46d..412aa32824 100644 --- a/pkg/compute/models/groupnetworks.go +++ b/pkg/compute/models/groupnetworks.go @@ -3,11 +3,11 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SGroupnetworkManager struct { diff --git a/pkg/compute/models/groups.go b/pkg/compute/models/groups.go index 63d4bb4202..107d9db77f 100644 --- a/pkg/compute/models/groups.go +++ b/pkg/compute/models/groups.go @@ -1,6 +1,6 @@ package models -import "github.com/yunionio/onecloud/pkg/cloudcommon/db" +import "yunion.io/x/onecloud/pkg/cloudcommon/db" const ( REDIS_TYPE = "REDIS" diff --git a/pkg/compute/models/guestcdrom.go b/pkg/compute/models/guestcdrom.go index fa0b3ab4fd..c5ed990056 100644 --- a/pkg/compute/models/guestcdrom.go +++ b/pkg/compute/models/guestcdrom.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SGuestcdromManager struct { diff --git a/pkg/compute/models/guestdisks.go b/pkg/compute/models/guestdisks.go index 87a305a6af..82c63895df 100644 --- a/pkg/compute/models/guestdisks.go +++ b/pkg/compute/models/guestdisks.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SGuestdiskManager struct { diff --git a/pkg/compute/models/guestdrivers.go b/pkg/compute/models/guestdrivers.go index 7d4bebfc9d..f35b77e915 100644 --- a/pkg/compute/models/guestdrivers.go +++ b/pkg/compute/models/guestdrivers.go @@ -3,11 +3,11 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/mcclient" + "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" ) type IGuestDriver interface { diff --git a/pkg/compute/models/guestjoints.go b/pkg/compute/models/guestjoints.go index e1dfb770c9..e52afc1c2e 100644 --- a/pkg/compute/models/guestjoints.go +++ b/pkg/compute/models/guestjoints.go @@ -1,6 +1,6 @@ package models -import "github.com/yunionio/onecloud/pkg/cloudcommon/db" +import "yunion.io/x/onecloud/pkg/cloudcommon/db" type SGuestJointsManager struct { db.SVirtualJointResourceBaseManager diff --git a/pkg/compute/models/guestnetworks.go b/pkg/compute/models/guestnetworks.go index 002547a40c..3e8a3685ac 100644 --- a/pkg/compute/models/guestnetworks.go +++ b/pkg/compute/models/guestnetworks.go @@ -9,16 +9,16 @@ import ( "regexp" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/compute/options" ) const ( diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index f0f3ab9763..94364c56aa 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -9,29 +9,29 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/pkg/util/fileutils" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/pkg/util/osprofile" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/util/sysutils" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/fileutils" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/util/osprofile" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/util/sysutils" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/quotas" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" ) const ( diff --git a/pkg/compute/models/hostjoints.go b/pkg/compute/models/hostjoints.go index f64ec543eb..f9ae822e9e 100644 --- a/pkg/compute/models/hostjoints.go +++ b/pkg/compute/models/hostjoints.go @@ -3,10 +3,10 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) type SHostJointsManager struct { diff --git a/pkg/compute/models/hostnetworks.go b/pkg/compute/models/hostnetworks.go index e5aa52dafa..abf31b3ed6 100644 --- a/pkg/compute/models/hostnetworks.go +++ b/pkg/compute/models/hostnetworks.go @@ -3,11 +3,11 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SHostnetworkManager struct { diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 69e3ff7fa5..f4de4e2228 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -7,23 +7,23 @@ import ( "net/url" "strconv" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/util/sysutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/util/sysutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) const ( diff --git a/pkg/compute/models/hostschedtags.go b/pkg/compute/models/hostschedtags.go index 9b360e8fe1..64a15ef146 100644 --- a/pkg/compute/models/hostschedtags.go +++ b/pkg/compute/models/hostschedtags.go @@ -3,10 +3,10 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SHostschedtagManager struct { diff --git a/pkg/compute/models/hoststorages.go b/pkg/compute/models/hoststorages.go index 0ee01c8031..709c29ee90 100644 --- a/pkg/compute/models/hoststorages.go +++ b/pkg/compute/models/hoststorages.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/tristate" + "yunion.io/x/sqlchemy" ) type SHoststorageManager struct { diff --git a/pkg/compute/models/hostwires.go b/pkg/compute/models/hostwires.go index e2e25bf009..872f055a09 100644 --- a/pkg/compute/models/hostwires.go +++ b/pkg/compute/models/hostwires.go @@ -3,11 +3,11 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "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/inframanagers.go b/pkg/compute/models/inframanagers.go index e391153561..962f752369 100644 --- a/pkg/compute/models/inframanagers.go +++ b/pkg/compute/models/inframanagers.go @@ -2,8 +2,8 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type SInfrastructureManager struct { diff --git a/pkg/compute/models/initdb.go b/pkg/compute/models/initdb.go index eb1e827d92..82f4e25e84 100644 --- a/pkg/compute/models/initdb.go +++ b/pkg/compute/models/initdb.go @@ -1,8 +1,8 @@ package models import ( - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) func InitDB() error { diff --git a/pkg/compute/models/isolated_devices.go b/pkg/compute/models/isolated_devices.go index 3654529fe3..f3182d3f67 100644 --- a/pkg/compute/models/isolated_devices.go +++ b/pkg/compute/models/isolated_devices.go @@ -5,14 +5,14 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "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" ) const ( diff --git a/pkg/compute/models/keypairs.go b/pkg/compute/models/keypairs.go index 67789bfd80..4563ff639f 100644 --- a/pkg/compute/models/keypairs.go +++ b/pkg/compute/models/keypairs.go @@ -3,11 +3,11 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" ) type SKeypairManager struct { diff --git a/pkg/compute/models/managedresource.go b/pkg/compute/models/managedresource.go index 8536a6446c..b6883e10a4 100644 --- a/pkg/compute/models/managedresource.go +++ b/pkg/compute/models/managedresource.go @@ -3,7 +3,7 @@ package models import ( "fmt" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SManagedResourceBase struct { diff --git a/pkg/compute/models/netinterfaces.go b/pkg/compute/models/netinterfaces.go index 09d708c9cc..5275af03b6 100644 --- a/pkg/compute/models/netinterfaces.go +++ b/pkg/compute/models/netinterfaces.go @@ -4,11 +4,11 @@ import ( "context" "database/sql" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "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/networks.go b/pkg/compute/models/networks.go index b804684420..e4df6a1ea0 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -6,22 +6,22 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/pkg/util/fileutils" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/fileutils" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/compute/models/quotas.go b/pkg/compute/models/quotas.go index 79344b4c37..93bbe28832 100644 --- a/pkg/compute/models/quotas.go +++ b/pkg/compute/models/quotas.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/quotas" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/pkg/tristate" + "yunion.io/x/jsonutils" + "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/reservedips.go b/pkg/compute/models/reservedips.go index 10a4981c04..1f24d09131 100644 --- a/pkg/compute/models/reservedips.go +++ b/pkg/compute/models/reservedips.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "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/sqlchemy" ) type SReservedipManager struct { diff --git a/pkg/compute/models/schedtags.go b/pkg/compute/models/schedtags.go index 32cb4db38e..e0a91987c1 100644 --- a/pkg/compute/models/schedtags.go +++ b/pkg/compute/models/schedtags.go @@ -5,13 +5,13 @@ import ( "database/sql" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "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/utils" + "yunion.io/x/sqlchemy" ) type SchedStrategyType string diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index 783a2485ee..38171617d4 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -6,14 +6,14 @@ import ( "strconv" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/secrules" - "github.com/yunionio/pkg/util/stringutils" - "github.com/yunionio/sqlchemy" + "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/secrules" + "yunion.io/x/pkg/util/stringutils" + "yunion.io/x/sqlchemy" ) type SSecurityGroupRuleManager struct { diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index d87f13c91c..1fc2ca24bd 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -4,12 +4,12 @@ import ( "context" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "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/sqlchemy" ) type SSecurityGroupManager struct { diff --git a/pkg/compute/models/storagecachedimages.go b/pkg/compute/models/storagecachedimages.go index 2118a46147..eabf5a2a82 100644 --- a/pkg/compute/models/storagecachedimages.go +++ b/pkg/compute/models/storagecachedimages.go @@ -5,14 +5,14 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/compute/models/storagecaches.go b/pkg/compute/models/storagecaches.go index 8be99871c8..643c5efec8 100644 --- a/pkg/compute/models/storagecaches.go +++ b/pkg/compute/models/storagecaches.go @@ -4,14 +4,14 @@ import ( "context" "database/sql" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/sqlchemy" + "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" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/sqlchemy" ) type SStoragecacheManager struct { diff --git a/pkg/compute/models/storages.go b/pkg/compute/models/storages.go index cbefa742b4..28650d29f1 100644 --- a/pkg/compute/models/storages.go +++ b/pkg/compute/models/storages.go @@ -3,16 +3,16 @@ package models import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/compute/models/usage.go b/pkg/compute/models/usage.go index 27d05a2228..6483fe6e7a 100644 --- a/pkg/compute/models/usage.go +++ b/pkg/compute/models/usage.go @@ -1,10 +1,10 @@ package models import ( - "github.com/yunionio/log" - "github.com/yunionio/sqlchemy" + "yunion.io/x/log" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db" ) func AttachUsageQuery( diff --git a/pkg/compute/models/vcenters.go b/pkg/compute/models/vcenters.go index 530b323d06..34ad3c40cc 100644 --- a/pkg/compute/models/vcenters.go +++ b/pkg/compute/models/vcenters.go @@ -4,9 +4,9 @@ import ( "context" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/mcclient" ) type SVCenterManager struct { diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index 762396dd73..e4fd13ad5c 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -5,16 +5,16 @@ import ( "database/sql" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/sqlchemy" + "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" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go index e3223a6645..22fa6d9a6f 100644 --- a/pkg/compute/models/wires.go +++ b/pkg/compute/models/wires.go @@ -5,14 +5,14 @@ import ( "database/sql" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "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" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" ) type SWireManager struct { diff --git a/pkg/compute/models/zones.go b/pkg/compute/models/zones.go index fc9ceea224..05fc01a0c9 100644 --- a/pkg/compute/models/zones.go +++ b/pkg/compute/models/zones.go @@ -5,15 +5,15 @@ import ( "database/sql" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/compare" - "github.com/yunionio/sqlchemy" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "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" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/compare" + "yunion.io/x/sqlchemy" ) const ( diff --git a/pkg/compute/options/options.go b/pkg/compute/options/options.go index 5d48a58bb2..d62e7c0d50 100644 --- a/pkg/compute/options/options.go +++ b/pkg/compute/options/options.go @@ -1,7 +1,7 @@ package options import ( - "github.com/yunionio/onecloud/pkg/cloudcommon" + "yunion.io/x/onecloud/pkg/cloudcommon" ) type ComputeOptions struct { diff --git a/pkg/compute/service/service.go b/pkg/compute/service/service.go index d00c01f062..31d227e934 100644 --- a/pkg/compute/service/service.go +++ b/pkg/compute/service/service.go @@ -5,19 +5,19 @@ import ( _ "github.com/go-sql-driver/mysql" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/compute" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/options" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/compute" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/options" - _ "github.com/yunionio/onecloud/pkg/compute/tasks" + _ "yunion.io/x/onecloud/pkg/compute/tasks" - _ "github.com/yunionio/onecloud/pkg/compute/guestdrivers" + _ "yunion.io/x/onecloud/pkg/compute/guestdrivers" - _ "github.com/yunionio/onecloud/pkg/util/aliyun/provider" - _ "github.com/yunionio/onecloud/pkg/util/esxi/provider" + _ "yunion.io/x/onecloud/pkg/util/aliyun/provider" + _ "yunion.io/x/onecloud/pkg/util/esxi/provider" ) func StartService() { diff --git a/pkg/compute/tasks/baremetal_convert_hypervisor_task.go b/pkg/compute/tasks/baremetal_convert_hypervisor_task.go index e69cf75222..392a8f7ddd 100644 --- a/pkg/compute/tasks/baremetal_convert_hypervisor_task.go +++ b/pkg/compute/tasks/baremetal_convert_hypervisor_task.go @@ -3,11 +3,11 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) const ( diff --git a/pkg/compute/tasks/cloud_provider_sync_info_task.go b/pkg/compute/tasks/cloud_provider_sync_info_task.go index a6f6cf2348..84af4378a6 100644 --- a/pkg/compute/tasks/cloud_provider_sync_info_task.go +++ b/pkg/compute/tasks/cloud_provider_sync_info_task.go @@ -4,13 +4,13 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/pkg/utils" + "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" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/pkg/utils" ) type CloudProviderSyncInfoTask struct { diff --git a/pkg/compute/tasks/disk_base_task.go b/pkg/compute/tasks/disk_base_task.go index 872f04faa1..ddd4445b20 100644 --- a/pkg/compute/tasks/disk_base_task.go +++ b/pkg/compute/tasks/disk_base_task.go @@ -3,8 +3,8 @@ package tasks import ( "context" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" ) type SDiskBaseTask struct { diff --git a/pkg/compute/tasks/disk_delete_task.go b/pkg/compute/tasks/disk_delete_task.go index 015ebf9345..2ac629ecf9 100644 --- a/pkg/compute/tasks/disk_delete_task.go +++ b/pkg/compute/tasks/disk_delete_task.go @@ -3,11 +3,11 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/options" + "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" + "yunion.io/x/onecloud/pkg/compute/options" ) type DiskDeleteTask struct { diff --git a/pkg/compute/tasks/guest_base_task.go b/pkg/compute/tasks/guest_base_task.go index 87fec1609c..f6b3bbd147 100644 --- a/pkg/compute/tasks/guest_base_task.go +++ b/pkg/compute/tasks/guest_base_task.go @@ -3,8 +3,8 @@ package tasks import ( "context" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/compute/models" ) type SGuestBaseTask struct { diff --git a/pkg/compute/tasks/guest_batch_create_task.go b/pkg/compute/tasks/guest_batch_create_task.go index fa57be62dc..b13c695e16 100644 --- a/pkg/compute/tasks/guest_batch_create_task.go +++ b/pkg/compute/tasks/guest_batch_create_task.go @@ -4,16 +4,16 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/lockman" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/lockman" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type GuestBatchCreateTask struct { diff --git a/pkg/compute/tasks/guest_create_task.go b/pkg/compute/tasks/guest_create_task.go index 26f64ae64e..a57f49afca 100644 --- a/pkg/compute/tasks/guest_create_task.go +++ b/pkg/compute/tasks/guest_create_task.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient" - "github.com/yunionio/onecloud/pkg/compute/models" + "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/cloudcommon/notifyclient" + "yunion.io/x/onecloud/pkg/compute/models" ) type GuestCreateTask struct { diff --git a/pkg/compute/tasks/guest_delete_task.go b/pkg/compute/tasks/guest_delete_task.go index 6c18a50058..09666d5e52 100644 --- a/pkg/compute/tasks/guest_delete_task.go +++ b/pkg/compute/tasks/guest_delete_task.go @@ -3,13 +3,13 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudcommon/notifyclient" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/onecloud/pkg/cloudcommon/notifyclient" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/pkg/utils" ) type GuestDeleteTask struct { diff --git a/pkg/compute/tasks/guest_deploy_task.go b/pkg/compute/tasks/guest_deploy_task.go index 230f82640f..47fd39b7c7 100644 --- a/pkg/compute/tasks/guest_deploy_task.go +++ b/pkg/compute/tasks/guest_deploy_task.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type GuestDeployTask struct { diff --git a/pkg/compute/tasks/guest_detach_all_disks_task.go b/pkg/compute/tasks/guest_detach_all_disks_task.go index cfc6465322..ed2bc2529a 100644 --- a/pkg/compute/tasks/guest_detach_all_disks_task.go +++ b/pkg/compute/tasks/guest_detach_all_disks_task.go @@ -3,10 +3,10 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type GuestDetachAllDisksTask struct { diff --git a/pkg/compute/tasks/guest_detach_disk_task.go b/pkg/compute/tasks/guest_detach_disk_task.go index 2dff6ca781..b8af7ce35c 100644 --- a/pkg/compute/tasks/guest_detach_disk_task.go +++ b/pkg/compute/tasks/guest_detach_disk_task.go @@ -3,9 +3,9 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" ) type GuestDetachDiskTask struct { diff --git a/pkg/compute/tasks/guest_insert_iso_task.go b/pkg/compute/tasks/guest_insert_iso_task.go index 59926cfd73..21bb54b31d 100644 --- a/pkg/compute/tasks/guest_insert_iso_task.go +++ b/pkg/compute/tasks/guest_insert_iso_task.go @@ -3,9 +3,9 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/cloudcommon/db/taskman" ) type GuestInsertIsoTask struct { diff --git a/pkg/compute/tasks/guest_start_task.go b/pkg/compute/tasks/guest_start_task.go index b54f6e916d..3d910543a6 100644 --- a/pkg/compute/tasks/guest_start_task.go +++ b/pkg/compute/tasks/guest_start_task.go @@ -3,10 +3,10 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type GuestStartTask struct { diff --git a/pkg/compute/tasks/guest_stop_task.go b/pkg/compute/tasks/guest_stop_task.go index b2843cc377..ddffa32032 100644 --- a/pkg/compute/tasks/guest_stop_task.go +++ b/pkg/compute/tasks/guest_stop_task.go @@ -4,11 +4,11 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type GuestStopTask struct { diff --git a/pkg/compute/tasks/guest_syncstatus_task.go b/pkg/compute/tasks/guest_syncstatus_task.go index bb8431fff3..6c4b5f5af4 100644 --- a/pkg/compute/tasks/guest_syncstatus_task.go +++ b/pkg/compute/tasks/guest_syncstatus_task.go @@ -3,12 +3,12 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" + "yunion.io/x/onecloud/pkg/compute/models" ) type GuestSyncstatusTask struct { diff --git a/pkg/compute/tasks/guest_undeploy_task.go b/pkg/compute/tasks/guest_undeploy_task.go index 90958eb21d..1cb128ec53 100644 --- a/pkg/compute/tasks/guest_undeploy_task.go +++ b/pkg/compute/tasks/guest_undeploy_task.go @@ -3,11 +3,11 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/util/httputils" + "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" + "yunion.io/x/onecloud/pkg/util/httputils" ) type GuestUndeployTask struct { diff --git a/pkg/compute/tasks/network_create_task.go b/pkg/compute/tasks/network_create_task.go index 57a0151ae4..76919660bf 100644 --- a/pkg/compute/tasks/network_create_task.go +++ b/pkg/compute/tasks/network_create_task.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" + "yunion.io/x/onecloud/pkg/compute/models" ) type NetworkCreateTask struct { diff --git a/pkg/compute/tasks/network_delete_task.go b/pkg/compute/tasks/network_delete_task.go index 38d5c7f28d..75436db5de 100644 --- a/pkg/compute/tasks/network_delete_task.go +++ b/pkg/compute/tasks/network_delete_task.go @@ -3,12 +3,12 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" + "yunion.io/x/onecloud/pkg/compute/models" ) type NetworkDeleteTask struct { diff --git a/pkg/compute/tasks/storage_cache_image_task.go b/pkg/compute/tasks/storage_cache_image_task.go index 0a9346d410..ffd44c6c62 100644 --- a/pkg/compute/tasks/storage_cache_image_task.go +++ b/pkg/compute/tasks/storage_cache_image_task.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type StorageCacheImageTask struct { diff --git a/pkg/compute/tasks/storage_uncache_image_task.go b/pkg/compute/tasks/storage_uncache_image_task.go index 2099097481..7e4e9743b9 100644 --- a/pkg/compute/tasks/storage_uncache_image_task.go +++ b/pkg/compute/tasks/storage_uncache_image_task.go @@ -3,10 +3,10 @@ package tasks import ( "context" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" ) type StorageUncacheImageTask struct { diff --git a/pkg/compute/tasks/vpc_create_task.go b/pkg/compute/tasks/vpc_create_task.go index e6eaac0bf1..7708bb04f4 100644 --- a/pkg/compute/tasks/vpc_create_task.go +++ b/pkg/compute/tasks/vpc_create_task.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" + "yunion.io/x/onecloud/pkg/compute/models" ) type VpcCreateTask struct { diff --git a/pkg/compute/tasks/vpc_delete_task.go b/pkg/compute/tasks/vpc_delete_task.go index e6957fb81d..5bffb80e97 100644 --- a/pkg/compute/tasks/vpc_delete_task.go +++ b/pkg/compute/tasks/vpc_delete_task.go @@ -4,12 +4,12 @@ import ( "context" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/cloudcommon/db/taskman" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "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" + "yunion.io/x/onecloud/pkg/compute/models" ) type VpcDeleteTask struct { diff --git a/pkg/compute/usages/handler.go b/pkg/compute/usages/handler.go index 23b7b6c2c1..de4013c749 100644 --- a/pkg/compute/usages/handler.go +++ b/pkg/compute/usages/handler.go @@ -5,17 +5,17 @@ import ( "fmt" "net/http" - json "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/utils" + json "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/cloudcommon/db" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/utils" ) type Usage map[string]interface{} diff --git a/pkg/dns/dns.go b/pkg/dns/dns.go index 9c1b135932..b60ab73c51 100644 --- a/pkg/dns/dns.go +++ b/pkg/dns/dns.go @@ -23,13 +23,13 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/kubernetes" - ylog "github.com/yunionio/log" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + ylog "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" - "github.com/yunionio/onecloud/pkg/cloudcommon/db" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/onecloud/pkg/util/k8s" + "yunion.io/x/onecloud/pkg/cloudcommon/db" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/util/k8s" ) const ( diff --git a/pkg/dns/parse.go b/pkg/dns/parse.go index 5b9b59b32c..5cf836b646 100644 --- a/pkg/dns/parse.go +++ b/pkg/dns/parse.go @@ -7,9 +7,9 @@ import ( "github.com/coredns/coredns/request" "github.com/miekg/dns" - "github.com/yunionio/pkg/tristate" + "yunion.io/x/pkg/tristate" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/models" ) type recordRequest struct { diff --git a/pkg/dns/reverse.go b/pkg/dns/reverse.go index ea2b76def1..e6cf7e2276 100644 --- a/pkg/dns/reverse.go +++ b/pkg/dns/reverse.go @@ -8,9 +8,9 @@ import ( "github.com/coredns/coredns/plugin/pkg/dnsutil" "github.com/coredns/coredns/request" - "github.com/yunionio/log" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/compute/models" ) // Reverse implements the ServiceBackend interface diff --git a/pkg/dns/setup.go b/pkg/dns/setup.go index d4c57824ac..1a6a1ff673 100644 --- a/pkg/dns/setup.go +++ b/pkg/dns/setup.go @@ -9,7 +9,7 @@ import ( "github.com/coredns/coredns/plugin/pkg/upstream" "github.com/mholt/caddy" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/pkg/util/regutils" ) func init() { diff --git a/pkg/httperrors/errors.go b/pkg/httperrors/errors.go index b3585e8312..77d0e62d67 100644 --- a/pkg/httperrors/errors.go +++ b/pkg/httperrors/errors.go @@ -3,7 +3,7 @@ package httperrors import ( "fmt" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/onecloud/pkg/util/httputils" ) func NewJsonClientError(code int, title string, msg string) *httputils.JSONClientError { diff --git a/pkg/httperrors/httperrors.go b/pkg/httperrors/httperrors.go index cad0294fae..a696ab0394 100644 --- a/pkg/httperrors/httperrors.go +++ b/pkg/httperrors/httperrors.go @@ -4,8 +4,8 @@ import ( "fmt" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/httputils" ) func HTTPError(w http.ResponseWriter, msg string, statusCode int, class string) { diff --git a/pkg/mcclient/auth/auth.go b/pkg/mcclient/auth/auth.go index c74f10f306..214be4b0ad 100644 --- a/pkg/mcclient/auth/auth.go +++ b/pkg/mcclient/auth/auth.go @@ -4,10 +4,10 @@ import ( "fmt" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/cache" + "yunion.io/x/log" + "yunion.io/x/pkg/util/cache" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) var ( diff --git a/pkg/mcclient/auth/middleware.go b/pkg/mcclient/auth/middleware.go index 6cffbcbd28..d48d4f693b 100644 --- a/pkg/mcclient/auth/middleware.go +++ b/pkg/mcclient/auth/middleware.go @@ -4,12 +4,12 @@ import ( "context" "net/http" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/appctx" - "github.com/yunionio/onecloud/pkg/appsrv" - "github.com/yunionio/onecloud/pkg/httperrors" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/appsrv" + "yunion.io/x/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) const ( diff --git a/pkg/mcclient/mcclient.go b/pkg/mcclient/mcclient.go index 7d9e4f56e7..92bf5b4bb9 100644 --- a/pkg/mcclient/mcclient.go +++ b/pkg/mcclient/mcclient.go @@ -8,8 +8,8 @@ import ( "net/http" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/httputils" ) /*const ( diff --git a/pkg/mcclient/modules/base.go b/pkg/mcclient/modules/base.go index 1590e52082..231fae5e13 100644 --- a/pkg/mcclient/modules/base.go +++ b/pkg/mcclient/modules/base.go @@ -7,10 +7,10 @@ import ( "net/url" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type BaseManager struct { diff --git a/pkg/mcclient/modules/joint.go b/pkg/mcclient/modules/joint.go index 458d13129b..53e76815ae 100644 --- a/pkg/mcclient/modules/joint.go +++ b/pkg/mcclient/modules/joint.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type JointResourceManager struct { diff --git a/pkg/mcclient/modules/k8s/base.go b/pkg/mcclient/modules/k8s/base.go index 14fd75bef1..6c5eef1847 100644 --- a/pkg/mcclient/modules/k8s/base.go +++ b/pkg/mcclient/modules/k8s/base.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func NewManager(keyword, keywordPlural string, columns, adminColumns []string) *modules.ResourceManager { diff --git a/pkg/mcclient/modules/k8s/cluster.go b/pkg/mcclient/modules/k8s/cluster.go index 36f54e3826..df2df5ca39 100644 --- a/pkg/mcclient/modules/k8s/cluster.go +++ b/pkg/mcclient/modules/k8s/cluster.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) var ( diff --git a/pkg/mcclient/modules/k8s/event.go b/pkg/mcclient/modules/k8s/event.go index 1710c809fb..f71c5541ef 100644 --- a/pkg/mcclient/modules/k8s/event.go +++ b/pkg/mcclient/modules/k8s/event.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) var ( diff --git a/pkg/mcclient/modules/k8s/node.go b/pkg/mcclient/modules/k8s/node.go index de10501185..5b8cb0798b 100644 --- a/pkg/mcclient/modules/k8s/node.go +++ b/pkg/mcclient/modules/k8s/node.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) var ( diff --git a/pkg/mcclient/modules/k8s/pod.go b/pkg/mcclient/modules/k8s/pod.go index 3122cf8e2c..46417df838 100644 --- a/pkg/mcclient/modules/k8s/pod.go +++ b/pkg/mcclient/modules/k8s/pod.go @@ -1,7 +1,7 @@ package k8s import ( - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) var Pods *PodManager diff --git a/pkg/mcclient/modules/mod_alarmevents.go b/pkg/mcclient/modules/mod_alarmevents.go index 3f07083cdc..56292a6cc2 100644 --- a/pkg/mcclient/modules/mod_alarmevents.go +++ b/pkg/mcclient/modules/mod_alarmevents.go @@ -1,8 +1,8 @@ package modules import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type AlarmEventsManager struct { diff --git a/pkg/mcclient/modules/mod_contacts.go b/pkg/mcclient/modules/mod_contacts.go index 2f045e46ea..af48f980e5 100644 --- a/pkg/mcclient/modules/mod_contacts.go +++ b/pkg/mcclient/modules/mod_contacts.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ContactsManager struct { diff --git a/pkg/mcclient/modules/mod_domains.go b/pkg/mcclient/modules/mod_domains.go index 743c171c9b..81f1d10345 100644 --- a/pkg/mcclient/modules/mod_domains.go +++ b/pkg/mcclient/modules/mod_domains.go @@ -3,11 +3,11 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/httputils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) type DomainManager struct { diff --git a/pkg/mcclient/modules/mod_groups.go b/pkg/mcclient/modules/mod_groups.go index fcfeec754d..0f88199b26 100644 --- a/pkg/mcclient/modules/mod_groups.go +++ b/pkg/mcclient/modules/mod_groups.go @@ -3,7 +3,7 @@ package modules import ( "fmt" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) type GroupManager struct { diff --git a/pkg/mcclient/modules/mod_hosts.go b/pkg/mcclient/modules/mod_hosts.go index 135a4729a8..0a278cac6c 100644 --- a/pkg/mcclient/modules/mod_hosts.go +++ b/pkg/mcclient/modules/mod_hosts.go @@ -3,9 +3,9 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/utils" ) type HostManager struct { diff --git a/pkg/mcclient/modules/mod_images.go b/pkg/mcclient/modules/mod_images.go index 9264241e0d..c7423c2436 100644 --- a/pkg/mcclient/modules/mod_images.go +++ b/pkg/mcclient/modules/mod_images.go @@ -7,13 +7,13 @@ import ( "net/url" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/util/httputils" - "github.com/yunionio/pkg/utils" + "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" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) type ImageManager struct { diff --git a/pkg/mcclient/modules/mod_infos.go b/pkg/mcclient/modules/mod_infos.go index e22dbb5257..f4fdd90813 100644 --- a/pkg/mcclient/modules/mod_infos.go +++ b/pkg/mcclient/modules/mod_infos.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type InfoManager struct { diff --git a/pkg/mcclient/modules/mod_license.go b/pkg/mcclient/modules/mod_license.go index 76d007a36f..45dd1c904a 100644 --- a/pkg/mcclient/modules/mod_license.go +++ b/pkg/mcclient/modules/mod_license.go @@ -5,8 +5,8 @@ import ( "io" "net/http" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type LicenseManager struct { diff --git a/pkg/mcclient/modules/mod_nodes.go b/pkg/mcclient/modules/mod_nodes.go index 57aa7d9c1f..47f2bcab27 100644 --- a/pkg/mcclient/modules/mod_nodes.go +++ b/pkg/mcclient/modules/mod_nodes.go @@ -4,8 +4,8 @@ import ( "fmt" "net/url" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type NodeManager struct { diff --git a/pkg/mcclient/modules/mod_performances.go b/pkg/mcclient/modules/mod_performances.go index b1d6b362f2..ce585a2a2e 100644 --- a/pkg/mcclient/modules/mod_performances.go +++ b/pkg/mcclient/modules/mod_performances.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type PerformanceManager struct { diff --git a/pkg/mcclient/modules/mod_projects.go b/pkg/mcclient/modules/mod_projects.go index 7794fc263a..61ae01147a 100644 --- a/pkg/mcclient/modules/mod_projects.go +++ b/pkg/mcclient/modules/mod_projects.go @@ -4,10 +4,10 @@ import ( "fmt" "sync" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/onecloud/pkg/util/httputils" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ProjectManagerV3 struct { diff --git a/pkg/mcclient/modules/mod_quotas.go b/pkg/mcclient/modules/mod_quotas.go index 93afbffc76..88a1cb4823 100644 --- a/pkg/mcclient/modules/mod_quotas.go +++ b/pkg/mcclient/modules/mod_quotas.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type QuotaManager struct { diff --git a/pkg/mcclient/modules/mod_recipients.go b/pkg/mcclient/modules/mod_recipients.go index f3df4985cb..2defc01c50 100644 --- a/pkg/mcclient/modules/mod_recipients.go +++ b/pkg/mcclient/modules/mod_recipients.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type RecipientsManager struct { diff --git a/pkg/mcclient/modules/mod_reservedips.go b/pkg/mcclient/modules/mod_reservedips.go index c599cb314a..bcd09ca9b6 100644 --- a/pkg/mcclient/modules/mod_reservedips.go +++ b/pkg/mcclient/modules/mod_reservedips.go @@ -4,8 +4,8 @@ import ( "strings" "sync" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ReservedIPManager struct { diff --git a/pkg/mcclient/modules/mod_roleassignments.go b/pkg/mcclient/modules/mod_roleassignments.go index 3545519032..7a9b70a028 100644 --- a/pkg/mcclient/modules/mod_roleassignments.go +++ b/pkg/mcclient/modules/mod_roleassignments.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type RoleAssignmentManagerV3 struct { diff --git a/pkg/mcclient/modules/mod_roles.go b/pkg/mcclient/modules/mod_roles.go index 5c54cc67b1..bed2812d74 100644 --- a/pkg/mcclient/modules/mod_roles.go +++ b/pkg/mcclient/modules/mod_roles.go @@ -3,9 +3,9 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/util/httputils" ) type RolesManager struct { diff --git a/pkg/mcclient/modules/mod_schedtags.go b/pkg/mcclient/modules/mod_schedtags.go index e3dbd732f4..a9667a62a6 100644 --- a/pkg/mcclient/modules/mod_schedtags.go +++ b/pkg/mcclient/modules/mod_schedtags.go @@ -3,8 +3,8 @@ package modules import ( "sync" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type SchedtagManager struct { diff --git a/pkg/mcclient/modules/mod_scheduler.go b/pkg/mcclient/modules/mod_scheduler.go index 20b9db7b90..3d3ba37dd7 100644 --- a/pkg/mcclient/modules/mod_scheduler.go +++ b/pkg/mcclient/modules/mod_scheduler.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) var ( diff --git a/pkg/mcclient/modules/mod_servers.go b/pkg/mcclient/modules/mod_servers.go index a3c522c02f..317dc6194a 100644 --- a/pkg/mcclient/modules/mod_servers.go +++ b/pkg/mcclient/modules/mod_servers.go @@ -3,9 +3,9 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/utils" ) type ServerManager struct { diff --git a/pkg/mcclient/modules/mod_servicehosts.go b/pkg/mcclient/modules/mod_servicehosts.go index c84216ddd3..104ce2fbb9 100644 --- a/pkg/mcclient/modules/mod_servicehosts.go +++ b/pkg/mcclient/modules/mod_servicehosts.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type ServiceNodeManager struct { diff --git a/pkg/mcclient/modules/mod_specs.go b/pkg/mcclient/modules/mod_specs.go index eba92ebfa2..5543c2d01d 100644 --- a/pkg/mcclient/modules/mod_specs.go +++ b/pkg/mcclient/modules/mod_specs.go @@ -5,9 +5,9 @@ import ( "net/url" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/pkg/utils" ) type SpecsManager struct { diff --git a/pkg/mcclient/modules/mod_stastics.go b/pkg/mcclient/modules/mod_stastics.go index 6160c106c5..2c1b68c8f0 100644 --- a/pkg/mcclient/modules/mod_stastics.go +++ b/pkg/mcclient/modules/mod_stastics.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type StatisticsManager struct { diff --git a/pkg/mcclient/modules/mod_treenodes.go b/pkg/mcclient/modules/mod_treenodes.go index 0f86b104a8..4c6aa9e77c 100644 --- a/pkg/mcclient/modules/mod_treenodes.go +++ b/pkg/mcclient/modules/mod_treenodes.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type TreenodeManager struct { diff --git a/pkg/mcclient/modules/mod_usages.go b/pkg/mcclient/modules/mod_usages.go index ff9daa18ae..1fea693be7 100644 --- a/pkg/mcclient/modules/mod_usages.go +++ b/pkg/mcclient/modules/mod_usages.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type UsageManager struct { diff --git a/pkg/mcclient/modules/mod_users.go b/pkg/mcclient/modules/mod_users.go index 71ae931f40..a42c58cc08 100644 --- a/pkg/mcclient/modules/mod_users.go +++ b/pkg/mcclient/modules/mod_users.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/mcclient" ) type UserManager struct { diff --git a/pkg/mcclient/modules/mod_vncproxy.go b/pkg/mcclient/modules/mod_vncproxy.go index 9179b754dc..e6331b1961 100644 --- a/pkg/mcclient/modules/mod_vncproxy.go +++ b/pkg/mcclient/modules/mod_vncproxy.go @@ -3,8 +3,8 @@ package modules import ( "fmt" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type VNCProxyManager struct { diff --git a/pkg/mcclient/modules/modules.go b/pkg/mcclient/modules/modules.go index 292af8e04f..2381f50232 100644 --- a/pkg/mcclient/modules/modules.go +++ b/pkg/mcclient/modules/modules.go @@ -5,8 +5,8 @@ import ( "log" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient" ) type BaseManagerInterface interface { diff --git a/pkg/mcclient/modules/resource.go b/pkg/mcclient/modules/resource.go index fcdc6f3576..473e38b67a 100644 --- a/pkg/mcclient/modules/resource.go +++ b/pkg/mcclient/modules/resource.go @@ -5,11 +5,11 @@ import ( "net/url" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/httperrors" - "github.com/yunionio/onecloud/pkg/util/httputils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/httperrors" + "yunion.io/x/onecloud/pkg/util/httputils" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) type ResourceManager struct { diff --git a/pkg/mcclient/modules/version.go b/pkg/mcclient/modules/version.go index e807c420e5..571a415586 100644 --- a/pkg/mcclient/modules/version.go +++ b/pkg/mcclient/modules/version.go @@ -3,7 +3,7 @@ package modules import ( "io/ioutil" - "github.com/yunionio/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient" ) func GetVersion(s *mcclient.ClientSession, serviceType string) (string, error) { diff --git a/pkg/mcclient/session.go b/pkg/mcclient/session.go index 2696e73aeb..d458d65038 100644 --- a/pkg/mcclient/session.go +++ b/pkg/mcclient/session.go @@ -10,9 +10,9 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/util/httputils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/util/httputils" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/mcclient/token.go b/pkg/mcclient/token.go index 5ea9861308..794df976ad 100644 --- a/pkg/mcclient/token.go +++ b/pkg/mcclient/token.go @@ -3,7 +3,7 @@ package mcclient import ( "time" - "github.com/yunionio/pkg/gotypes" + "yunion.io/x/pkg/gotypes" ) type ExternalService struct { diff --git a/pkg/mcclient/tokenman.go b/pkg/mcclient/tokenman.go index d7fa26a505..e94c443fa4 100644 --- a/pkg/mcclient/tokenman.go +++ b/pkg/mcclient/tokenman.go @@ -2,7 +2,7 @@ package mcclient import ( "github.com/golang-plus/uuid" - "github.com/yunionio/log" + "yunion.io/x/log" ) type TokenManager interface { diff --git a/pkg/mcclient/tokensimple.go b/pkg/mcclient/tokensimple.go index 1c5d9b9221..8fbea3a328 100644 --- a/pkg/mcclient/tokensimple.go +++ b/pkg/mcclient/tokensimple.go @@ -6,8 +6,8 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/pkg/gotypes" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/gotypes" ) type SSimpleToken struct { diff --git a/pkg/proxy/http.go b/pkg/proxy/http.go index a4769074d1..a7157d4581 100644 --- a/pkg/proxy/http.go +++ b/pkg/proxy/http.go @@ -7,8 +7,8 @@ import ( "net/http/httputil" "net/url" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/httperrors" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/httperrors" ) type EndpointGenerator func(context.Context, http.ResponseWriter, *http.Request) (string, error) diff --git a/pkg/scheduler/algorithm/helper.go b/pkg/scheduler/algorithm/helper.go index 1fa9814adb..4e4ee6bf47 100644 --- a/pkg/scheduler/algorithm/helper.go +++ b/pkg/scheduler/algorithm/helper.go @@ -3,8 +3,8 @@ package algorithm import ( "fmt" - "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" + "yunion.io/x/onecloud/pkg/scheduler/core" ) func ToHostCandidate(c core.Candidater) (*candidate.HostDesc, error) { diff --git a/pkg/scheduler/algorithm/predicates/aggregate_predicate.go b/pkg/scheduler/algorithm/predicates/aggregate_predicate.go index c3590c3b30..fd788022ec 100644 --- a/pkg/scheduler/algorithm/predicates/aggregate_predicate.go +++ b/pkg/scheduler/algorithm/predicates/aggregate_predicate.go @@ -3,10 +3,10 @@ package predicates import ( "fmt" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" + "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" ) // NOTE: Aggregate Description diff --git a/pkg/scheduler/algorithm/predicates/baremetal/base.go b/pkg/scheduler/algorithm/predicates/baremetal/base.go index 11a8fbee64..2e1e55ebb7 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/base.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/base.go @@ -1,9 +1,9 @@ package baremetal import ( - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type BasePredicate struct { diff --git a/pkg/scheduler/algorithm/predicates/baremetal/cpu_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/cpu_predicate.go index cfa381efe1..f1346eefd6 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/cpu_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/cpu_predicate.go @@ -1,8 +1,8 @@ package baremetal import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type CPUPredicate struct { diff --git a/pkg/scheduler/algorithm/predicates/baremetal/memory_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/memory_predicate.go index 39868fd498..feb9ca7d5d 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/memory_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/memory_predicate.go @@ -1,8 +1,8 @@ package baremetal import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type MemoryPredicate struct { diff --git a/pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go index 43d8d935c2..05f10131ae 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/network_predicate.go @@ -5,10 +5,10 @@ import ( "strings" "sync" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/pkg/utils" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/pkg/utils" ) type NetworkPredicate struct { diff --git a/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go index a84f96d63d..20ddba352a 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/status_predicate.go @@ -1,9 +1,9 @@ package baremetal import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/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/baremetal/storage_predicate.go b/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go index d1fe380f96..9887628b77 100644 --- a/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go +++ b/pkg/scheduler/algorithm/predicates/baremetal/storage_predicate.go @@ -3,10 +3,10 @@ package baremetal import ( "fmt" - //"github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/util/baremetal" + //"yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/util/baremetal" ) type StoragePredicate struct { diff --git a/pkg/scheduler/algorithm/predicates/guest/cpu_predicate.go b/pkg/scheduler/algorithm/predicates/guest/cpu_predicate.go index 613f3cf0e7..f11296603c 100644 --- a/pkg/scheduler/algorithm/predicates/guest/cpu_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/cpu_predicate.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // CPUPredicate check the current resources of the CPU is available, diff --git a/pkg/scheduler/algorithm/predicates/guest/group_predicate.go b/pkg/scheduler/algorithm/predicates/guest/group_predicate.go index a07dc63f02..3233bc1f77 100644 --- a/pkg/scheduler/algorithm/predicates/guest/group_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/group_predicate.go @@ -3,8 +3,8 @@ package guest import ( "fmt" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // GroupPredicate filter the packet based on the label information, diff --git a/pkg/scheduler/algorithm/predicates/guest/hypervisor_predicate.go b/pkg/scheduler/algorithm/predicates/guest/hypervisor_predicate.go index db9c62f898..788d0f0ca2 100644 --- a/pkg/scheduler/algorithm/predicates/guest/hypervisor_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/hypervisor_predicate.go @@ -1,11 +1,11 @@ package guest import ( - "github.com/yunionio/log" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/core" ) const ( diff --git a/pkg/scheduler/algorithm/predicates/guest/isolated_device_predicate.go b/pkg/scheduler/algorithm/predicates/guest/isolated_device_predicate.go index ba5bcaf0cd..98d12fdaa2 100644 --- a/pkg/scheduler/algorithm/predicates/guest/isolated_device_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/isolated_device_predicate.go @@ -3,8 +3,8 @@ package guest import ( "fmt" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // IsolatedDevicePredicate check mode, and number of scheduled diff --git a/pkg/scheduler/algorithm/predicates/guest/memory_predicate.go b/pkg/scheduler/algorithm/predicates/guest/memory_predicate.go index 8c101e090e..4b505a8bb4 100644 --- a/pkg/scheduler/algorithm/predicates/guest/memory_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/memory_predicate.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // MemoryPredicate filter current resources free memory capacity is meet, diff --git a/pkg/scheduler/algorithm/predicates/guest/migrate_predicate.go b/pkg/scheduler/algorithm/predicates/guest/migrate_predicate.go index 7fe3ae7360..10c53736ce 100644 --- a/pkg/scheduler/algorithm/predicates/guest/migrate_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/migrate_predicate.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // MigratePredicate filters whether the current candidate can be migrated. diff --git a/pkg/scheduler/algorithm/predicates/guest/nest_predicate.go b/pkg/scheduler/algorithm/predicates/guest/nest_predicate.go index 29d448789b..ec75e9a2de 100644 --- a/pkg/scheduler/algorithm/predicates/guest/nest_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/nest_predicate.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) // NestPredicate will filter whether the current host is turned on KVM, diff --git a/pkg/scheduler/algorithm/predicates/guest/network_predicate.go b/pkg/scheduler/algorithm/predicates/guest/network_predicate.go index fa9e4df025..8f0c13aa50 100644 --- a/pkg/scheduler/algorithm/predicates/guest/network_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/network_predicate.go @@ -5,11 +5,11 @@ import ( "strings" "sync" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" - networks "github.com/yunionio/onecloud/pkg/scheduler/db/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/core" + networks "yunion.io/x/onecloud/pkg/scheduler/db/models" + "yunion.io/x/pkg/utils" ) // NetworkPredicate will filter the current network information with diff --git a/pkg/scheduler/algorithm/predicates/guest/status_predicate.go b/pkg/scheduler/algorithm/predicates/guest/status_predicate.go index c3f70e2e7a..e6f295ca1b 100644 --- a/pkg/scheduler/algorithm/predicates/guest/status_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/status_predicate.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/predicates" + "yunion.io/x/onecloud/pkg/scheduler/core" ) const ( diff --git a/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go b/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go index c5f5884c89..c4d7a6ccfe 100644 --- a/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go +++ b/pkg/scheduler/algorithm/predicates/guest/storage_predicate.go @@ -4,9 +4,9 @@ import ( "fmt" "strings" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/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/predicates.go b/pkg/scheduler/algorithm/predicates/predicates.go index 5db5b40f85..4131f1d9ff 100644 --- a/pkg/scheduler/algorithm/predicates/predicates.go +++ b/pkg/scheduler/algorithm/predicates/predicates.go @@ -4,11 +4,11 @@ import ( "fmt" "strings" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm" - "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/data_manager" + "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" + "yunion.io/x/onecloud/pkg/scheduler/data_manager" ) // BasePredicate is a default struct for all the predicates that will diff --git a/pkg/scheduler/algorithm/priorities/guest/avoid_same_cluster.go b/pkg/scheduler/algorithm/priorities/guest/avoid_same_cluster.go index 922b29efff..dfa0d0e6ac 100644 --- a/pkg/scheduler/algorithm/priorities/guest/avoid_same_cluster.go +++ b/pkg/scheduler/algorithm/priorities/guest/avoid_same_cluster.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type AvoidSameClusterPriority struct { diff --git a/pkg/scheduler/algorithm/priorities/guest/avoid_same_host.go b/pkg/scheduler/algorithm/priorities/guest/avoid_same_host.go index 22e2559e83..eb784a4213 100644 --- a/pkg/scheduler/algorithm/priorities/guest/avoid_same_host.go +++ b/pkg/scheduler/algorithm/priorities/guest/avoid_same_host.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type AvoidSameHostPriority struct { diff --git a/pkg/scheduler/algorithm/priorities/guest/capacity.go b/pkg/scheduler/algorithm/priorities/guest/capacity.go index 04f668e350..6b0201ab71 100644 --- a/pkg/scheduler/algorithm/priorities/guest/capacity.go +++ b/pkg/scheduler/algorithm/priorities/guest/capacity.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type CapacityPriority struct { diff --git a/pkg/scheduler/algorithm/priorities/guest/creating.go b/pkg/scheduler/algorithm/priorities/guest/creating.go index f737653e84..7e3dc12c8e 100644 --- a/pkg/scheduler/algorithm/priorities/guest/creating.go +++ b/pkg/scheduler/algorithm/priorities/guest/creating.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type CreatingPriority struct { diff --git a/pkg/scheduler/algorithm/priorities/guest/lowload.go b/pkg/scheduler/algorithm/priorities/guest/lowload.go index a4a16a9ef6..cf74609fec 100644 --- a/pkg/scheduler/algorithm/priorities/guest/lowload.go +++ b/pkg/scheduler/algorithm/priorities/guest/lowload.go @@ -1,8 +1,8 @@ package guest import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm/priorities" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type LowLoadPriority struct { diff --git a/pkg/scheduler/algorithm/priorities/priorities.go b/pkg/scheduler/algorithm/priorities/priorities.go index 1af551b6b4..8b3560a0de 100644 --- a/pkg/scheduler/algorithm/priorities/priorities.go +++ b/pkg/scheduler/algorithm/priorities/priorities.go @@ -3,9 +3,9 @@ package priorities import ( "math" - "github.com/yunionio/onecloud/pkg/scheduler/algorithm" - "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/algorithm" + "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" + "yunion.io/x/onecloud/pkg/scheduler/core" ) func aggPriority(x float64) float64 { diff --git a/pkg/scheduler/algorithmprovider/baremetal.go b/pkg/scheduler/algorithmprovider/baremetal.go index 9256b452bd..8850607b98 100644 --- a/pkg/scheduler/algorithmprovider/baremetal.go +++ b/pkg/scheduler/algorithmprovider/baremetal.go @@ -1,10 +1,10 @@ package algorithmprovider import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - predicatebm "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates/baremetal" - "github.com/yunionio/onecloud/pkg/scheduler/factory" - "github.com/yunionio/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 254ec8b3b3..7aab7ef437 100644 --- a/pkg/scheduler/algorithmprovider/defaults.go +++ b/pkg/scheduler/algorithmprovider/defaults.go @@ -1,11 +1,11 @@ package algorithmprovider import ( - "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates" - predicateguest "github.com/yunionio/onecloud/pkg/scheduler/algorithm/predicates/guest" - priorityguest "github.com/yunionio/onecloud/pkg/scheduler/algorithm/priorities/guest" - "github.com/yunionio/onecloud/pkg/scheduler/factory" - "github.com/yunionio/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 8027ee51fe..7f2e41d733 100644 --- a/pkg/scheduler/api/candidate.go +++ b/pkg/scheduler/api/candidate.go @@ -5,7 +5,7 @@ import ( "github.com/bitly/go-simplejson" - "github.com/yunionio/log" + "yunion.io/x/log" ) // CandidateListArgs is a struct just for parsing candidate diff --git a/pkg/scheduler/api/sched.go b/pkg/scheduler/api/sched.go index 9b277a229e..a36ea74ab3 100644 --- a/pkg/scheduler/api/sched.go +++ b/pkg/scheduler/api/sched.go @@ -8,9 +8,9 @@ import ( "github.com/bitly/go-simplejson" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/pkg/utils" ) type Meta map[string]string diff --git a/pkg/scheduler/api/types.go b/pkg/scheduler/api/types.go index 3cc71798db..579f45491c 100644 --- a/pkg/scheduler/api/types.go +++ b/pkg/scheduler/api/types.go @@ -3,7 +3,7 @@ package api import ( "fmt" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/sets" ) const ( diff --git a/pkg/scheduler/cache/cache.go b/pkg/scheduler/cache/cache.go index d5a9356b41..ab0aeab8a1 100644 --- a/pkg/scheduler/cache/cache.go +++ b/pkg/scheduler/cache/cache.go @@ -5,9 +5,9 @@ import ( "reflect" "sync" - "github.com/yunionio/log" - expirationcache "github.com/yunionio/pkg/util/cache" - "github.com/yunionio/pkg/util/wait" + "yunion.io/x/log" + expirationcache "yunion.io/x/pkg/util/cache" + "yunion.io/x/pkg/util/wait" ) var ( diff --git a/pkg/scheduler/cache/candidate/baremetals.go b/pkg/scheduler/cache/candidate/baremetals.go index c8dcd78d6b..f7b584b242 100644 --- a/pkg/scheduler/cache/candidate/baremetals.go +++ b/pkg/scheduler/cache/candidate/baremetals.go @@ -7,12 +7,12 @@ import ( fjson "github.com/json-iterator/go" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - "github.com/yunionio/onecloud/pkg/scheduler/cache/db" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" + "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 BaremetalDesc struct { diff --git a/pkg/scheduler/cache/candidate/candidate.go b/pkg/scheduler/cache/candidate/candidate.go index b3b43cd241..6d341accce 100644 --- a/pkg/scheduler/cache/candidate/candidate.go +++ b/pkg/scheduler/cache/candidate/candidate.go @@ -1,7 +1,7 @@ package candidate import ( - "github.com/yunionio/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache" ) type candidateItem struct { diff --git a/pkg/scheduler/cache/candidate/candidate_test.go b/pkg/scheduler/cache/candidate/candidate_test.go index 620936a486..a6487273fd 100644 --- a/pkg/scheduler/cache/candidate/candidate_test.go +++ b/pkg/scheduler/cache/candidate/candidate_test.go @@ -5,10 +5,10 @@ import ( "testing" "time" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - "github.com/yunionio/onecloud/pkg/scheduler/cache/db" - "github.com/yunionio/onecloud/pkg/scheduler/cache/sync" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" + "yunion.io/x/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache/db" + "yunion.io/x/onecloud/pkg/scheduler/cache/sync" + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) var ( diff --git a/pkg/scheduler/cache/candidate/default.go b/pkg/scheduler/cache/candidate/default.go index 4cd5a6a016..db62721dd7 100644 --- a/pkg/scheduler/cache/candidate/default.go +++ b/pkg/scheduler/cache/candidate/default.go @@ -6,11 +6,11 @@ import ( gosync "sync" "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - u "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "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/desc.go b/pkg/scheduler/cache/candidate/desc.go index a4c28054a3..968b14a05a 100644 --- a/pkg/scheduler/cache/candidate/desc.go +++ b/pkg/scheduler/cache/candidate/desc.go @@ -3,10 +3,10 @@ package candidate import ( "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/db/models" + "yunion.io/x/pkg/utils" ) type baseDesc struct { diff --git a/pkg/scheduler/cache/candidate/hosts.go b/pkg/scheduler/cache/candidate/hosts.go index ed36a9e0e9..0a17ce34db 100644 --- a/pkg/scheduler/cache/candidate/hosts.go +++ b/pkg/scheduler/cache/candidate/hosts.go @@ -8,17 +8,17 @@ import ( "sync/atomic" "time" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - "github.com/yunionio/onecloud/pkg/scheduler/cache/db" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - "github.com/yunionio/pkg/util/errors" - "github.com/yunionio/pkg/util/sets" - "github.com/yunionio/pkg/util/workqueue" - "github.com/yunionio/pkg/utils" + "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" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/core" ) type HostDesc struct { diff --git a/pkg/scheduler/cache/candidate/interface.go b/pkg/scheduler/cache/candidate/interface.go index b725620f10..f8fde13670 100644 --- a/pkg/scheduler/cache/candidate/interface.go +++ b/pkg/scheduler/cache/candidate/interface.go @@ -1,7 +1,7 @@ package candidate import ( - "github.com/yunionio/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache" ) type groupCacher interface { diff --git a/pkg/scheduler/cache/db/db.go b/pkg/scheduler/cache/db/db.go index 88b5e90db9..c6efbcf983 100644 --- a/pkg/scheduler/cache/db/db.go +++ b/pkg/scheduler/cache/db/db.go @@ -1,7 +1,7 @@ package db import ( - "github.com/yunionio/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache" ) type dbItem struct { diff --git a/pkg/scheduler/cache/db/default.go b/pkg/scheduler/cache/db/default.go index ecbce0e495..c1e34a95a0 100644 --- a/pkg/scheduler/cache/db/default.go +++ b/pkg/scheduler/cache/db/default.go @@ -3,10 +3,10 @@ package db import ( "time" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - u "github.com/yunionio/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/group_manager.go b/pkg/scheduler/cache/group_manager.go index 30eb1d102c..2f57c33355 100644 --- a/pkg/scheduler/cache/group_manager.go +++ b/pkg/scheduler/cache/group_manager.go @@ -3,7 +3,7 @@ package cache import ( "fmt" - "github.com/yunionio/log" + "yunion.io/x/log" ) type GroupManager struct { diff --git a/pkg/scheduler/cache/item.go b/pkg/scheduler/cache/item.go index 9213ff6fb7..9d0366f323 100644 --- a/pkg/scheduler/cache/item.go +++ b/pkg/scheduler/cache/item.go @@ -3,7 +3,7 @@ package cache import ( "time" - expirationcache "github.com/yunionio/pkg/util/cache" + expirationcache "yunion.io/x/pkg/util/cache" ) type UpdateFunc func([]string) ([]interface{}, error) diff --git a/pkg/scheduler/cache/sync/default.go b/pkg/scheduler/cache/sync/default.go index d518ab73a7..8d6f8121bf 100644 --- a/pkg/scheduler/cache/sync/default.go +++ b/pkg/scheduler/cache/sync/default.go @@ -1,10 +1,10 @@ package sync import ( - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - networks_db "github.com/yunionio/onecloud/pkg/scheduler/cache/sync/networks/db" - u "github.com/yunionio/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 4d532837c5..27dce799e6 100644 --- a/pkg/scheduler/cache/sync/network.go +++ b/pkg/scheduler/cache/sync/network.go @@ -1,8 +1,8 @@ package sync import ( - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/onecloud/pkg/scheduler/db/models" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/cache/sync/network_data.go b/pkg/scheduler/cache/sync/network_data.go index ded69a8ed2..f2f6b6c33b 100644 --- a/pkg/scheduler/cache/sync/network_data.go +++ b/pkg/scheduler/cache/sync/network_data.go @@ -3,9 +3,9 @@ package sync import ( "fmt" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/db/models" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/cache/sync/networks/db/db.go b/pkg/scheduler/cache/sync/networks/db/db.go index b9ea7b2e69..15c06dc436 100644 --- a/pkg/scheduler/cache/sync/networks/db/db.go +++ b/pkg/scheduler/cache/sync/networks/db/db.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) const ( diff --git a/pkg/scheduler/cache/sync/sync.go b/pkg/scheduler/cache/sync/sync.go index 254bf1248a..76965ac3fe 100644 --- a/pkg/scheduler/cache/sync/sync.go +++ b/pkg/scheduler/cache/sync/sync.go @@ -1,7 +1,7 @@ package sync import ( - "github.com/yunionio/onecloud/pkg/scheduler/cache" + "yunion.io/x/onecloud/pkg/scheduler/cache" ) func NewSyncManager(stopCh <-chan struct{}) *cache.GroupManager { diff --git a/pkg/scheduler/core/context.go b/pkg/scheduler/core/context.go index 5943bef592..a05f4987de 100644 --- a/pkg/scheduler/core/context.go +++ b/pkg/scheduler/core/context.go @@ -6,8 +6,8 @@ import ( "strings" "sync" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" ) const ( diff --git a/pkg/scheduler/core/generic_scheduler.go b/pkg/scheduler/core/generic_scheduler.go index a840dd66ae..c7775dfb10 100644 --- a/pkg/scheduler/core/generic_scheduler.go +++ b/pkg/scheduler/core/generic_scheduler.go @@ -8,12 +8,12 @@ import ( "sync/atomic" "time" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/pkg/util/errors" - gp "github.com/yunionio/pkg/util/goroutine_pool" - utiltrace "github.com/yunionio/pkg/util/trace" - "github.com/yunionio/pkg/util/workqueue" + "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" ) const ( diff --git a/pkg/scheduler/core/resource.go b/pkg/scheduler/core/resource.go index 36c6d55523..01364deba0 100644 --- a/pkg/scheduler/core/resource.go +++ b/pkg/scheduler/core/resource.go @@ -1,7 +1,7 @@ package core import ( - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) type value_t interface{} diff --git a/pkg/scheduler/core/types.go b/pkg/scheduler/core/types.go index 0cb7a93377..0a6bd07fb9 100644 --- a/pkg/scheduler/core/types.go +++ b/pkg/scheduler/core/types.go @@ -2,8 +2,8 @@ package core import ( //"sync" - //"github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" + //"yunion.io/x/onecloud/pkg/scheduler/cache/candidate" + "yunion.io/x/onecloud/pkg/scheduler/db/models" ) const ( diff --git a/pkg/scheduler/data_manager/candidate_manager.go b/pkg/scheduler/data_manager/candidate_manager.go index 66f1ee4677..93c5f4efb8 100644 --- a/pkg/scheduler/data_manager/candidate_manager.go +++ b/pkg/scheduler/data_manager/candidate_manager.go @@ -4,12 +4,12 @@ import ( "fmt" "time" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - candidatecache "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - dbcache "github.com/yunionio/onecloud/pkg/scheduler/cache/db" - synccache "github.com/yunionio/onecloud/pkg/scheduler/cache/sync" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/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 338a230fb3..e6c52c8dbb 100644 --- a/pkg/scheduler/data_manager/network_manager.go +++ b/pkg/scheduler/data_manager/network_manager.go @@ -3,10 +3,10 @@ package data_manager import ( "sync" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/cache" - synccache "github.com/yunionio/onecloud/pkg/scheduler/cache/sync" - networks_db "github.com/yunionio/onecloud/pkg/scheduler/cache/sync/networks/db" + "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 93c4df2c69..cd129a32aa 100644 --- a/pkg/scheduler/data_manager/reserved_algorithm.go +++ b/pkg/scheduler/data_manager/reserved_algorithm.go @@ -1,8 +1,8 @@ package data_manager import ( - candidatecache "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/pkg/utils" + candidatecache "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" + "yunion.io/x/pkg/utils" ) type ResAlgorithm interface { diff --git a/pkg/scheduler/data_manager/reserved_pool.go b/pkg/scheduler/data_manager/reserved_pool.go index d8fad90b78..3bf2eaa770 100644 --- a/pkg/scheduler/data_manager/reserved_pool.go +++ b/pkg/scheduler/data_manager/reserved_pool.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/yunionio/pkg/util/wait" + "yunion.io/x/pkg/util/wait" ) const ( diff --git a/pkg/scheduler/db/db.go b/pkg/scheduler/db/db.go index 73d0c160a6..9cf4213644 100644 --- a/pkg/scheduler/db/db.go +++ b/pkg/scheduler/db/db.go @@ -4,7 +4,7 @@ import ( "github.com/jinzhu/gorm" _ "github.com/jinzhu/gorm/dialects/mysql" - "github.com/yunionio/log" + "yunion.io/x/log" ) var DB *gorm.DB diff --git a/pkg/scheduler/db/models/default.go b/pkg/scheduler/db/models/default.go index 48c0d06325..7866de9dc0 100644 --- a/pkg/scheduler/db/models/default.go +++ b/pkg/scheduler/db/models/default.go @@ -1,7 +1,7 @@ package models import ( - "github.com/yunionio/onecloud/pkg/scheduler/db" + "yunion.io/x/onecloud/pkg/scheduler/db" ) const ( diff --git a/pkg/scheduler/db/models/disk.go b/pkg/scheduler/db/models/disk.go index 7b73f19d4c..ddc9ab12f7 100644 --- a/pkg/scheduler/db/models/disk.go +++ b/pkg/scheduler/db/models/disk.go @@ -3,7 +3,7 @@ package models import ( "github.com/jinzhu/gorm" - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/db/models/guest.go b/pkg/scheduler/db/models/guest.go index 346b8e7b2e..c600242a1e 100644 --- a/pkg/scheduler/db/models/guest.go +++ b/pkg/scheduler/db/models/guest.go @@ -6,7 +6,7 @@ import ( "github.com/jinzhu/gorm" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/sets" ) const ( diff --git a/pkg/scheduler/db/models/host.go b/pkg/scheduler/db/models/host.go index 20615fa1ab..99311516be 100644 --- a/pkg/scheduler/db/models/host.go +++ b/pkg/scheduler/db/models/host.go @@ -6,8 +6,8 @@ import ( "github.com/jinzhu/gorm" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/api" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/onecloud/pkg/scheduler/api" ) const ( diff --git a/pkg/scheduler/db/models/networks.go b/pkg/scheduler/db/models/networks.go index aa4baa6a87..45ce3551c6 100644 --- a/pkg/scheduler/db/models/networks.go +++ b/pkg/scheduler/db/models/networks.go @@ -6,7 +6,7 @@ import ( "github.com/jinzhu/gorm" - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/db/models/storage.go b/pkg/scheduler/db/models/storage.go index 99cf65be4b..d9b54fa918 100644 --- a/pkg/scheduler/db/models/storage.go +++ b/pkg/scheduler/db/models/storage.go @@ -6,7 +6,7 @@ import ( "github.com/jinzhu/gorm" - o "github.com/yunionio/onecloud/cmd/scheduler/options" + o "yunion.io/x/onecloud/cmd/scheduler/options" ) type Storage struct { diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go index dea801d573..f5f5ac71ca 100644 --- a/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -3,8 +3,8 @@ package factory import ( "fmt" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/pkg/util/sets" ) func GetAlgorithmProvider(name string) (*AlgorithmProviderConfig, error) { diff --git a/pkg/scheduler/factory/plugins.go b/pkg/scheduler/factory/plugins.go index 562a95b428..d56e410300 100644 --- a/pkg/scheduler/factory/plugins.go +++ b/pkg/scheduler/factory/plugins.go @@ -5,9 +5,9 @@ import ( "regexp" "sync" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/pkg/util/sets" ) type AlgorithmProviderConfig struct { diff --git a/pkg/scheduler/handler/handler.go b/pkg/scheduler/handler/handler.go index 737728a03c..a71dab429f 100644 --- a/pkg/scheduler/handler/handler.go +++ b/pkg/scheduler/handler/handler.go @@ -9,11 +9,11 @@ import ( "github.com/bitly/go-simplejson" "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/db/models" - schedman "github.com/yunionio/onecloud/pkg/scheduler/manager" + "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" + schedman "yunion.io/x/onecloud/pkg/scheduler/manager" ) // InstallHandler is an interface that registes route and diff --git a/pkg/scheduler/handler/ping.go b/pkg/scheduler/handler/ping.go index 1be4267b8a..64e7ab7fce 100644 --- a/pkg/scheduler/handler/ping.go +++ b/pkg/scheduler/handler/ping.go @@ -6,9 +6,9 @@ import ( "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - schedman "github.com/yunionio/onecloud/pkg/scheduler/manager" + "yunion.io/x/log" + o "yunion.io/x/onecloud/cmd/scheduler/options" + schedman "yunion.io/x/onecloud/pkg/scheduler/manager" ) var counter = 0 diff --git a/pkg/scheduler/handler/version.go b/pkg/scheduler/handler/version.go index 5720607590..a770cfec11 100644 --- a/pkg/scheduler/handler/version.go +++ b/pkg/scheduler/handler/version.go @@ -5,7 +5,7 @@ import ( "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/pkg/util/version" + "yunion.io/x/pkg/util/version" ) func InstallVersionHandler(r *gin.Engine) { diff --git a/pkg/scheduler/manager/completed_queue.go b/pkg/scheduler/manager/completed_queue.go index af56f1d313..23f455a26c 100644 --- a/pkg/scheduler/manager/completed_queue.go +++ b/pkg/scheduler/manager/completed_queue.go @@ -3,10 +3,10 @@ package manager import ( "time" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + 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 b6e587b1ba..d3d8ef912b 100644 --- a/pkg/scheduler/manager/expire_queue.go +++ b/pkg/scheduler/manager/expire_queue.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "github.com/yunionio/log" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/onecloud/pkg/scheduler/api" - u "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + 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/manager.go b/pkg/scheduler/manager/manager.go index 8296c02e7e..33d019572f 100644 --- a/pkg/scheduler/manager/manager.go +++ b/pkg/scheduler/manager/manager.go @@ -6,12 +6,12 @@ import ( "strings" "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/cache/candidate" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/data_manager" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/cache/candidate" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/data_manager" + "yunion.io/x/pkg/utils" ) const defaultIgnorePool = true diff --git a/pkg/scheduler/manager/scheduler.go b/pkg/scheduler/manager/scheduler.go index 6e9b200330..cde65e3b9d 100644 --- a/pkg/scheduler/manager/scheduler.go +++ b/pkg/scheduler/manager/scheduler.go @@ -1,10 +1,10 @@ package manager import ( - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" - "github.com/yunionio/onecloud/pkg/scheduler/data_manager" - "github.com/yunionio/onecloud/pkg/scheduler/factory" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/core" + "yunion.io/x/onecloud/pkg/scheduler/data_manager" + "yunion.io/x/onecloud/pkg/scheduler/factory" ) type CandidatesProvider interface { diff --git a/pkg/scheduler/manager/task_history.go b/pkg/scheduler/manager/task_history.go index e8c9731351..98dd41c641 100644 --- a/pkg/scheduler/manager/task_history.go +++ b/pkg/scheduler/manager/task_history.go @@ -5,9 +5,9 @@ import ( "sync" "time" - o "github.com/yunionio/onecloud/cmd/scheduler/options" - "github.com/yunionio/pkg/util/wait" - u "github.com/yunionio/pkg/utils" + o "yunion.io/x/onecloud/cmd/scheduler/options" + "yunion.io/x/pkg/util/wait" + u "yunion.io/x/pkg/utils" ) type HistoryItem struct { diff --git a/pkg/scheduler/manager/task_queue.go b/pkg/scheduler/manager/task_queue.go index 5a4decf06a..0fffd0268d 100644 --- a/pkg/scheduler/manager/task_queue.go +++ b/pkg/scheduler/manager/task_queue.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/onecloud/pkg/scheduler/core" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/onecloud/pkg/scheduler/core" ) const ( diff --git a/pkg/scheduler/util/baremetal/diskconfig.go b/pkg/scheduler/util/baremetal/diskconfig.go index 1b9305b517..0914e4ec81 100644 --- a/pkg/scheduler/util/baremetal/diskconfig.go +++ b/pkg/scheduler/util/baremetal/diskconfig.go @@ -7,10 +7,10 @@ import ( "strconv" "strings" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" - "github.com/yunionio/pkg/util/sets" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" + "yunion.io/x/pkg/util/sets" + "yunion.io/x/pkg/utils" ) const ( diff --git a/pkg/scheduler/util/baremetal/diskconfig_test.go b/pkg/scheduler/util/baremetal/diskconfig_test.go index 123dee5e58..2bda6f4ca3 100644 --- a/pkg/scheduler/util/baremetal/diskconfig_test.go +++ b/pkg/scheduler/util/baremetal/diskconfig_test.go @@ -5,8 +5,8 @@ import ( "reflect" "testing" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/scheduler/api" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/scheduler/api" ) func TestParseDiskConfig(t *testing.T) { diff --git a/pkg/util/aliyun/aliyun.go b/pkg/util/aliyun/aliyun.go index fcdda7b02d..7c2336f821 100644 --- a/pkg/util/aliyun/aliyun.go +++ b/pkg/util/aliyun/aliyun.go @@ -3,10 +3,10 @@ package aliyun import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk" "github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) const ( diff --git a/pkg/util/aliyun/disk.go b/pkg/util/aliyun/disk.go index d25c0b3134..4d3a039793 100644 --- a/pkg/util/aliyun/disk.go +++ b/pkg/util/aliyun/disk.go @@ -4,11 +4,11 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/pkg/utils" ) type SMountInstances struct { diff --git a/pkg/util/aliyun/host.go b/pkg/util/aliyun/host.go index 680b99b388..c5b61dde3b 100644 --- a/pkg/util/aliyun/host.go +++ b/pkg/util/aliyun/host.go @@ -9,10 +9,10 @@ import ( "github.com/aokoli/goutils" "golang.org/x/crypto/ssh" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type SHost struct { diff --git a/pkg/util/aliyun/image.go b/pkg/util/aliyun/image.go index 9aff086711..9dfb6f0b3f 100644 --- a/pkg/util/aliyun/image.go +++ b/pkg/util/aliyun/image.go @@ -5,10 +5,10 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type ImageStatusType string diff --git a/pkg/util/aliyun/instance.go b/pkg/util/aliyun/instance.go index 2df08dd2cd..292a231193 100644 --- a/pkg/util/aliyun/instance.go +++ b/pkg/util/aliyun/instance.go @@ -4,14 +4,14 @@ import ( "fmt" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/osprofile" - "github.com/yunionio/pkg/util/seclib" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/osprofile" + "yunion.io/x/pkg/util/seclib" + "yunion.io/x/pkg/utils" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) const ( diff --git a/pkg/util/aliyun/instancenic.go b/pkg/util/aliyun/instancenic.go index 1c28214699..9b77f904d1 100644 --- a/pkg/util/aliyun/instancenic.go +++ b/pkg/util/aliyun/instancenic.go @@ -1,8 +1,8 @@ package aliyun import ( - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/pkg/util/netutils" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/pkg/util/netutils" ) type SInstanceNic struct { diff --git a/pkg/util/aliyun/instancetype.go b/pkg/util/aliyun/instancetype.go index c2104b8dad..49b4a1c3ad 100644 --- a/pkg/util/aliyun/instancetype.go +++ b/pkg/util/aliyun/instancetype.go @@ -2,7 +2,7 @@ package aliyun import ( // "time" - "github.com/yunionio/log" + "yunion.io/x/log" ) // {"CpuCoreCount":1,"EniQuantity":1,"GPUAmount":0,"GPUSpec":"","InstanceTypeFamily":"ecs.t1","InstanceTypeId":"ecs.t1.xsmall","LocalStorageCategory":"","MemorySize":0.500000} diff --git a/pkg/util/aliyun/keypair.go b/pkg/util/aliyun/keypair.go index b8fa4874c0..c8da45b6a0 100644 --- a/pkg/util/aliyun/keypair.go +++ b/pkg/util/aliyun/keypair.go @@ -2,7 +2,7 @@ package aliyun import ( "fmt" - "github.com/yunionio/log" + "yunion.io/x/log" ) type SKeypair struct { diff --git a/pkg/util/aliyun/provider/provider.go b/pkg/util/aliyun/provider/provider.go index 030c287943..c637be6960 100644 --- a/pkg/util/aliyun/provider/provider.go +++ b/pkg/util/aliyun/provider/provider.go @@ -1,10 +1,10 @@ package provider import ( - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudprovider" - // "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/util/aliyun" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" + // "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/util/aliyun" ) type SAliyunProviderFactory struct { diff --git a/pkg/util/aliyun/region.go b/pkg/util/aliyun/region.go index 86945feef5..c9a8954b67 100644 --- a/pkg/util/aliyun/region.go +++ b/pkg/util/aliyun/region.go @@ -7,11 +7,11 @@ import ( "github.com/aliyun/alibaba-cloud-sdk-go/sdk" "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/pkg/utils" ) type SRegion struct { diff --git a/pkg/util/aliyun/securitygroup.go b/pkg/util/aliyun/securitygroup.go index 0f3f55e7ad..85d9518b32 100644 --- a/pkg/util/aliyun/securitygroup.go +++ b/pkg/util/aliyun/securitygroup.go @@ -4,9 +4,9 @@ import ( "fmt" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/secrules" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/secrules" + "yunion.io/x/pkg/utils" ) // {"CreationTime":"2017-03-19T13:37:48Z","Description":"System created security group.","SecurityGroupId":"sg-j6cannq0xxj2r9z0yxwl","SecurityGroupName":"sg-j6cannq0xxj2r9z0yxwl","Tags":{"Tag":[]},"VpcId":"vpc-j6c86z3sh8ufhgsxwme0q"} diff --git a/pkg/util/aliyun/shell/disk.go b/pkg/util/aliyun/shell/disk.go index 85cd78492c..1196bb5739 100644 --- a/pkg/util/aliyun/shell/disk.go +++ b/pkg/util/aliyun/shell/disk.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/image.go b/pkg/util/aliyun/shell/image.go index e339853a58..e73a758878 100644 --- a/pkg/util/aliyun/shell/image.go +++ b/pkg/util/aliyun/shell/image.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/instance.go b/pkg/util/aliyun/shell/instance.go index 49718529a6..9c86e47aa8 100644 --- a/pkg/util/aliyun/shell/instance.go +++ b/pkg/util/aliyun/shell/instance.go @@ -2,8 +2,8 @@ package shell import ( "fmt" - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/instancetype.go b/pkg/util/aliyun/shell/instancetype.go index a127e95e2c..18ee50d822 100644 --- a/pkg/util/aliyun/shell/instancetype.go +++ b/pkg/util/aliyun/shell/instancetype.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/keypair.go b/pkg/util/aliyun/shell/keypair.go index b35c79e5c1..14afd5b843 100644 --- a/pkg/util/aliyun/shell/keypair.go +++ b/pkg/util/aliyun/shell/keypair.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/oss.go b/pkg/util/aliyun/shell/oss.go index 5b40d5c8a7..b3184537e9 100644 --- a/pkg/util/aliyun/shell/oss.go +++ b/pkg/util/aliyun/shell/oss.go @@ -5,8 +5,8 @@ import ( osslib "github.com/aliyun/aliyun-oss-go-sdk/oss" - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) type progressListener struct { diff --git a/pkg/util/aliyun/shell/printutils.go b/pkg/util/aliyun/shell/printutils.go index 3091fa5777..6d573bce88 100644 --- a/pkg/util/aliyun/shell/printutils.go +++ b/pkg/util/aliyun/shell/printutils.go @@ -1,6 +1,6 @@ package shell -import "github.com/yunionio/onecloud/pkg/util/printutils" +import "yunion.io/x/onecloud/pkg/util/printutils" func printList(data interface{}, total, offset, limit int, columns []string) { printutils.PrintInterfaceList(data, total, offset, limit, columns) diff --git a/pkg/util/aliyun/shell/region.go b/pkg/util/aliyun/shell/region.go index c1def72da8..133197b640 100644 --- a/pkg/util/aliyun/shell/region.go +++ b/pkg/util/aliyun/shell/region.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/routetable.go b/pkg/util/aliyun/shell/routetable.go index 6cfaa25a00..72d57348bd 100644 --- a/pkg/util/aliyun/shell/routetable.go +++ b/pkg/util/aliyun/shell/routetable.go @@ -2,8 +2,8 @@ package shell import ( "fmt" - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/secgroup.go b/pkg/util/aliyun/shell/secgroup.go index 0442e91a21..89c71ac038 100644 --- a/pkg/util/aliyun/shell/secgroup.go +++ b/pkg/util/aliyun/shell/secgroup.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/task.go b/pkg/util/aliyun/shell/task.go index 754d4e8bba..33b99eff00 100644 --- a/pkg/util/aliyun/shell/task.go +++ b/pkg/util/aliyun/shell/task.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/vpc.go b/pkg/util/aliyun/shell/vpc.go index 3146e1b653..045793ba5f 100644 --- a/pkg/util/aliyun/shell/vpc.go +++ b/pkg/util/aliyun/shell/vpc.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/vrouter.go b/pkg/util/aliyun/shell/vrouter.go index ef38c07da1..f3499c3702 100644 --- a/pkg/util/aliyun/shell/vrouter.go +++ b/pkg/util/aliyun/shell/vrouter.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/vswitch.go b/pkg/util/aliyun/shell/vswitch.go index 974a569e88..568e14e663 100644 --- a/pkg/util/aliyun/shell/vswitch.go +++ b/pkg/util/aliyun/shell/vswitch.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/shell/zone.go b/pkg/util/aliyun/shell/zone.go index c1bc333d10..89f4c45e1f 100644 --- a/pkg/util/aliyun/shell/zone.go +++ b/pkg/util/aliyun/shell/zone.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/aliyun" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/aliyun" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/aliyun/storage.go b/pkg/util/aliyun/storage.go index f51b397530..0376b3b5f7 100644 --- a/pkg/util/aliyun/storage.go +++ b/pkg/util/aliyun/storage.go @@ -4,10 +4,10 @@ import ( "fmt" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type SStorage struct { diff --git a/pkg/util/aliyun/storagecache.go b/pkg/util/aliyun/storagecache.go index 51faa2135d..61394948c2 100644 --- a/pkg/util/aliyun/storagecache.go +++ b/pkg/util/aliyun/storagecache.go @@ -5,12 +5,12 @@ import ( "strings" "time" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/options" - "github.com/yunionio/onecloud/pkg/mcclient" - "github.com/yunionio/onecloud/pkg/mcclient/auth" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/options" + "yunion.io/x/onecloud/pkg/mcclient" + "yunion.io/x/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) type SStoragecache struct { diff --git a/pkg/util/aliyun/task.go b/pkg/util/aliyun/task.go index 2c048630d4..fc01d93a9e 100644 --- a/pkg/util/aliyun/task.go +++ b/pkg/util/aliyun/task.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "github.com/yunionio/log" + "yunion.io/x/log" ) type TaskActionType string diff --git a/pkg/util/aliyun/vpc.go b/pkg/util/aliyun/vpc.go index 6ac1dc68c2..d61028a555 100644 --- a/pkg/util/aliyun/vpc.go +++ b/pkg/util/aliyun/vpc.go @@ -4,8 +4,8 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" ) const ( diff --git a/pkg/util/aliyun/vswitch.go b/pkg/util/aliyun/vswitch.go index c26aef7eca..9c9e7bbe84 100644 --- a/pkg/util/aliyun/vswitch.go +++ b/pkg/util/aliyun/vswitch.go @@ -4,12 +4,12 @@ import ( "strings" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/pkg/util/netutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/pkg/util/netutils" + "yunion.io/x/pkg/utils" ) // {"AvailableIpAddressCount":4091,"CidrBlock":"172.31.32.0/20","CreationTime":"2017-03-19T13:37:44Z","Description":"System created default virtual switch.","IsDefault":true,"Status":"Available","VSwitchId":"vsw-j6c3gig5ub4fmi2veyrus","VSwitchName":"","VpcId":"vpc-j6c86z3sh8ufhgsxwme0q","ZoneId":"cn-hongkong-b"} diff --git a/pkg/util/aliyun/wire.go b/pkg/util/aliyun/wire.go index 352573e99e..903dcc681a 100644 --- a/pkg/util/aliyun/wire.go +++ b/pkg/util/aliyun/wire.go @@ -3,8 +3,8 @@ package aliyun import ( "fmt" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" ) type SWire struct { diff --git a/pkg/util/aliyun/zone.go b/pkg/util/aliyun/zone.go index 3278fbd5a8..844b4d6e6f 100644 --- a/pkg/util/aliyun/zone.go +++ b/pkg/util/aliyun/zone.go @@ -3,9 +3,9 @@ package aliyun import ( "fmt" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) type InstanceChargeType string diff --git a/pkg/util/esxi/datacenter.go b/pkg/util/esxi/datacenter.go index 167c724d6a..7da30e1dfb 100644 --- a/pkg/util/esxi/datacenter.go +++ b/pkg/util/esxi/datacenter.go @@ -2,7 +2,7 @@ package esxi import ( "github.com/vmware/govmomi/vim25/mo" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/cloudprovider" ) var DATACENTER_PROPS = []string{"name", "parent", "datastore"} diff --git a/pkg/util/esxi/host.go b/pkg/util/esxi/host.go index 6b580cd8c0..4f524948d2 100644 --- a/pkg/util/esxi/host.go +++ b/pkg/util/esxi/host.go @@ -3,13 +3,13 @@ package esxi import ( "github.com/vmware/govmomi/vim25/mo" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" "github.com/vmware/govmomi/vim25/types" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" - "github.com/yunionio/pkg/util/netutils" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/pkg/util/netutils" ) var HOST_SYSTEM_PROPS = []string{"name", "parent", "summary", "config", "hardware", "vm"} diff --git a/pkg/util/esxi/manager.go b/pkg/util/esxi/manager.go index 88dd511e62..0c0698bfcd 100644 --- a/pkg/util/esxi/manager.go +++ b/pkg/util/esxi/manager.go @@ -13,12 +13,12 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" "github.com/vmware/govmomi/session" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" "strings" ) diff --git a/pkg/util/esxi/mobase.go b/pkg/util/esxi/mobase.go index 5a0756257c..23f6aa9c61 100644 --- a/pkg/util/esxi/mobase.go +++ b/pkg/util/esxi/mobase.go @@ -2,8 +2,8 @@ package esxi import ( "github.com/vmware/govmomi/vim25/mo" - "github.com/yunionio/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" + "yunion.io/x/log" + "yunion.io/x/onecloud/pkg/cloudprovider" "reflect" ) diff --git a/pkg/util/esxi/provider/provider.go b/pkg/util/esxi/provider/provider.go index 21d488e347..32137f8d7d 100644 --- a/pkg/util/esxi/provider/provider.go +++ b/pkg/util/esxi/provider/provider.go @@ -5,11 +5,11 @@ import ( "strconv" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" + "yunion.io/x/jsonutils" + "yunion.io/x/log" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/util/esxi" ) type SESXiProviderFactory struct { diff --git a/pkg/util/esxi/shell/datacenter.go b/pkg/util/esxi/shell/datacenter.go index 9a3d25c863..ea20834024 100644 --- a/pkg/util/esxi/shell/datacenter.go +++ b/pkg/util/esxi/shell/datacenter.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/esxi" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/esxi/shell/host.go b/pkg/util/esxi/shell/host.go index 740311184b..2807ab0607 100644 --- a/pkg/util/esxi/shell/host.go +++ b/pkg/util/esxi/shell/host.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/esxi" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/esxi/shell/store.go b/pkg/util/esxi/shell/store.go index 32fed02cd8..6dcd6e6a7f 100644 --- a/pkg/util/esxi/shell/store.go +++ b/pkg/util/esxi/shell/store.go @@ -1,8 +1,8 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/esxi" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/esxi/shell/utils.go b/pkg/util/esxi/shell/utils.go index 58103c413e..b086a0f666 100644 --- a/pkg/util/esxi/shell/utils.go +++ b/pkg/util/esxi/shell/utils.go @@ -1,6 +1,6 @@ package shell -import "github.com/yunionio/onecloud/pkg/util/printutils" +import "yunion.io/x/onecloud/pkg/util/printutils" func printList(data interface{}, columns []string) { printutils.PrintGetterList(data, columns) diff --git a/pkg/util/esxi/shell/virtualmachine.go b/pkg/util/esxi/shell/virtualmachine.go index 587e5b08ce..e1c9519054 100644 --- a/pkg/util/esxi/shell/virtualmachine.go +++ b/pkg/util/esxi/shell/virtualmachine.go @@ -1,9 +1,9 @@ package shell import ( - "github.com/yunionio/onecloud/pkg/util/esxi" - "github.com/yunionio/onecloud/pkg/util/printutils" - "github.com/yunionio/onecloud/pkg/util/shellutils" + "yunion.io/x/onecloud/pkg/util/esxi" + "yunion.io/x/onecloud/pkg/util/printutils" + "yunion.io/x/onecloud/pkg/util/shellutils" ) func init() { diff --git a/pkg/util/esxi/storage.go b/pkg/util/esxi/storage.go index e1c89478bf..1c7fdd3f7e 100644 --- a/pkg/util/esxi/storage.go +++ b/pkg/util/esxi/storage.go @@ -3,9 +3,9 @@ package esxi import ( "github.com/vmware/govmomi/vim25/mo" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" ) var DATASTORE_PROPS = []string{"name", "parent"} diff --git a/pkg/util/esxi/virtualmachine.go b/pkg/util/esxi/virtualmachine.go index 34cf3b25fb..11b1f7231a 100644 --- a/pkg/util/esxi/virtualmachine.go +++ b/pkg/util/esxi/virtualmachine.go @@ -6,10 +6,10 @@ import ( "github.com/vmware/govmomi/vim25/mo" "github.com/vmware/govmomi/vim25/types" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/cloudprovider" - "github.com/yunionio/onecloud/pkg/compute/models" + "yunion.io/x/onecloud/pkg/cloudprovider" + "yunion.io/x/onecloud/pkg/compute/models" "fmt" "github.com/vmware/govmomi/object" diff --git a/pkg/util/gin/middleware/keystone_auth.go b/pkg/util/gin/middleware/keystone_auth.go index e014fb6012..53cf65db9d 100644 --- a/pkg/util/gin/middleware/keystone_auth.go +++ b/pkg/util/gin/middleware/keystone_auth.go @@ -6,7 +6,7 @@ import ( "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/onecloud/pkg/mcclient/auth" + "yunion.io/x/onecloud/pkg/mcclient/auth" ) const ( diff --git a/pkg/util/gin/middleware/log.go b/pkg/util/gin/middleware/log.go index 9a7908cb28..92a7ecd592 100644 --- a/pkg/util/gin/middleware/log.go +++ b/pkg/util/gin/middleware/log.go @@ -5,7 +5,7 @@ import ( "gopkg.in/gin-gonic/gin.v1" - "github.com/yunionio/log" + "yunion.io/x/log" ) var ( diff --git a/pkg/util/httputils/httputils.go b/pkg/util/httputils/httputils.go index f56a213eeb..603f99987a 100644 --- a/pkg/util/httputils/httputils.go +++ b/pkg/util/httputils/httputils.go @@ -14,11 +14,11 @@ import ( "github.com/fatih/color" "github.com/moul/http2curl" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/trace" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/trace" - "github.com/yunionio/onecloud/pkg/appctx" + "yunion.io/x/onecloud/pkg/appctx" ) const ( diff --git a/pkg/util/printutils/printgetter.go b/pkg/util/printutils/printgetter.go index 8184927fbc..1cca6b48c4 100644 --- a/pkg/util/printutils/printgetter.go +++ b/pkg/util/printutils/printgetter.go @@ -5,9 +5,9 @@ import ( "reflect" "strings" - "github.com/yunionio/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient/modules" - "github.com/yunionio/pkg/utils" + "yunion.io/x/jsonutils" + "yunion.io/x/onecloud/pkg/mcclient/modules" + "yunion.io/x/pkg/utils" ) func getter2json(obj interface{}) jsonutils.JSONObject { diff --git a/pkg/util/printutils/printjson.go b/pkg/util/printutils/printjson.go index 86ae7d5bcc..ed01e9ce4e 100644 --- a/pkg/util/printutils/printjson.go +++ b/pkg/util/printutils/printjson.go @@ -4,10 +4,10 @@ import ( "fmt" "sort" - "github.com/yunionio/jsonutils" - "github.com/yunionio/pkg/prettytable" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/prettytable" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func PrintJSONList(list *modules.ListResult, columns []string) { diff --git a/pkg/util/printutils/printobj.go b/pkg/util/printutils/printobj.go index 756388c349..97258ab486 100644 --- a/pkg/util/printutils/printobj.go +++ b/pkg/util/printutils/printobj.go @@ -4,9 +4,9 @@ import ( "fmt" "reflect" - "github.com/yunionio/jsonutils" + "yunion.io/x/jsonutils" - "github.com/yunionio/onecloud/pkg/mcclient/modules" + "yunion.io/x/onecloud/pkg/mcclient/modules" ) func PrintInterfaceList(data interface{}, total, offset, limit int, columns []string) { diff --git a/vendor/github.com/yunionio/pkg/util/goroutine_pool/fake.go b/vendor/github.com/yunionio/pkg/util/goroutine_pool/fake.go deleted file mode 100644 index ed30622583..0000000000 --- a/vendor/github.com/yunionio/pkg/util/goroutine_pool/fake.go +++ /dev/null @@ -1,18 +0,0 @@ -// +build leak - -package gp - -import "time" - -type Pool struct{} - -// New returns a new *Pool object. -// When compile with leak flag, goroutine will not be reusing. -func New(idleTimeout time.Duration) *Pool { - return &Pool{} -} - -// Go run f() in a new goroutine. -func (pool *Pool) Go(f func()) { - go f() -} diff --git a/vendor/github.com/yunionio/sqlchemy/debug.go b/vendor/github.com/yunionio/sqlchemy/debug.go deleted file mode 100644 index 3ff7657616..0000000000 --- a/vendor/github.com/yunionio/sqlchemy/debug.go +++ /dev/null @@ -1,5 +0,0 @@ -package sqlchemy - -var ( - DEBUG_SQLCHEMY = false -) diff --git a/vendor/github.com/yunionio/jsonutils/.gitignore b/vendor/yunion.io/x/jsonutils/.gitignore similarity index 100% rename from vendor/github.com/yunionio/jsonutils/.gitignore rename to vendor/yunion.io/x/jsonutils/.gitignore diff --git a/vendor/github.com/yunionio/jsonutils/LICENSE b/vendor/yunion.io/x/jsonutils/LICENSE similarity index 100% rename from vendor/github.com/yunionio/jsonutils/LICENSE rename to vendor/yunion.io/x/jsonutils/LICENSE diff --git a/vendor/github.com/yunionio/jsonutils/README.md b/vendor/yunion.io/x/jsonutils/README.md similarity index 100% rename from vendor/github.com/yunionio/jsonutils/README.md rename to vendor/yunion.io/x/jsonutils/README.md diff --git a/vendor/github.com/yunionio/jsonutils/access.go b/vendor/yunion.io/x/jsonutils/access.go similarity index 99% rename from vendor/github.com/yunionio/jsonutils/access.go rename to vendor/yunion.io/x/jsonutils/access.go index 57642a0442..86b24ff039 100644 --- a/vendor/github.com/yunionio/jsonutils/access.go +++ b/vendor/yunion.io/x/jsonutils/access.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/yunionio/pkg/util/timeutils" + "yunion.io/x/pkg/util/timeutils" ) type JSONPair struct { diff --git a/vendor/github.com/yunionio/jsonutils/clone.go b/vendor/yunion.io/x/jsonutils/clone.go similarity index 95% rename from vendor/github.com/yunionio/jsonutils/clone.go rename to vendor/yunion.io/x/jsonutils/clone.go index 023de5ceed..10f792784b 100644 --- a/vendor/github.com/yunionio/jsonutils/clone.go +++ b/vendor/yunion.io/x/jsonutils/clone.go @@ -1,7 +1,7 @@ package jsonutils import ( - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) func (this *JSONDict) Copy(excludes ...string) *JSONDict { diff --git a/vendor/github.com/yunionio/jsonutils/dict.go b/vendor/yunion.io/x/jsonutils/dict.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/dict.go rename to vendor/yunion.io/x/jsonutils/dict.go diff --git a/vendor/yunion.io/x/jsonutils/doc.go b/vendor/yunion.io/x/jsonutils/doc.go new file mode 100644 index 0000000000..0fcfa10c08 --- /dev/null +++ b/vendor/yunion.io/x/jsonutils/doc.go @@ -0,0 +1 @@ +package jsonutils // import "yunion.io/x/jsonutils" diff --git a/vendor/github.com/yunionio/jsonutils/equals.go b/vendor/yunion.io/x/jsonutils/equals.go similarity index 96% rename from vendor/github.com/yunionio/jsonutils/equals.go rename to vendor/yunion.io/x/jsonutils/equals.go index aa7cf70677..ffba96318a 100644 --- a/vendor/github.com/yunionio/jsonutils/equals.go +++ b/vendor/yunion.io/x/jsonutils/equals.go @@ -1,6 +1,6 @@ package jsonutils -// import "github.com/yunionio/pkg/gotypes" +// import "yunion.io/x/pkg/gotypes" func (dict *JSONDict) Equals(json JSONObject) bool { dict2, ok := json.(*JSONDict) diff --git a/vendor/github.com/yunionio/jsonutils/iszero.go b/vendor/yunion.io/x/jsonutils/iszero.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/iszero.go rename to vendor/yunion.io/x/jsonutils/iszero.go diff --git a/vendor/github.com/yunionio/jsonutils/jsonutils.go b/vendor/yunion.io/x/jsonutils/jsonutils.go similarity index 99% rename from vendor/github.com/yunionio/jsonutils/jsonutils.go rename to vendor/yunion.io/x/jsonutils/jsonutils.go index 614f73fa44..d3321d1caf 100644 --- a/vendor/github.com/yunionio/jsonutils/jsonutils.go +++ b/vendor/yunion.io/x/jsonutils/jsonutils.go @@ -10,7 +10,7 @@ import ( "time" "unicode/utf8" - "github.com/yunionio/pkg/gotypes" + "yunion.io/x/pkg/gotypes" ) type JSONError struct { diff --git a/vendor/github.com/yunionio/jsonutils/length.go b/vendor/yunion.io/x/jsonutils/length.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/length.go rename to vendor/yunion.io/x/jsonutils/length.go diff --git a/vendor/github.com/yunionio/jsonutils/marshal.go b/vendor/yunion.io/x/jsonutils/marshal.go similarity index 96% rename from vendor/github.com/yunionio/jsonutils/marshal.go rename to vendor/yunion.io/x/jsonutils/marshal.go index fd142cc90d..bedce745e9 100644 --- a/vendor/github.com/yunionio/jsonutils/marshal.go +++ b/vendor/yunion.io/x/jsonutils/marshal.go @@ -12,11 +12,11 @@ import ( "reflect" "time" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/log" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/pkg/util/timeutils" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/log" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/pkg/util/timeutils" ) func marshalSlice(val reflect.Value) *JSONArray { diff --git a/vendor/github.com/yunionio/jsonutils/querystring.go b/vendor/yunion.io/x/jsonutils/querystring.go similarity index 98% rename from vendor/github.com/yunionio/jsonutils/querystring.go rename to vendor/yunion.io/x/jsonutils/querystring.go index f398a5a782..143688f7d9 100644 --- a/vendor/github.com/yunionio/jsonutils/querystring.go +++ b/vendor/yunion.io/x/jsonutils/querystring.go @@ -4,7 +4,7 @@ import ( "net/url" "strings" - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) func (this *JSONDict) parseQueryString(str string) error { diff --git a/vendor/github.com/yunionio/jsonutils/reflect.go b/vendor/yunion.io/x/jsonutils/reflect.go similarity index 98% rename from vendor/github.com/yunionio/jsonutils/reflect.go rename to vendor/yunion.io/x/jsonutils/reflect.go index 50669aa37f..d19df92fae 100644 --- a/vendor/github.com/yunionio/jsonutils/reflect.go +++ b/vendor/yunion.io/x/jsonutils/reflect.go @@ -3,7 +3,7 @@ package jsonutils import ( "reflect" - "github.com/yunionio/pkg/gotypes" + "yunion.io/x/pkg/gotypes" ) var ( diff --git a/vendor/github.com/yunionio/jsonutils/size.go b/vendor/yunion.io/x/jsonutils/size.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/size.go rename to vendor/yunion.io/x/jsonutils/size.go diff --git a/vendor/github.com/yunionio/jsonutils/unmarshal.go b/vendor/yunion.io/x/jsonutils/unmarshal.go similarity index 98% rename from vendor/github.com/yunionio/jsonutils/unmarshal.go rename to vendor/yunion.io/x/jsonutils/unmarshal.go index c51f171031..3a98a40490 100644 --- a/vendor/github.com/yunionio/jsonutils/unmarshal.go +++ b/vendor/yunion.io/x/jsonutils/unmarshal.go @@ -14,12 +14,12 @@ import ( "strings" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/pkg/utils" ) func (this *JSONValue) Unmarshal(obj interface{}, keys ...string) error { diff --git a/vendor/github.com/yunionio/jsonutils/update.go b/vendor/yunion.io/x/jsonutils/update.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/update.go rename to vendor/yunion.io/x/jsonutils/update.go diff --git a/vendor/github.com/yunionio/jsonutils/utils.go b/vendor/yunion.io/x/jsonutils/utils.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/utils.go rename to vendor/yunion.io/x/jsonutils/utils.go diff --git a/vendor/github.com/yunionio/jsonutils/yamlutils.go b/vendor/yunion.io/x/jsonutils/yamlutils.go similarity index 100% rename from vendor/github.com/yunionio/jsonutils/yamlutils.go rename to vendor/yunion.io/x/jsonutils/yamlutils.go diff --git a/vendor/github.com/yunionio/log/.gitignore b/vendor/yunion.io/x/log/.gitignore similarity index 100% rename from vendor/github.com/yunionio/log/.gitignore rename to vendor/yunion.io/x/log/.gitignore diff --git a/vendor/github.com/yunionio/log/LICENSE b/vendor/yunion.io/x/log/LICENSE similarity index 100% rename from vendor/github.com/yunionio/log/LICENSE rename to vendor/yunion.io/x/log/LICENSE diff --git a/vendor/github.com/yunionio/log/README.md b/vendor/yunion.io/x/log/README.md similarity index 93% rename from vendor/github.com/yunionio/log/README.md rename to vendor/yunion.io/x/log/README.md index 7a830099aa..2a1627072b 100644 --- a/vendor/github.com/yunionio/log/README.md +++ b/vendor/yunion.io/x/log/README.md @@ -14,7 +14,7 @@ package main import ( "errors" - "github.com/yunionio/log" + "yunion.io/x/log" ) func main() { diff --git a/vendor/yunion.io/x/log/doc.go b/vendor/yunion.io/x/log/doc.go new file mode 100644 index 0000000000..bebc20ce8a --- /dev/null +++ b/vendor/yunion.io/x/log/doc.go @@ -0,0 +1 @@ +package log // import "yunion.io/x/log" diff --git a/vendor/github.com/yunionio/log/formatter.go b/vendor/yunion.io/x/log/formatter.go similarity index 100% rename from vendor/github.com/yunionio/log/formatter.go rename to vendor/yunion.io/x/log/formatter.go diff --git a/vendor/github.com/yunionio/log/hooks/caller.go b/vendor/yunion.io/x/log/hooks/caller.go similarity index 100% rename from vendor/github.com/yunionio/log/hooks/caller.go rename to vendor/yunion.io/x/log/hooks/caller.go diff --git a/vendor/yunion.io/x/log/hooks/doc.go b/vendor/yunion.io/x/log/hooks/doc.go new file mode 100644 index 0000000000..9052e13a36 --- /dev/null +++ b/vendor/yunion.io/x/log/hooks/doc.go @@ -0,0 +1 @@ +package hooks // import "yunion.io/x/log/hooks" diff --git a/vendor/github.com/yunionio/log/hooks/stdio.go b/vendor/yunion.io/x/log/hooks/stdio.go similarity index 100% rename from vendor/github.com/yunionio/log/hooks/stdio.go rename to vendor/yunion.io/x/log/hooks/stdio.go diff --git a/vendor/github.com/yunionio/log/log.go b/vendor/yunion.io/x/log/log.go similarity index 98% rename from vendor/github.com/yunionio/log/log.go rename to vendor/yunion.io/x/log/log.go index d165440321..a794a83f25 100644 --- a/vendor/github.com/yunionio/log/log.go +++ b/vendor/yunion.io/x/log/log.go @@ -6,7 +6,7 @@ import ( "github.com/sirupsen/logrus" - "github.com/yunionio/log/hooks" + "yunion.io/x/log/hooks" ) var ( diff --git a/vendor/github.com/yunionio/pkg/LICENSE b/vendor/yunion.io/x/pkg/LICENSE similarity index 100% rename from vendor/github.com/yunionio/pkg/LICENSE rename to vendor/yunion.io/x/pkg/LICENSE diff --git a/vendor/yunion.io/x/pkg/gotypes/doc.go b/vendor/yunion.io/x/pkg/gotypes/doc.go new file mode 100644 index 0000000000..84ed9fdcd0 --- /dev/null +++ b/vendor/yunion.io/x/pkg/gotypes/doc.go @@ -0,0 +1 @@ +package gotypes // import "yunion.io/x/pkg/gotypes" diff --git a/vendor/github.com/yunionio/pkg/gotypes/gotypes.go b/vendor/yunion.io/x/pkg/gotypes/gotypes.go similarity index 97% rename from vendor/github.com/yunionio/pkg/gotypes/gotypes.go rename to vendor/yunion.io/x/pkg/gotypes/gotypes.go index 80ae32e275..e589aa7c61 100644 --- a/vendor/github.com/yunionio/pkg/gotypes/gotypes.go +++ b/vendor/yunion.io/x/pkg/gotypes/gotypes.go @@ -2,13 +2,12 @@ package gotypes import ( "fmt" - "log" "reflect" "strconv" "strings" "time" - "github.com/yunionio/pkg/util/timeutils" + "yunion.io/x/pkg/util/timeutils" ) const ( @@ -174,9 +173,7 @@ func SetValue(value reflect.Value, valStr string) error { Float32SliceType, Float64SliceType, StringSliceType: reflect.Append(value, reflect.ValueOf(valStr)) default: - log.Print(value, valStr) - log.Print(value.Type()) - return fmt.Errorf("!!!Unsupported type: %v", value.Type) + return fmt.Errorf("Unsupported type: %v", value.Type()) } return nil } @@ -272,7 +269,7 @@ func IsNil(val interface{}) bool { } valValue := reflect.ValueOf(val) switch valValue.Kind() { - case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Array, reflect.Slice, reflect.Interface: + case reflect.Chan, reflect.Func, reflect.Map, reflect.Ptr, reflect.Slice, reflect.Interface: return valValue.IsNil() default: return val == nil diff --git a/vendor/github.com/yunionio/pkg/gotypes/serialize.go b/vendor/yunion.io/x/pkg/gotypes/serialize.go similarity index 100% rename from vendor/github.com/yunionio/pkg/gotypes/serialize.go rename to vendor/yunion.io/x/pkg/gotypes/serialize.go diff --git a/vendor/yunion.io/x/pkg/prettytable/doc.go b/vendor/yunion.io/x/pkg/prettytable/doc.go new file mode 100644 index 0000000000..df12f27798 --- /dev/null +++ b/vendor/yunion.io/x/pkg/prettytable/doc.go @@ -0,0 +1 @@ +package prettytable // import "yunion.io/x/pkg/prettytable" diff --git a/vendor/github.com/yunionio/pkg/prettytable/prettytable.go b/vendor/yunion.io/x/pkg/prettytable/prettytable.go similarity index 100% rename from vendor/github.com/yunionio/pkg/prettytable/prettytable.go rename to vendor/yunion.io/x/pkg/prettytable/prettytable.go diff --git a/vendor/yunion.io/x/pkg/trace/doc.go b/vendor/yunion.io/x/pkg/trace/doc.go new file mode 100644 index 0000000000..251fa75b2f --- /dev/null +++ b/vendor/yunion.io/x/pkg/trace/doc.go @@ -0,0 +1 @@ +package trace // import "yunion.io/x/pkg/trace" diff --git a/vendor/github.com/yunionio/pkg/trace/trace.go b/vendor/yunion.io/x/pkg/trace/trace.go similarity index 98% rename from vendor/github.com/yunionio/pkg/trace/trace.go rename to vendor/yunion.io/x/pkg/trace/trace.go index 8280904b60..dd60bd143a 100644 --- a/vendor/github.com/yunionio/pkg/trace/trace.go +++ b/vendor/yunion.io/x/pkg/trace/trace.go @@ -6,9 +6,9 @@ import ( "strings" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/timeutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/timeutils" + "yunion.io/x/pkg/utils" ) type TraceKind string diff --git a/vendor/yunion.io/x/pkg/tristate/doc.go b/vendor/yunion.io/x/pkg/tristate/doc.go new file mode 100644 index 0000000000..61c3996464 --- /dev/null +++ b/vendor/yunion.io/x/pkg/tristate/doc.go @@ -0,0 +1 @@ +package tristate // import "yunion.io/x/pkg/tristate" diff --git a/vendor/github.com/yunionio/pkg/tristate/tristate.go b/vendor/yunion.io/x/pkg/tristate/tristate.go similarity index 100% rename from vendor/github.com/yunionio/pkg/tristate/tristate.go rename to vendor/yunion.io/x/pkg/tristate/tristate.go diff --git a/vendor/yunion.io/x/pkg/util/cache/doc.go b/vendor/yunion.io/x/pkg/util/cache/doc.go new file mode 100644 index 0000000000..1b7a348f26 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/cache/doc.go @@ -0,0 +1 @@ +package cache // import "yunion.io/x/pkg/util/cache" diff --git a/vendor/github.com/yunionio/pkg/util/cache/expiration_cache.go b/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/cache/expiration_cache.go rename to vendor/yunion.io/x/pkg/util/cache/expiration_cache.go index 09ee4d76e8..f39a6a1b54 100644 --- a/vendor/github.com/yunionio/pkg/util/cache/expiration_cache.go +++ b/vendor/yunion.io/x/pkg/util/cache/expiration_cache.go @@ -4,8 +4,8 @@ import ( "sync" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/clock" + "yunion.io/x/log" + "yunion.io/x/pkg/util/clock" ) // ExpirationCache implements the store interface diff --git a/vendor/github.com/yunionio/pkg/util/cache/expiration_cache_fakes.go b/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go similarity index 92% rename from vendor/github.com/yunionio/pkg/util/cache/expiration_cache_fakes.go rename to vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go index 0c6ebd89a6..6be9e4b8ca 100644 --- a/vendor/github.com/yunionio/pkg/util/cache/expiration_cache_fakes.go +++ b/vendor/yunion.io/x/pkg/util/cache/expiration_cache_fakes.go @@ -1,8 +1,8 @@ package cache import ( - "github.com/yunionio/pkg/util/clock" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/clock" + "yunion.io/x/pkg/util/sets" ) type fakeThreadSafeMap struct { diff --git a/vendor/github.com/yunionio/pkg/util/cache/fifo.go b/vendor/yunion.io/x/pkg/util/cache/fifo.go similarity index 99% rename from vendor/github.com/yunionio/pkg/util/cache/fifo.go rename to vendor/yunion.io/x/pkg/util/cache/fifo.go index d8c0d9644a..39ba63b307 100644 --- a/vendor/github.com/yunionio/pkg/util/cache/fifo.go +++ b/vendor/yunion.io/x/pkg/util/cache/fifo.go @@ -4,7 +4,7 @@ import ( "errors" "sync" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/sets" ) // PopProcessFunc is passed to Pop() method of Queue interface. diff --git a/vendor/github.com/yunionio/pkg/util/cache/index.go b/vendor/yunion.io/x/pkg/util/cache/index.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/cache/index.go rename to vendor/yunion.io/x/pkg/util/cache/index.go index 6eb96afe25..5cc4adcf0b 100644 --- a/vendor/github.com/yunionio/pkg/util/cache/index.go +++ b/vendor/yunion.io/x/pkg/util/cache/index.go @@ -3,7 +3,7 @@ package cache import ( "fmt" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/sets" ) // Indexer is a storage interface that lets you list objects using multiple indexing functions diff --git a/vendor/github.com/yunionio/pkg/util/cache/lru.go b/vendor/yunion.io/x/pkg/util/cache/lru.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/cache/lru.go rename to vendor/yunion.io/x/pkg/util/cache/lru.go diff --git a/vendor/github.com/yunionio/pkg/util/cache/store.go b/vendor/yunion.io/x/pkg/util/cache/store.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/cache/store.go rename to vendor/yunion.io/x/pkg/util/cache/store.go diff --git a/vendor/github.com/yunionio/pkg/util/cache/thread_safe_store.go b/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go similarity index 99% rename from vendor/github.com/yunionio/pkg/util/cache/thread_safe_store.go rename to vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go index 201bd14290..bdf0c0102c 100644 --- a/vendor/github.com/yunionio/pkg/util/cache/thread_safe_store.go +++ b/vendor/yunion.io/x/pkg/util/cache/thread_safe_store.go @@ -4,7 +4,7 @@ import ( "fmt" "sync" - "github.com/yunionio/pkg/util/sets" + "yunion.io/x/pkg/util/sets" ) // ThreadSafeStore is an interface that allows concurrent access to a storage backend. diff --git a/vendor/github.com/yunionio/pkg/util/clock/clock.go b/vendor/yunion.io/x/pkg/util/clock/clock.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/clock/clock.go rename to vendor/yunion.io/x/pkg/util/clock/clock.go diff --git a/vendor/yunion.io/x/pkg/util/clock/doc.go b/vendor/yunion.io/x/pkg/util/clock/doc.go new file mode 100644 index 0000000000..177fa09011 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/clock/doc.go @@ -0,0 +1 @@ +package clock // import "yunion.io/x/pkg/util/clock" diff --git a/vendor/github.com/yunionio/pkg/util/compare/compare.go b/vendor/yunion.io/x/pkg/util/compare/compare.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/compare/compare.go rename to vendor/yunion.io/x/pkg/util/compare/compare.go diff --git a/vendor/yunion.io/x/pkg/util/compare/doc.go b/vendor/yunion.io/x/pkg/util/compare/doc.go new file mode 100644 index 0000000000..bae40be3e8 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/compare/doc.go @@ -0,0 +1 @@ +package compare // import "yunion.io/x/pkg/util/compare" diff --git a/vendor/github.com/yunionio/pkg/util/compare/syncresults.go b/vendor/yunion.io/x/pkg/util/compare/syncresults.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/compare/syncresults.go rename to vendor/yunion.io/x/pkg/util/compare/syncresults.go diff --git a/vendor/yunion.io/x/pkg/util/errors/doc.go b/vendor/yunion.io/x/pkg/util/errors/doc.go new file mode 100644 index 0000000000..e9ae6a1e0b --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/errors/doc.go @@ -0,0 +1 @@ +package errors // import "yunion.io/x/pkg/util/errors" diff --git a/vendor/github.com/yunionio/pkg/util/errors/errors.go b/vendor/yunion.io/x/pkg/util/errors/errors.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/errors/errors.go rename to vendor/yunion.io/x/pkg/util/errors/errors.go diff --git a/vendor/github.com/yunionio/pkg/util/errors/http_error.go b/vendor/yunion.io/x/pkg/util/errors/http_error.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/errors/http_error.go rename to vendor/yunion.io/x/pkg/util/errors/http_error.go diff --git a/vendor/yunion.io/x/pkg/util/fifoutils/doc.go b/vendor/yunion.io/x/pkg/util/fifoutils/doc.go new file mode 100644 index 0000000000..d217b0e855 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/fifoutils/doc.go @@ -0,0 +1 @@ +package fifoutils // import "yunion.io/x/pkg/util/fifoutils" diff --git a/vendor/github.com/yunionio/pkg/util/fifoutils/fifoutils.go b/vendor/yunion.io/x/pkg/util/fifoutils/fifoutils.go similarity index 96% rename from vendor/github.com/yunionio/pkg/util/fifoutils/fifoutils.go rename to vendor/yunion.io/x/pkg/util/fifoutils/fifoutils.go index bae6d9e5e5..f96b05583e 100644 --- a/vendor/github.com/yunionio/pkg/util/fifoutils/fifoutils.go +++ b/vendor/yunion.io/x/pkg/util/fifoutils/fifoutils.go @@ -3,7 +3,7 @@ package fifoutils import ( "errors" - "github.com/yunionio/log" + "yunion.io/x/log" ) var ErrEmpty error diff --git a/vendor/yunion.io/x/pkg/util/fileutils/doc.go b/vendor/yunion.io/x/pkg/util/fileutils/doc.go new file mode 100644 index 0000000000..d143a0f9c4 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/fileutils/doc.go @@ -0,0 +1 @@ +package fileutils // import "yunion.io/x/pkg/util/fileutils" diff --git a/vendor/github.com/yunionio/pkg/util/fileutils/filesize.go b/vendor/yunion.io/x/pkg/util/fileutils/filesize.go similarity index 96% rename from vendor/github.com/yunionio/pkg/util/fileutils/filesize.go rename to vendor/yunion.io/x/pkg/util/fileutils/filesize.go index 9abae350ae..cb0badf81d 100644 --- a/vendor/github.com/yunionio/pkg/util/fileutils/filesize.go +++ b/vendor/yunion.io/x/pkg/util/fileutils/filesize.go @@ -4,7 +4,7 @@ import ( "fmt" "strconv" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/pkg/util/regutils" ) func parseSizeStr(sizeStr string, defaultUnit byte, base int) (int, error) { diff --git a/vendor/yunion.io/x/pkg/util/filterclause/doc.go b/vendor/yunion.io/x/pkg/util/filterclause/doc.go new file mode 100644 index 0000000000..d0688d10e6 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/filterclause/doc.go @@ -0,0 +1 @@ +package filterclause // import "yunion.io/x/pkg/util/filterclause" diff --git a/vendor/github.com/yunionio/pkg/util/filterclause/filterclause.go b/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go similarity index 95% rename from vendor/github.com/yunionio/pkg/util/filterclause/filterclause.go rename to vendor/yunion.io/x/pkg/util/filterclause/filterclause.go index d3695863f0..2a3a1ccd10 100644 --- a/vendor/github.com/yunionio/pkg/util/filterclause/filterclause.go +++ b/vendor/yunion.io/x/pkg/util/filterclause/filterclause.go @@ -5,9 +5,9 @@ import ( "regexp" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/utils" - "github.com/yunionio/sqlchemy" + "yunion.io/x/log" + "yunion.io/x/pkg/utils" + "yunion.io/x/sqlchemy" ) type SFilterClause struct { diff --git a/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go b/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go new file mode 100644 index 0000000000..d66b9e3046 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/goroutine_pool/doc.go @@ -0,0 +1 @@ +package goroutine_pool // import "yunion.io/x/pkg/util/goroutine_pool" diff --git a/vendor/github.com/yunionio/pkg/util/goroutine_pool/gp.go b/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/goroutine_pool/gp.go rename to vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go index 77472823fa..c4459a1800 100644 --- a/vendor/github.com/yunionio/pkg/util/goroutine_pool/gp.go +++ b/vendor/yunion.io/x/pkg/util/goroutine_pool/gp.go @@ -1,6 +1,4 @@ -// +build !leak - -package gp +package goroutine_pool import ( "sync" diff --git a/vendor/yunion.io/x/pkg/util/netutils/doc.go b/vendor/yunion.io/x/pkg/util/netutils/doc.go new file mode 100644 index 0000000000..69d6340a27 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/netutils/doc.go @@ -0,0 +1 @@ +package netutils // import "yunion.io/x/pkg/util/netutils" diff --git a/vendor/github.com/yunionio/pkg/util/netutils/netutils.go b/vendor/yunion.io/x/pkg/util/netutils/netutils.go similarity index 99% rename from vendor/github.com/yunionio/pkg/util/netutils/netutils.go rename to vendor/yunion.io/x/pkg/util/netutils/netutils.go index a75bd4d1e3..4d36184266 100644 --- a/vendor/github.com/yunionio/pkg/util/netutils/netutils.go +++ b/vendor/yunion.io/x/pkg/util/netutils/netutils.go @@ -5,7 +5,7 @@ import ( "math/rand" "strconv" "strings" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/pkg/util/regutils" ) const macChars = "0123456789abcdef" diff --git a/vendor/yunion.io/x/pkg/util/osprofile/doc.go b/vendor/yunion.io/x/pkg/util/osprofile/doc.go new file mode 100644 index 0000000000..5efb8ccddc --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/osprofile/doc.go @@ -0,0 +1 @@ +package osprofile // import "yunion.io/x/pkg/util/osprofile" diff --git a/vendor/github.com/yunionio/pkg/util/osprofile/osprofile.go b/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/osprofile/osprofile.go rename to vendor/yunion.io/x/pkg/util/osprofile/osprofile.go index b544f1adae..7d7c92d87f 100644 --- a/vendor/github.com/yunionio/pkg/util/osprofile/osprofile.go +++ b/vendor/yunion.io/x/pkg/util/osprofile/osprofile.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/utils" ) const ( diff --git a/vendor/yunion.io/x/pkg/util/prometheus/doc.go b/vendor/yunion.io/x/pkg/util/prometheus/doc.go new file mode 100644 index 0000000000..e6cec97108 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/prometheus/doc.go @@ -0,0 +1 @@ +package prometheus // import "yunion.io/x/pkg/util/prometheus" diff --git a/vendor/github.com/yunionio/pkg/util/prometheus/gin_handler.go b/vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/prometheus/gin_handler.go rename to vendor/yunion.io/x/pkg/util/prometheus/gin_handler.go diff --git a/vendor/yunion.io/x/pkg/util/reflectutils/doc.go b/vendor/yunion.io/x/pkg/util/reflectutils/doc.go new file mode 100644 index 0000000000..b96d15b66e --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/reflectutils/doc.go @@ -0,0 +1 @@ +package reflectutils // import "yunion.io/x/pkg/util/reflectutils" diff --git a/vendor/github.com/yunionio/pkg/util/reflectutils/reflectutils.go b/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go similarity index 90% rename from vendor/github.com/yunionio/pkg/util/reflectutils/reflectutils.go rename to vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go index 9ab5cde347..6b58992180 100644 --- a/vendor/github.com/yunionio/pkg/util/reflectutils/reflectutils.go +++ b/vendor/yunion.io/x/pkg/util/reflectutils/reflectutils.go @@ -3,8 +3,8 @@ package reflectutils import ( "reflect" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/utils" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/utils" ) func GetStructFieldName(field *reflect.StructField) string { @@ -136,6 +136,22 @@ func FillEmbededStructValue(container reflect.Value, embed reflect.Value) bool { return false } +func SetStructFieldValue(structValue reflect.Value, fieldName string, val reflect.Value) bool { + dataType := structValue.Type() + for i := 0; i < dataType.NumField(); i += 1 { + fieldType := dataType.Field(i) + if gotypes.IsFieldExportable(fieldType.Name) { + fName := GetStructFieldName(&fieldType) + if fName == fieldName { + fieldValue := structValue.Field(i) + fieldValue.Set(val) + return true + } + } + } + return false +} + func ExpandInterface(val interface{}) []interface{} { value := reflect.Indirect(reflect.ValueOf(val)) if value.Kind() == reflect.Slice || value.Kind() == reflect.Array { diff --git a/vendor/yunion.io/x/pkg/util/regutils/doc.go b/vendor/yunion.io/x/pkg/util/regutils/doc.go new file mode 100644 index 0000000000..30ad5a6e5a --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/regutils/doc.go @@ -0,0 +1 @@ +package regutils // import "yunion.io/x/pkg/util/regutils" diff --git a/vendor/github.com/yunionio/pkg/util/regutils/regutils.go b/vendor/yunion.io/x/pkg/util/regutils/regutils.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/regutils/regutils.go rename to vendor/yunion.io/x/pkg/util/regutils/regutils.go diff --git a/vendor/yunion.io/x/pkg/util/runtime/doc.go b/vendor/yunion.io/x/pkg/util/runtime/doc.go new file mode 100644 index 0000000000..8762d3a915 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/runtime/doc.go @@ -0,0 +1 @@ +package runtime // import "yunion.io/x/pkg/util/runtime" diff --git a/vendor/github.com/yunionio/pkg/util/runtime/runtime.go b/vendor/yunion.io/x/pkg/util/runtime/runtime.go similarity index 99% rename from vendor/github.com/yunionio/pkg/util/runtime/runtime.go rename to vendor/yunion.io/x/pkg/util/runtime/runtime.go index 6749195ff0..7e8555675a 100644 --- a/vendor/github.com/yunionio/pkg/util/runtime/runtime.go +++ b/vendor/yunion.io/x/pkg/util/runtime/runtime.go @@ -6,7 +6,7 @@ import ( "sync" "time" - "github.com/yunionio/log" + "yunion.io/x/log" ) var ( diff --git a/vendor/yunion.io/x/pkg/util/seclib/doc.go b/vendor/yunion.io/x/pkg/util/seclib/doc.go new file mode 100644 index 0000000000..584e5e2fb6 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/seclib/doc.go @@ -0,0 +1 @@ +package seclib // import "yunion.io/x/pkg/util/seclib" diff --git a/vendor/github.com/yunionio/pkg/util/seclib/seclib.go b/vendor/yunion.io/x/pkg/util/seclib/seclib.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/seclib/seclib.go rename to vendor/yunion.io/x/pkg/util/seclib/seclib.go diff --git a/vendor/yunion.io/x/pkg/util/secrules/doc.go b/vendor/yunion.io/x/pkg/util/secrules/doc.go new file mode 100644 index 0000000000..9623af3555 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/secrules/doc.go @@ -0,0 +1 @@ +package secrules // import "yunion.io/x/pkg/util/secrules" diff --git a/vendor/github.com/yunionio/pkg/util/secrules/secrules.go b/vendor/yunion.io/x/pkg/util/secrules/secrules.go similarity index 88% rename from vendor/github.com/yunionio/pkg/util/secrules/secrules.go rename to vendor/yunion.io/x/pkg/util/secrules/secrules.go index 794564e981..663ee8632f 100644 --- a/vendor/github.com/yunionio/pkg/util/secrules/secrules.go +++ b/vendor/yunion.io/x/pkg/util/secrules/secrules.go @@ -1,21 +1,3 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -// This file was autogenerated by set-gen. Do not edit it manually! - package secrules import ( @@ -25,7 +7,7 @@ import ( "strconv" "strings" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/pkg/util/regutils" ) type TSecurityRuleDirection string diff --git a/vendor/github.com/yunionio/pkg/util/sets/byte.go b/vendor/yunion.io/x/pkg/util/sets/byte.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sets/byte.go rename to vendor/yunion.io/x/pkg/util/sets/byte.go diff --git a/vendor/yunion.io/x/pkg/util/sets/doc.go b/vendor/yunion.io/x/pkg/util/sets/doc.go new file mode 100644 index 0000000000..98c69db3b4 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/sets/doc.go @@ -0,0 +1 @@ +package sets // import "yunion.io/x/pkg/util/sets" diff --git a/vendor/github.com/yunionio/pkg/util/sets/empty.go b/vendor/yunion.io/x/pkg/util/sets/empty.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sets/empty.go rename to vendor/yunion.io/x/pkg/util/sets/empty.go diff --git a/vendor/github.com/yunionio/pkg/util/sets/int.go b/vendor/yunion.io/x/pkg/util/sets/int.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sets/int.go rename to vendor/yunion.io/x/pkg/util/sets/int.go diff --git a/vendor/github.com/yunionio/pkg/util/sets/int64.go b/vendor/yunion.io/x/pkg/util/sets/int64.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sets/int64.go rename to vendor/yunion.io/x/pkg/util/sets/int64.go diff --git a/vendor/github.com/yunionio/pkg/util/sets/string.go b/vendor/yunion.io/x/pkg/util/sets/string.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sets/string.go rename to vendor/yunion.io/x/pkg/util/sets/string.go diff --git a/vendor/yunion.io/x/pkg/util/stringutils/doc.go b/vendor/yunion.io/x/pkg/util/stringutils/doc.go new file mode 100644 index 0000000000..e3d27f0361 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/stringutils/doc.go @@ -0,0 +1 @@ +package stringutils // import "yunion.io/x/pkg/util/stringutils" diff --git a/vendor/github.com/yunionio/pkg/util/stringutils/stringutils.go b/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go similarity index 91% rename from vendor/github.com/yunionio/pkg/util/stringutils/stringutils.go rename to vendor/yunion.io/x/pkg/util/stringutils/stringutils.go index 74279cabb4..bc75956156 100644 --- a/vendor/github.com/yunionio/pkg/util/stringutils/stringutils.go +++ b/vendor/yunion.io/x/pkg/util/stringutils/stringutils.go @@ -6,8 +6,8 @@ import ( "time" "github.com/golang-plus/uuid" - "github.com/yunionio/jsonutils" - "github.com/yunionio/pkg/util/timeutils" + "yunion.io/x/jsonutils" + "yunion.io/x/pkg/util/timeutils" ) func ParseNamePattern(name string) (string, string, int) { @@ -26,7 +26,7 @@ func ParseNamePattern(name string) (string, string, int) { pattern = fmt.Sprintf("%s%%0%dd%s", name[:start], end-start, name[end:]) patternLen = end - start } else { - match = fmt.Sprintf("%s%%", name) + match = fmt.Sprintf("%s-%%", name) pattern = fmt.Sprintf("%s-%%d", name) } return match, pattern, patternLen diff --git a/vendor/yunion.io/x/pkg/util/sysutils/doc.go b/vendor/yunion.io/x/pkg/util/sysutils/doc.go new file mode 100644 index 0000000000..8294259502 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/sysutils/doc.go @@ -0,0 +1 @@ +package sysutils // import "yunion.io/x/pkg/util/sysutils" diff --git a/vendor/github.com/yunionio/pkg/util/sysutils/storagetypes.go b/vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/sysutils/storagetypes.go rename to vendor/yunion.io/x/pkg/util/sysutils/storagetypes.go diff --git a/vendor/yunion.io/x/pkg/util/timeutils/doc.go b/vendor/yunion.io/x/pkg/util/timeutils/doc.go new file mode 100644 index 0000000000..f4e2f77610 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/timeutils/doc.go @@ -0,0 +1 @@ +package timeutils // import "yunion.io/x/pkg/util/timeutils" diff --git a/vendor/github.com/yunionio/pkg/util/timeutils/timeutils.go b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/timeutils/timeutils.go rename to vendor/yunion.io/x/pkg/util/timeutils/timeutils.go index 9cb4fb81ae..ed6522dd37 100644 --- a/vendor/github.com/yunionio/pkg/util/timeutils/timeutils.go +++ b/vendor/yunion.io/x/pkg/util/timeutils/timeutils.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/yunionio/pkg/util/regutils" + "yunion.io/x/pkg/util/regutils" ) func UtcNow() time.Time { diff --git a/vendor/yunion.io/x/pkg/util/trace/doc.go b/vendor/yunion.io/x/pkg/util/trace/doc.go new file mode 100644 index 0000000000..ce1c3bc8cb --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/trace/doc.go @@ -0,0 +1 @@ +package trace // import "yunion.io/x/pkg/util/trace" diff --git a/vendor/github.com/yunionio/pkg/util/trace/trace.go b/vendor/yunion.io/x/pkg/util/trace/trace.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/trace/trace.go rename to vendor/yunion.io/x/pkg/util/trace/trace.go index 281a52266a..b2faea48e7 100644 --- a/vendor/github.com/yunionio/pkg/util/trace/trace.go +++ b/vendor/yunion.io/x/pkg/util/trace/trace.go @@ -6,7 +6,7 @@ import ( "math/rand" "time" - "github.com/yunionio/log" + "yunion.io/x/log" ) type traceStep struct { diff --git a/vendor/yunion.io/x/pkg/util/ttlpool/doc.go b/vendor/yunion.io/x/pkg/util/ttlpool/doc.go new file mode 100644 index 0000000000..07e7e6b4a0 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/ttlpool/doc.go @@ -0,0 +1 @@ +package ttlpool // import "yunion.io/x/pkg/util/ttlpool" diff --git a/vendor/github.com/yunionio/pkg/util/ttlpool/pool.go b/vendor/yunion.io/x/pkg/util/ttlpool/pool.go similarity index 98% rename from vendor/github.com/yunionio/pkg/util/ttlpool/pool.go rename to vendor/yunion.io/x/pkg/util/ttlpool/pool.go index 94c29d683f..099d378796 100644 --- a/vendor/github.com/yunionio/pkg/util/ttlpool/pool.go +++ b/vendor/yunion.io/x/pkg/util/ttlpool/pool.go @@ -5,8 +5,8 @@ import ( "sync" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/cache" + "yunion.io/x/log" + "yunion.io/x/pkg/util/cache" ) type Item interface { diff --git a/vendor/github.com/yunionio/pkg/util/version/base.go b/vendor/yunion.io/x/pkg/util/version/base.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/version/base.go rename to vendor/yunion.io/x/pkg/util/version/base.go diff --git a/vendor/yunion.io/x/pkg/util/version/doc.go b/vendor/yunion.io/x/pkg/util/version/doc.go new file mode 100644 index 0000000000..48ce4f25f9 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/version/doc.go @@ -0,0 +1 @@ +package version // import "yunion.io/x/pkg/util/version" diff --git a/vendor/github.com/yunionio/pkg/util/version/version.go b/vendor/yunion.io/x/pkg/util/version/version.go similarity index 100% rename from vendor/github.com/yunionio/pkg/util/version/version.go rename to vendor/yunion.io/x/pkg/util/version/version.go diff --git a/vendor/yunion.io/x/pkg/util/wait/doc.go b/vendor/yunion.io/x/pkg/util/wait/doc.go new file mode 100644 index 0000000000..c3d61c5ad9 --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/wait/doc.go @@ -0,0 +1 @@ +package wait // import "yunion.io/x/pkg/util/wait" diff --git a/vendor/github.com/yunionio/pkg/util/wait/wait.go b/vendor/yunion.io/x/pkg/util/wait/wait.go similarity index 99% rename from vendor/github.com/yunionio/pkg/util/wait/wait.go rename to vendor/yunion.io/x/pkg/util/wait/wait.go index 20415107b4..8ae22a828d 100644 --- a/vendor/github.com/yunionio/pkg/util/wait/wait.go +++ b/vendor/yunion.io/x/pkg/util/wait/wait.go @@ -5,7 +5,7 @@ import ( "math/rand" "time" - "github.com/yunionio/pkg/util/runtime" + "yunion.io/x/pkg/util/runtime" ) // For any test of the style: diff --git a/vendor/yunion.io/x/pkg/util/workqueue/doc.go b/vendor/yunion.io/x/pkg/util/workqueue/doc.go new file mode 100644 index 0000000000..b084c2fb1a --- /dev/null +++ b/vendor/yunion.io/x/pkg/util/workqueue/doc.go @@ -0,0 +1 @@ +package workqueue // import "yunion.io/x/pkg/util/workqueue" diff --git a/vendor/github.com/yunionio/pkg/util/workqueue/parallelizer.go b/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go similarity index 92% rename from vendor/github.com/yunionio/pkg/util/workqueue/parallelizer.go rename to vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go index e1c77cac23..03ae22c0fe 100644 --- a/vendor/github.com/yunionio/pkg/util/workqueue/parallelizer.go +++ b/vendor/yunion.io/x/pkg/util/workqueue/parallelizer.go @@ -3,7 +3,7 @@ package workqueue import ( "sync" - utilruntime "github.com/yunionio/pkg/util/runtime" + utilruntime "yunion.io/x/pkg/util/runtime" ) type DoWorkPieceFunc func(piece int) diff --git a/vendor/github.com/yunionio/pkg/utils/crypt.go b/vendor/yunion.io/x/pkg/utils/crypt.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/crypt.go rename to vendor/yunion.io/x/pkg/utils/crypt.go diff --git a/vendor/yunion.io/x/pkg/utils/doc.go b/vendor/yunion.io/x/pkg/utils/doc.go new file mode 100644 index 0000000000..c562971768 --- /dev/null +++ b/vendor/yunion.io/x/pkg/utils/doc.go @@ -0,0 +1 @@ +package utils // import "yunion.io/x/pkg/utils" diff --git a/vendor/github.com/yunionio/pkg/utils/misc.go b/vendor/yunion.io/x/pkg/utils/misc.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/misc.go rename to vendor/yunion.io/x/pkg/utils/misc.go diff --git a/vendor/github.com/yunionio/pkg/utils/net.go b/vendor/yunion.io/x/pkg/utils/net.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/net.go rename to vendor/yunion.io/x/pkg/utils/net.go diff --git a/vendor/github.com/yunionio/pkg/utils/pidfile.go b/vendor/yunion.io/x/pkg/utils/pidfile.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/pidfile.go rename to vendor/yunion.io/x/pkg/utils/pidfile.go diff --git a/vendor/github.com/yunionio/pkg/utils/tags.go b/vendor/yunion.io/x/pkg/utils/tags.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/tags.go rename to vendor/yunion.io/x/pkg/utils/tags.go diff --git a/vendor/github.com/yunionio/pkg/utils/utils.go b/vendor/yunion.io/x/pkg/utils/utils.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/utils.go rename to vendor/yunion.io/x/pkg/utils/utils.go diff --git a/vendor/github.com/yunionio/pkg/utils/uuid.go b/vendor/yunion.io/x/pkg/utils/uuid.go similarity index 90% rename from vendor/github.com/yunionio/pkg/utils/uuid.go rename to vendor/yunion.io/x/pkg/utils/uuid.go index bdaf5e7ca9..1a011a975b 100644 --- a/vendor/github.com/yunionio/pkg/utils/uuid.go +++ b/vendor/yunion.io/x/pkg/utils/uuid.go @@ -4,7 +4,7 @@ import ( "crypto/rand" "encoding/hex" - "github.com/yunionio/log" + "yunion.io/x/log" ) func GenRequestId(bytes int) string { diff --git a/vendor/github.com/yunionio/pkg/utils/wait_group.go b/vendor/yunion.io/x/pkg/utils/wait_group.go similarity index 100% rename from vendor/github.com/yunionio/pkg/utils/wait_group.go rename to vendor/yunion.io/x/pkg/utils/wait_group.go diff --git a/vendor/github.com/yunionio/sqlchemy/LICENSE b/vendor/yunion.io/x/sqlchemy/LICENSE similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/LICENSE rename to vendor/yunion.io/x/sqlchemy/LICENSE diff --git a/vendor/github.com/yunionio/sqlchemy/README.md b/vendor/yunion.io/x/sqlchemy/README.md similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/README.md rename to vendor/yunion.io/x/sqlchemy/README.md diff --git a/vendor/github.com/yunionio/sqlchemy/column.go b/vendor/yunion.io/x/sqlchemy/column.go similarity index 94% rename from vendor/github.com/yunionio/sqlchemy/column.go rename to vendor/yunion.io/x/sqlchemy/column.go index e3146324a3..90ff609a11 100644 --- a/vendor/github.com/yunionio/sqlchemy/column.go +++ b/vendor/yunion.io/x/sqlchemy/column.go @@ -7,17 +7,18 @@ import ( "strings" "time" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/regutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/regutils" + "yunion.io/x/pkg/utils" ) type IColumnSpec interface { Name() string ColType() string Default() string + IsSupportDefault() bool IsNullable() bool IsPrimary() bool IsKeyIndex() bool @@ -67,6 +68,10 @@ func (c *SBaseColumn) Default() string { return c.defaultString } +func (c *SBaseColumn) IsSupportDefault() bool { + return true +} + func (c *SBaseColumn) IsNullable() bool { return c.isNullable } @@ -146,7 +151,7 @@ func definitionBuffer(c IColumnSpec) bytes.Buffer { } def := c.Default() - if len(def) > 0 { + if len(def) > 0 && c.IsSupportDefault() { def = c.ConvertFromString(def) buf.WriteString(" DEFAULT ") if c.IsText() { @@ -475,6 +480,16 @@ type STextColumn struct { Charset string } +func (c *STextColumn) IsSupportDefault() bool { + // https://stackoverflow.com/questions/3466872/why-cant-a-text-column-have-a-default-value-in-mysql + // MySQL does not support default for TEXT/BLOB + if c.sqlType == "VARCHAR" { + return true + } else { + return false + } +} + func (c *STextColumn) ColType() string { return fmt.Sprintf("%s CHARACTER SET '%s'", c.SBaseWidthColumn.ColType(), c.Charset) } @@ -588,16 +603,16 @@ func NewDateTimeColumn(name string, tagmap map[string]string) SDateTimeColumn { return dtc } -type CompondColumn struct { +type CompoundColumn struct { STextColumn } -func (c *CompondColumn) DefinitionString() string { +func (c *CompoundColumn) DefinitionString() string { buf := definitionBuffer(c) return buf.String() } -func (c *CompondColumn) IsZero(val interface{}) bool { +func (c *CompoundColumn) IsZero(val interface{}) bool { if val == nil { return true } @@ -606,7 +621,7 @@ func (c *CompondColumn) IsZero(val interface{}) bool { return json.IsZero() } -func (c *CompondColumn) ConvertFromValue(val interface{}) interface{} { +func (c *CompoundColumn) ConvertFromValue(val interface{}) interface{} { bVal, ok := val.(gotypes.ISerializable) if ok && bVal != nil { return bVal.String() @@ -615,8 +630,8 @@ func (c *CompondColumn) ConvertFromValue(val interface{}) interface{} { } } -func NewCompondColumn(name string, tagmap map[string]string) CompondColumn { - dtc := CompondColumn{NewTextColumn(name, tagmap)} +func NewCompoundColumn(name string, tagmap map[string]string) CompoundColumn { + dtc := CompoundColumn{NewTextColumn(name, tagmap)} return dtc } diff --git a/vendor/github.com/yunionio/sqlchemy/conditions.go b/vendor/yunion.io/x/sqlchemy/conditions.go similarity index 94% rename from vendor/github.com/yunionio/sqlchemy/conditions.go rename to vendor/yunion.io/x/sqlchemy/conditions.go index 5c6678b853..0a40b89469 100644 --- a/vendor/github.com/yunionio/sqlchemy/conditions.go +++ b/vendor/yunion.io/x/sqlchemy/conditions.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/yunionio/pkg/util/reflectutils" + "yunion.io/x/pkg/util/reflectutils" ) type ICondition interface { @@ -12,11 +12,11 @@ type ICondition interface { Variables() []interface{} } -type SCompondConditions struct { +type SCompoundConditions struct { conditions []ICondition } -func compondWhereClause(c *SCompondConditions, op string) string { +func compoundWhereClause(c *SCompoundConditions, op string) string { var buf bytes.Buffer for _, cond := range c.conditions { if buf.Len() > 0 { @@ -31,11 +31,11 @@ func compondWhereClause(c *SCompondConditions, op string) string { return buf.String() } -func (c *SCompondConditions) WhereClause() string { +func (c *SCompoundConditions) WhereClause() string { return "" } -func (c *SCompondConditions) Variables() []interface{} { +func (c *SCompoundConditions) Variables() []interface{} { vars := make([]interface{}, 0) for _, cond := range c.conditions { nvars := cond.Variables() @@ -47,19 +47,19 @@ func (c *SCompondConditions) Variables() []interface{} { } type SAndConditions struct { - SCompondConditions + SCompoundConditions } func (c *SAndConditions) WhereClause() string { - return compondWhereClause(&c.SCompondConditions, SQL_OP_AND) + return compoundWhereClause(&c.SCompoundConditions, SQL_OP_AND) } type SOrConditions struct { - SCompondConditions + SCompoundConditions } func (c *SOrConditions) WhereClause() string { - return compondWhereClause(&c.SCompondConditions, SQL_OP_OR) + return compoundWhereClause(&c.SCompoundConditions, SQL_OP_OR) } func AND(cond ...ICondition) ICondition { @@ -72,7 +72,7 @@ func AND(cond ...ICondition) ICondition { conds = append(conds, c) } } - cc := SAndConditions{SCompondConditions{conditions: conds}} + cc := SAndConditions{SCompoundConditions{conditions: conds}} return &cc } @@ -86,7 +86,7 @@ func OR(cond ...ICondition) ICondition { conds = append(conds, c) } } - cc := SOrConditions{SCompondConditions{conditions: conds}} + cc := SOrConditions{SCompoundConditions{conditions: conds}} return &cc } diff --git a/vendor/github.com/yunionio/sqlchemy/const.go b/vendor/yunion.io/x/sqlchemy/const.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/const.go rename to vendor/yunion.io/x/sqlchemy/const.go diff --git a/vendor/yunion.io/x/sqlchemy/debug.go b/vendor/yunion.io/x/sqlchemy/debug.go new file mode 100644 index 0000000000..a5376bf112 --- /dev/null +++ b/vendor/yunion.io/x/sqlchemy/debug.go @@ -0,0 +1,29 @@ +package sqlchemy + +import ( + "yunion.io/x/log" +) + +var ( + DEBUG_SQLCHEMY = false +) + +func (tq *SQuery) DebugQuery() { + sqlstr := tq.String() + vars := tq.Variables() + log.Debugf("SQuery %s with vars: %s", sqlstr, vars) +} + +func (sqf *SSubQuery) DebugQuery() { + sqlstr := sqf.query.String() + vars := sqf.query.Variables() + log.Debugf("SQuery %s with vars: %s", sqlstr, vars) +} + +func (t *STableSpec) DebugInsert(dt interface{}) error { + return t.insert(dt, true) +} + +func (ts *STableSpec) DebugUpdateFields(dt interface{}, fields map[string]interface{}) error { + return ts.updateFields(dt, fields, true) +} diff --git a/vendor/yunion.io/x/sqlchemy/doc.go b/vendor/yunion.io/x/sqlchemy/doc.go new file mode 100644 index 0000000000..d2170e1395 --- /dev/null +++ b/vendor/yunion.io/x/sqlchemy/doc.go @@ -0,0 +1 @@ +package sqlchemy // import "yunion.io/x/sqlchemy" diff --git a/vendor/github.com/yunionio/sqlchemy/errors.go b/vendor/yunion.io/x/sqlchemy/errors.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/errors.go rename to vendor/yunion.io/x/sqlchemy/errors.go diff --git a/vendor/yunion.io/x/sqlchemy/field_update.go b/vendor/yunion.io/x/sqlchemy/field_update.go new file mode 100644 index 0000000000..2087dbb6c0 --- /dev/null +++ b/vendor/yunion.io/x/sqlchemy/field_update.go @@ -0,0 +1,143 @@ +package sqlchemy + +import ( + "bytes" + "errors" + "fmt" + "reflect" + + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/util/reflectutils" +) + +func (ts *STableSpec) GetUpdateColumnValue(dataType reflect.Type, dataValue reflect.Value, cv map[string]interface{}, fields map[string]interface{}) error { + for i := 0; i < dataType.NumField(); i++ { + fieldType := dataType.Field(i) + if gotypes.IsFieldExportable(fieldType.Name) { + fieldValue := dataValue.Field(i) + newValue, ok := fields[fieldType.Name] + if ok && fieldType.Anonymous { + return errors.New("Unsupported update anonymous field") + } + if ok { + columnName := reflectutils.GetStructFieldName(&fieldType) + cv[columnName] = newValue + continue + } + if fieldType.Anonymous { + err := ts.GetUpdateColumnValue(fieldType.Type, fieldValue, cv, fields) + if err != nil { + return err + } + } + } + } + return nil +} + +func (ts *STableSpec) UpdateFields(dt interface{}, fields map[string]interface{}) error { + return ts.updateFields(dt, fields, false) +} + +// params dt: model struct, fileds: {struct-field-name-string: update-value} +// find primary key and index key +// find fields correlatively columns +// joint sql and executed +func (ts *STableSpec) updateFields(dt interface{}, fields map[string]interface{}, debug bool) error { + dataValue := reflect.ValueOf(dt) + if dataValue.Kind() == reflect.Ptr { + dataValue = dataValue.Elem() + } + + //cv: {"column name": "update value"} + cv := make(map[string]interface{}, 0) + dataType := dataValue.Type() + ts.GetUpdateColumnValue(dataType, dataValue, cv, fields) + + fullFields := reflectutils.FetchStructFieldNameValueInterfaces(dataValue) + versionFields := make([]string, 0) + updatedFields := make([]string, 0) + primaryCols := make(map[string]interface{}, 0) + indexCols := make(map[string]interface{}, 0) + for _, col := range ts.Columns() { + name := col.Name() + colValue := fullFields[name] + if col.IsPrimary() && !col.IsZero(colValue) { + primaryCols[name] = colValue + continue + } else if col.IsKeyIndex() && !col.IsZero(colValue) { + indexCols[name] = colValue + continue + } + intCol, ok := col.(*SIntegerColumn) + if ok && intCol.IsAutoVersion { + versionFields = append(versionFields, name) + continue + } + dateCol, ok := col.(*SDateTimeColumn) + if ok && dateCol.IsUpdatedAt { + updatedFields = append(updatedFields, name) + continue + } + if _, exist := cv[name]; exist { + cv[name] = col.ConvertFromValue(cv[name]) + } + } + + vars := make([]interface{}, 0) + var buf bytes.Buffer + buf.WriteString(fmt.Sprintf("UPDATE `%s` SET ", ts.name)) + first := true + for k, v := range cv { + if first { + first = false + } else { + buf.WriteString(", ") + } + buf.WriteString(fmt.Sprintf("`%s` = ?", k)) + vars = append(vars, v) + } + for _, versionField := range versionFields { + buf.WriteString(fmt.Sprintf(", `%s` = `%s` + 1", versionField, versionField)) + } + for _, updatedField := range updatedFields { + buf.WriteString(fmt.Sprintf(", `%s` = NOW()", updatedField)) + } + buf.WriteString(" WHERE ") + first = true + var indexFilter map[string]interface{} + if len(primaryCols) > 0 { + indexFilter = primaryCols + } else if len(indexCols) > 0 { + indexFilter = indexCols + } else { + return fmt.Errorf("neither primary key nor key indexes empty???") + } + + for k, v := range indexFilter { + if first { + first = false + } else { + buf.WriteString(" AND ") + } + buf.WriteString(fmt.Sprintf("`%s` = ?", k)) + vars = append(vars, v) + } + + if DEBUG_SQLCHEMY || debug { + log.Infof("Update: %s", buf.String()) + } + results, err := _db.Exec(buf.String(), vars...) + if err != nil { + return err + } + aCnt, err := results.RowsAffected() + if err != nil { + return err + } + if aCnt != 1 { + return fmt.Errorf("affected rows %d != 1", aCnt) + } + return nil +} diff --git a/vendor/github.com/yunionio/sqlchemy/filter.go b/vendor/yunion.io/x/sqlchemy/filter.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/filter.go rename to vendor/yunion.io/x/sqlchemy/filter.go diff --git a/vendor/github.com/yunionio/sqlchemy/functions.go b/vendor/yunion.io/x/sqlchemy/functions.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/functions.go rename to vendor/yunion.io/x/sqlchemy/functions.go diff --git a/vendor/github.com/yunionio/sqlchemy/insert.go b/vendor/yunion.io/x/sqlchemy/insert.go similarity index 66% rename from vendor/github.com/yunionio/sqlchemy/insert.go rename to vendor/yunion.io/x/sqlchemy/insert.go index 53479f7583..341ce91343 100644 --- a/vendor/github.com/yunionio/sqlchemy/insert.go +++ b/vendor/yunion.io/x/sqlchemy/insert.go @@ -5,12 +5,15 @@ import ( "reflect" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/util/reflectutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/reflectutils" ) func (t *STableSpec) Insert(dt interface{}) error { + return t.insert(dt, false) +} + +func (t *STableSpec) insert(dt interface{}, debug bool) error { beforeInsertFunc := reflect.ValueOf(dt).MethodByName("BeforeInsert") if beforeInsertFunc.IsValid() && !beforeInsertFunc.IsNil() { beforeInsertFunc.Call([]reflect.Value{}) @@ -25,6 +28,7 @@ func (t *STableSpec) Insert(dt interface{}) error { names := make([]string, 0) format := make([]string, 0) values := make([]interface{}, 0) + fields := reflectutils.FetchStructFieldNameValueInterfaces(dataValue) for _, c := range t.columns { isAutoInc := false @@ -58,15 +62,23 @@ func (t *STableSpec) Insert(dt interface{}) error { } else { return fmt.Errorf("fail to insert for null primary key `%s`", k) } + } else if ! c.IsSupportDefault() && len(c.Default()) > 0 && ov != nil && c.IsZero(ov) { // empty text value + val := c.ConvertFromString(c.Default()) + values = append(values, val) + names = append(names, fmt.Sprintf("`%s`", k)) + format = append(format, "?") } } + insertSql := fmt.Sprintf("INSERT INTO `%s` (%s) VALUES(%s)", t.name, strings.Join(names, ", "), strings.Join(format, ", ")) - if DEBUG_SQLCHEMY { + + if DEBUG_SQLCHEMY || debug { log.Debugf("%s values: %s", insertSql, values) } + results, err := _db.Exec(insertSql, values...) if err != nil { return err @@ -78,6 +90,8 @@ func (t *STableSpec) Insert(dt interface{}) error { if affectCnt != 1 { return fmt.Errorf("Insert affected cnt %d != 1", affectCnt) } + + /* if len(autoIncField) > 0 { lastId, err := results.LastInsertId() if err == nil { @@ -87,5 +101,32 @@ func (t *STableSpec) Insert(dt interface{}) error { } } } + */ + + // query the value, so default value can be feedback into the object + // fields = reflectutils.FetchStructFieldNameValueInterfaces(dataValue) + q := t.Query() + for _, c := range t.columns { + if c.IsPrimary() { + nc, ok := c.(*SIntegerColumn) + if ok && nc.IsAutoIncrement { + lastId, err := results.LastInsertId() + if err != nil { + log.Errorf("Fail to fetch lastInsertId %s", err) + return err + } else { + q = q.Equals(c.Name(), lastId) + } + } else { + q = q.Equals(c.Name(), fields[c.Name()]) + } + } + } + err = q.First(dt) + if err != nil { + log.Errorf("query after insert failed %s", err) + return err + } + return nil } diff --git a/vendor/github.com/yunionio/sqlchemy/parser.go b/vendor/yunion.io/x/sqlchemy/parser.go similarity index 92% rename from vendor/github.com/yunionio/sqlchemy/parser.go rename to vendor/yunion.io/x/sqlchemy/parser.go index f68ad1fe3d..2464f9c82c 100644 --- a/vendor/github.com/yunionio/sqlchemy/parser.go +++ b/vendor/yunion.io/x/sqlchemy/parser.go @@ -3,11 +3,11 @@ package sqlchemy import ( "reflect" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/pkg/utils" ) func fieldToColumnSpec(field *reflect.StructField) IColumnSpec { @@ -86,7 +86,7 @@ func fieldToColumnSpec(field *reflect.StructField) IColumnSpec { return &col*/ default: if gotypes.IsSerializable(field.Type) { - col := NewCompondColumn(fieldname, tagmap) + col := NewCompoundColumn(fieldname, tagmap) return &col } else { log.Fatalf("Unsupported type! %s", field.Type) diff --git a/vendor/github.com/yunionio/sqlchemy/query.go b/vendor/yunion.io/x/sqlchemy/query.go similarity index 99% rename from vendor/github.com/yunionio/sqlchemy/query.go rename to vendor/yunion.io/x/sqlchemy/query.go index 087e0eee31..7b0f332e5b 100644 --- a/vendor/github.com/yunionio/sqlchemy/query.go +++ b/vendor/yunion.io/x/sqlchemy/query.go @@ -6,8 +6,8 @@ import ( "fmt" "reflect" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/reflectutils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/reflectutils" ) type IQuerySource interface { diff --git a/vendor/github.com/yunionio/sqlchemy/rawquery.go b/vendor/yunion.io/x/sqlchemy/rawquery.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/rawquery.go rename to vendor/yunion.io/x/sqlchemy/rawquery.go diff --git a/vendor/github.com/yunionio/sqlchemy/reflect.go b/vendor/yunion.io/x/sqlchemy/reflect.go similarity index 95% rename from vendor/github.com/yunionio/sqlchemy/reflect.go rename to vendor/yunion.io/x/sqlchemy/reflect.go index 88cfa85b3b..7c7753a2ad 100644 --- a/vendor/github.com/yunionio/sqlchemy/reflect.go +++ b/vendor/yunion.io/x/sqlchemy/reflect.go @@ -6,11 +6,11 @@ import ( "strconv" "time" - "github.com/yunionio/jsonutils" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/tristate" - "github.com/yunionio/pkg/util/timeutils" + "yunion.io/x/jsonutils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/tristate" + "yunion.io/x/pkg/util/timeutils" ) func getStringValue(dat interface{}) string { diff --git a/vendor/github.com/yunionio/sqlchemy/sql.go b/vendor/yunion.io/x/sqlchemy/sql.go similarity index 95% rename from vendor/github.com/yunionio/sqlchemy/sql.go rename to vendor/yunion.io/x/sqlchemy/sql.go index 1042bf343c..59e91fe3b8 100644 --- a/vendor/github.com/yunionio/sqlchemy/sql.go +++ b/vendor/yunion.io/x/sqlchemy/sql.go @@ -3,7 +3,7 @@ package sqlchemy import ( "database/sql" - "github.com/yunionio/log" + "yunion.io/x/log" ) var _db *sql.DB diff --git a/vendor/github.com/yunionio/sqlchemy/sync.go b/vendor/yunion.io/x/sqlchemy/sync.go similarity index 98% rename from vendor/github.com/yunionio/sqlchemy/sync.go rename to vendor/yunion.io/x/sqlchemy/sync.go index cc7cdfc72d..07b3df8a81 100644 --- a/vendor/github.com/yunionio/sqlchemy/sync.go +++ b/vendor/yunion.io/x/sqlchemy/sync.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/utils" ) type SSqlColumnInfo struct { diff --git a/vendor/github.com/yunionio/sqlchemy/table.go b/vendor/yunion.io/x/sqlchemy/table.go similarity index 98% rename from vendor/github.com/yunionio/sqlchemy/table.go rename to vendor/yunion.io/x/sqlchemy/table.go index 62d313e069..3f9813f5de 100644 --- a/vendor/github.com/yunionio/sqlchemy/table.go +++ b/vendor/yunion.io/x/sqlchemy/table.go @@ -5,8 +5,8 @@ import ( "reflect" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/utils" ) type STableSpec struct { diff --git a/vendor/github.com/yunionio/sqlchemy/tablealias.go b/vendor/yunion.io/x/sqlchemy/tablealias.go similarity index 100% rename from vendor/github.com/yunionio/sqlchemy/tablealias.go rename to vendor/yunion.io/x/sqlchemy/tablealias.go diff --git a/vendor/github.com/yunionio/sqlchemy/update.go b/vendor/yunion.io/x/sqlchemy/update.go similarity index 97% rename from vendor/github.com/yunionio/sqlchemy/update.go rename to vendor/yunion.io/x/sqlchemy/update.go index 884a63d913..b651f338aa 100644 --- a/vendor/github.com/yunionio/sqlchemy/update.go +++ b/vendor/yunion.io/x/sqlchemy/update.go @@ -6,9 +6,9 @@ import ( "reflect" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/util/reflectutils" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/util/reflectutils" + "yunion.io/x/pkg/utils" ) type SUpdateSession struct { diff --git a/vendor/github.com/yunionio/structarg/.gitignore b/vendor/yunion.io/x/structarg/.gitignore similarity index 100% rename from vendor/github.com/yunionio/structarg/.gitignore rename to vendor/yunion.io/x/structarg/.gitignore diff --git a/vendor/github.com/yunionio/structarg/LICENSE b/vendor/yunion.io/x/structarg/LICENSE similarity index 100% rename from vendor/github.com/yunionio/structarg/LICENSE rename to vendor/yunion.io/x/structarg/LICENSE diff --git a/vendor/github.com/yunionio/structarg/README.md b/vendor/yunion.io/x/structarg/README.md similarity index 100% rename from vendor/github.com/yunionio/structarg/README.md rename to vendor/yunion.io/x/structarg/README.md diff --git a/vendor/yunion.io/x/structarg/doc.go b/vendor/yunion.io/x/structarg/doc.go new file mode 100644 index 0000000000..779786382a --- /dev/null +++ b/vendor/yunion.io/x/structarg/doc.go @@ -0,0 +1 @@ +package structarg // import "yunion.io/x/structarg" diff --git a/vendor/github.com/yunionio/structarg/structarg.go b/vendor/yunion.io/x/structarg/structarg.go similarity index 99% rename from vendor/github.com/yunionio/structarg/structarg.go rename to vendor/yunion.io/x/structarg/structarg.go index 3e0f4477e5..2f64914771 100644 --- a/vendor/github.com/yunionio/structarg/structarg.go +++ b/vendor/yunion.io/x/structarg/structarg.go @@ -9,9 +9,9 @@ import ( "strconv" "strings" - "github.com/yunionio/log" - "github.com/yunionio/pkg/gotypes" - "github.com/yunionio/pkg/utils" + "yunion.io/x/log" + "yunion.io/x/pkg/gotypes" + "yunion.io/x/pkg/utils" ) type BaseOptions struct {