opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-08-28 19:45:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

- mv mcclient to pkg/mcclient

Browse Source 
- vendor update
This commit is contained in:
Zexi Li
2018-08-01 14:05:38 +08:00
parent b4ec8935de
commit b5275a0c29
331 changed files with 6789 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gopkg.lock
Generated
+20 -20
View File
@@ -47,6 +47,12 @@
revision = "c52492ff1b386e5c0ba5271b5eaad165fab09eca"
version = "v0.2.2"
[[projects]]
name = "github.com/davecgh/go-spew"
packages = ["spew"]
revision = "346938d642f2ec3594ed81d874461961cd0faa76"
version = "v1.1.0"
[[projects]]
name = "github.com/fatih/color"
packages = ["."]
@@ -188,6 +194,12 @@
packages = ["termios"]
revision = "cda20d4ac917ad418d86e151eff439648b06185b"
[[projects]]
name = "github.com/pmezard/go-difflib"
packages = ["difflib"]
revision = "792786c7400a136282c1664665ae0a8db921c6c2"
version = "v1.0.0"
[[projects]]
name = "github.com/prometheus/client_golang"
packages = ["prometheus"]
@@ -233,6 +245,12 @@
revision = "3e01752db0189b9157070a0e1668a620f9a85da2"
version = "v1.0.6"
[[projects]]
name = "github.com/stretchr/testify"
packages = ["assert"]
revision = "f35b8ab0b5a2cef36673838d662e249dd9c94686"
version = "v1.2.2"
[[projects]]
name = "github.com/ugorji/go"
packages = ["codec"]
@@ -254,25 +272,10 @@
revision = "d2fe137411c230927e28dd82b1a3bcb618dbb28d"
[[projects]]
name = "github.com/yunionio/mcclient"
packages = [
".",
"auth",
"modules"
]
revision = "2e236af400fb965cb93e8adc5a45d4bd511f66dc"
[[projects]]
branch = "master"
name = "github.com/yunionio/pkg"
packages = [
"appctx",
"appsrv",
"appsrv/dispatcher",
"gotypes",
"httperrors",
"prettytable",
"proxy",
"trace",
"tristate",
"util/cache",
@@ -282,12 +285,9 @@
"util/fifoutils",
"util/fileutils",
"util/filterclause",
"util/gin/middleware",
"util/goroutine_pool",
"util/httputils",
"util/netutils",
"util/osprofile",
"util/printjson",
"util/prometheus",
"util/reflectutils",
"util/regutils",
@@ -305,7 +305,7 @@
"util/workqueue",
"utils"
]
revision = "e3d49929d3d3ae3aeea77b188a03e5107f5a8b7e"
revision = "8c5eab6f0b758d3888fd9041419e38a5b1129725"
[[projects]]
name = "github.com/yunionio/sqlchemy"
@@ -369,6 +369,6 @@
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "4fc794f3537a577ea0c7f1c241e3a7c55618d162d982e6201cadde9e911730e7"
inputs-digest = "7b33757daccd7b7b9fc876fd74890fc9c7e638b9ee0f68d665559165716eb70d"
solver-name = "gps-cdcl"
solver-version = 1
Gopkg.toml
+1 -5
View File
@@ -42,11 +42,7 @@
name = "github.com/yunionio/log"
[[constraint]]
revision = "2e236af400fb965cb93e8adc5a45d4bd511f66dc"
name = "github.com/yunionio/mcclient"
[[constraint]]
branch = "master"
revision = "8c5eab6f0b758d3888fd9041419e38a5b1129725"
name = "github.com/yunionio/pkg"
[[constraint]]
cmd/climc/climc.go
+4 -4
View File
@@ -6,13 +6,13 @@ import (
"strings"
"github.com/c-bata/go-prompt"
"github.com/yunionio/log"
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/cmd/climc/promputils"
"github.com/yunionio/onecloud/cmd/climc/shell"
"github.com/yunionio/pkg/util/version"
"github.com/yunionio/structarg"
"github.com/yunionio/onecloud/cmd/climc/promputils"
"github.com/yunionio/onecloud/cmd/climc/shell"
"github.com/yunionio/onecloud/pkg/mcclient"
)
type BaseOptions struct {
cmd/climc/promputils/executor.go
+2 -1
View File
@@ -9,8 +9,9 @@ import (
"regexp"
"strings"
"github.com/yunionio/mcclient"
"github.com/yunionio/structarg"
"github.com/yunionio/onecloud/pkg/mcclient"
)
var (
cmd/climc/shell/actions.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type BaseActionListOptions struct {
cmd/climc/shell/alarmevents.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/alarmlogs.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/alarms.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/alarmtemplates.go
+3 -2
View File
@@ -4,8 +4,9 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/baremetalnetworks.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/baremetalstorages.go
+2 -3
View File
@@ -1,9 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
// "github.com/yunionio/jsonutils"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/cachedimages.go
+2 -3
View File
@@ -1,9 +1,8 @@
package shell
import (
// "github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/cloudproviders.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/cloudregions.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/contactgroups.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/contacts.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/current.go
+1 -1
View File
@@ -1,7 +1,7 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient"
)
func init() {
cmd/climc/shell/disks.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/dnsrecords.go
+3 -2
View File
@@ -4,8 +4,9 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type DNSRecordOptions struct {
cmd/climc/shell/domains.go
+3 -2
View File
@@ -4,8 +4,9 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/email_config.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/endpoints.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/events.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type BaseEventListOptions struct {
cmd/climc/shell/groups.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/hostcachedimages.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/hosts.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/hoststorages.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/hostwires.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/images.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type ImageOptionalOptions struct {
cmd/climc/shell/instances.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/isolatedevices.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/keypairs.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"io/ioutil"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/keystoneutils.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func getUserId(s *mcclient.ClientSession, user string, domain string) (string, error) {
cmd/climc/shell/labels.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/metric_types.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/metrics.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/monitor_metrics.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/monitor_types.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/monitorinputs.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/monitortemplates.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/networks.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/nodes.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/notification.go
+2 -2
View File
@@ -3,8 +3,8 @@ package shell
import (
//"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/operations.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/performances.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/processes.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/processlogs.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/project_admin.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/project_admin_candidates.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/projects.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/quotas.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type QuotaBaseOptions struct {
cmd/climc/shell/rates.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/recipient.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/regions.go
+2 -2
View File
@@ -3,8 +3,8 @@ package shell
import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/reservedips.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/resource_details.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/resource_fees.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/role_assignments.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/roles.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/schedtaghosts.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/schedtags.go
+2 -2
View File
@@ -3,8 +3,8 @@ package shell
import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/schedulers.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/secgrouprules.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/secgroups.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/serverdisks.go
+2 -2
View File
@@ -3,8 +3,8 @@ package shell
import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/serverisolatedevices.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/servernetworks.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/servers.go
+2 -2
View File
@@ -6,8 +6,8 @@ import (
"strings"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type ServerDeployInfo struct {
cmd/climc/shell/service_hosts.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/service_name_suggestions.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/services.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/servicetrees.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/sms_configs.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/specs.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/storagecachedimages.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/storagecaches.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/storages.go
+2 -2
View File
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/tasks.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/tenants.go
+2 -2
View File
@@ -1,8 +1,8 @@
package shell
import (
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/treenodes.go
+2 -2
View File
@@ -5,8 +5,8 @@ import (
"strconv"
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/usages.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
type GeneralUsageOptions struct {
cmd/climc/shell/users.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/utils.go
+3 -2
View File
@@ -2,8 +2,9 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/pkg/util/printjson"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
"github.com/yunionio/onecloud/pkg/util/printjson"
)
func printList(list *modules.ListResult, columns []string) {
cmd/climc/shell/vcenters.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/verification.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/version.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"fmt"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/vncproxy.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/vpcs.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/wires.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/climc/shell/zones.go
+2 -2
View File
@@ -2,8 +2,8 @@ package shell
import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/mcclient"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/onecloud/pkg/mcclient"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
)
func init() {
cmd/scheduler/app/server.go
+5 -5
View File
@@ -8,18 +8,18 @@ import (
"net/http"
"strconv"
"github.com/yunionio/log"
"github.com/yunionio/pkg/util/prometheus"
"github.com/yunionio/pkg/utils"
"gopkg.in/gin-gonic/gin.v1"
"github.com/yunionio/log"
"github.com/yunionio/mcclient/auth"
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/pkg/util/gin/middleware"
"github.com/yunionio/pkg/util/prometheus"
"github.com/yunionio/pkg/utils"
"github.com/yunionio/onecloud/pkg/util/gin/middleware"
)
type SchedulerServer struct {
vendor/github.com/yunionio/pkg/appctx/appctx.go → pkg/appctx/appctx.go
View File
vendor/github.com/yunionio/pkg/appctx/context.go → pkg/appctx/context.go
View File
vendor/github.com/yunionio/pkg/appsrv/appsrv.go → pkg/appsrv/appsrv.go
+2 -2
View File
@@ -10,8 +10,8 @@ import (
"time"
"github.com/yunionio/log"
"github.com/yunionio/pkg/appctx"
"github.com/yunionio/pkg/proxy"
"github.com/yunionio/onecloud/pkg/appctx"
"github.com/yunionio/onecloud/pkg/proxy"
"github.com/yunionio/pkg/trace"
"github.com/yunionio/pkg/utils"
)
pkg/appsrv/appsrv_test.go
+23
View File
@@ -0,0 +1,23 @@
package appsrv
import (
"testing"
)
func TestSplitPath(t *testing.T) {
cases := []struct {
in string
out int
}{
{in: "/v2.0/tokens/123", out: 3},
{in: "/v2.0//tokens//123", out: 3},
{in: "/", out: 0},
{in: "/v2.0//123//", out: 2},
}
for _, p := range cases {
ret := SplitPath(p.in)
if len(ret) != p.out {
t.Error("Split error for ", p.in, " out ", ret)
}
}
}
vendor/github.com/yunionio/pkg/appsrv/cache.go → pkg/appsrv/cache.go
View File
pkg/appsrv/cache_test.go
+24
View File
@@ -0,0 +1,24 @@
package appsrv
import (
"testing"
)
func TestCache(t *testing.T) {
c := NewCache(1024)
c.Set("123", 123)
c.Set("456", 456)
v := c.Get("123")
if v == nil || v.(int) != 123 {
t.Error("Key 123 not found")
}
v = c.Get("456")
if v == nil || v.(int) != 456 {
t.Error("Key 456 not found")
}
c.Set("456", 789)
v = c.Get("456")
if v == nil || v.(int) != 789 {
t.Error("Key 456 not changed")
}
}
vendor/github.com/yunionio/pkg/appsrv/context.go → pkg/appsrv/context.go
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"context"
"database/sql"
"github.com/yunionio/pkg/appctx"
"github.com/yunionio/onecloud/pkg/appctx"
)
func AppContextDB(ctx context.Context) *sql.DB {
vendor/github.com/yunionio/pkg/appsrv/cors.go → pkg/appsrv/cors.go
View File
vendor/github.com/yunionio/pkg/appsrv/dispatcher/dispatcher.go → pkg/appsrv/dispatcher/dispatcher.go
+4 -4
View File
@@ -7,10 +7,10 @@ import (
"github.com/yunionio/jsonutils"
"github.com/yunionio/log"
"github.com/yunionio/mcclient/modules"
"github.com/yunionio/pkg/appctx"
"github.com/yunionio/pkg/appsrv"
"github.com/yunionio/pkg/httperrors"
"github.com/yunionio/onecloud/pkg/mcclient/modules"
"github.com/yunionio/onecloud/pkg/appctx"
"github.com/yunionio/onecloud/pkg/appsrv"
"github.com/yunionio/onecloud/pkg/httperrors"
)
func AddModelDispatcher(prefix string, app *appsrv.Application, manager IModelDispatchHandler) {

Some files were not shown because too many files have changed in this diff Show More