path move: github.com/yunionio -> yunion.io/x

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 {

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) {

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) {

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 {

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 {

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 {

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 {

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) {

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 {

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 {

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 {

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 {

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 {

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 (

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 {

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

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 {

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 (

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

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 (

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 {

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 {

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 {

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 {

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 {

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)

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

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 {

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

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"
 )
 

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 {

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 (

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 {

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 {

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 {

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 {

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 (

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 {