feature: reorganize climc codes

cmd/climc/climc.go → cmd/climc/entry/climc.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package main
+package entry
 
 import (
 	"context"
@@ -32,10 +32,6 @@ import (
 
 	"yunion.io/x/onecloud/cmd/climc/promputils"
 	"yunion.io/x/onecloud/cmd/climc/shell"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
-	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
 	"yunion.io/x/onecloud/pkg/mcclient"
 )
 
@@ -270,7 +266,7 @@ func executeSubcommand(
 	}
 }
 
-func main() {
+func ClimcMain() {
 	parser, e := getSubcommandsParser()
 	if e != nil {
 		showErrorAndExit(e)

cmd/climc/entry/doc.go

@@ -0,0 +1,15 @@
+// Copyright 2019 Yunion
+//
+// 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.
+
+package entry // import "yunion.io/x/onecloud/cmd/climc/entry"

cmd/climc/main.go

@@ -0,0 +1,27 @@
+package main
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/entry"
+	_ "yunion.io/x/onecloud/cmd/climc/shell"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/ansible"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudevent"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/cloudnet"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/compute"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/etcd"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/events"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/identity"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/image"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/itsm"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/k8s"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/logger"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/meter"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/misc"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/monitor"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/notify"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/servicetree"
+	_ "yunion.io/x/onecloud/cmd/climc/shell/yunionconf"
+)
+
+func main() {
+	entry.ClimcMain()
+}

cmd/climc/shell/ansible.go → cmd/climc/shell/ansible/ansible.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/ansibleplaybooks.go → cmd/climc/shell/ansible/ansibleplaybooks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/ansibleplaybooks_v2.go → cmd/climc/shell/ansible/ansibleplaybooks_v2.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/ansible/common.go

@@ -0,0 +1,32 @@
+// Copyright 2019 Yunion
+//
+// 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.
+
+package ansible
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+
+	InvalidUpdateError   = shell.InvalidUpdateError
+	printObjectRecursive = printutils.PrintJSONObjectRecursive
+
+	exportList = shell.ExportList
+)

cmd/climc/shell/devtoolcronjob.go → cmd/climc/shell/ansible/devtoolcronjob.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"fmt"

cmd/climc/shell/devtooltemplate.go → cmd/climc/shell/ansible/devtooltemplate.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package ansible
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/cloudevents.go → cmd/climc/shell/cloudevent/cloudevents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package cloudevent
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/cloudmeta.go → cmd/climc/shell/cloudevent/common.go

@@ -12,19 +12,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package cloudevent
 
 import (
-	"yunion.io/x/onecloud/pkg/mcclient"
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
 )
 
-func init() {
-	type CloudmetaOptions struct {
-		PROVIDER_ID string `help:"provider_id"`
-		REGION_ID   string `help:"region_id"`
-		ZONE_ID     string `help:"zone_id"`
-	}
-	R(&CloudmetaOptions{}, "instance-type-list", "query backend service for its version", func(s *mcclient.ClientSession, args *CloudmetaOptions) error {
-		return nil
-	})
-}
+var (
+	R         = shell.R
+	printList = printutils.PrintJSONList
+)

cmd/climc/shell/baremetalagents.go → cmd/climc/shell/compute/baremetalagents.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/baremetalnetworks.go → cmd/climc/shell/compute/baremetalnetworks.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/baremetalstorages.go → cmd/climc/shell/compute/baremetalstorages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/buckets.go → cmd/climc/shell/compute/buckets.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"
@@ -26,7 +26,7 @@ import (
 	"yunion.io/x/onecloud/pkg/mcclient/modulebase"
 	"yunion.io/x/onecloud/pkg/mcclient/modules"
 	"yunion.io/x/onecloud/pkg/mcclient/options"
-	objectshell "yunion.io/x/onecloud/pkg/multicloud/objectstore"
+	"yunion.io/x/onecloud/pkg/multicloud/objectstore"
 )
 
 func init() {
@@ -188,7 +188,7 @@ func init() {
 		StorageClass  string `help:"storage CLass"`
 		Acl           string `help:"object acl." choices:"private|public-read|public-read-write"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketUploadObjectsOptions{}, "bucket-object-upload", "Upload an object into a bucket", func(s *mcclient.ClientSession, args *BucketUploadObjectsOptions) error {
 		var body io.Reader
@@ -325,7 +325,7 @@ func init() {
 
 		Key []string `help:"Optional object key" json:"key"`
 
-		objectshell.ObjectHeaderOptions
+		objectstore.ObjectHeaderOptions
 	}
 	R(&BucketSetMetadataOptions{}, "bucket-set-metadata", "Set metadata of object", func(s *mcclient.ClientSession, args *BucketSetMetadataOptions) error {
 		input := api.BucketMetadataInput{}

cmd/climc/shell/cachedimages.go → cmd/climc/shell/compute/cachedimages.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/capabilities.go → cmd/climc/shell/compute/capabilities.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/cloudaccounts.go → cmd/climc/shell/compute/cloudaccounts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/cloudprovider_quota.go → cmd/climc/shell/compute/cloudprovider_quota.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/cloudproviderregions.go → cmd/climc/shell/compute/cloudproviderregions.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/cloudproviders.go → cmd/climc/shell/compute/cloudproviders.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/cloudregions.go → cmd/climc/shell/compute/cloudregions.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"

cmd/climc/shell/compute/common.go

@@ -0,0 +1,34 @@
+// Copyright 2019 Yunion
+//
+// 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.
+
+package compute
+
+import (
+	"yunion.io/x/onecloud/cmd/climc/shell"
+	"yunion.io/x/onecloud/pkg/util/printutils"
+)
+
+var (
+	R                 = shell.R
+	printList         = printutils.PrintJSONList
+	printObject       = printutils.PrintJSONObject
+	printBatchResults = printutils.PrintJSONBatchResults
+
+	InvalidUpdateError   = shell.InvalidUpdateError
+	printObjectRecursive = printutils.PrintJSONObjectRecursive
+
+	exportList = shell.ExportList
+
+	printObjectRecursiveEx = printutils.PrintJSONObjectRecursiveEx
+)

cmd/climc/shell/dbinstance_accounts.go → cmd/climc/shell/compute/dbinstance_accounts.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/dbinstance_backups.go → cmd/climc/shell/compute/dbinstance_backups.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/jsonutils"

cmd/climc/shell/dbinstance_databases.go → cmd/climc/shell/compute/dbinstance_databases.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/dbinstance_skus.go → cmd/climc/shell/compute/dbinstance_skus.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"yunion.io/x/onecloud/pkg/mcclient"

cmd/climc/shell/dbinstances.go → cmd/climc/shell/compute/dbinstances.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package shell
+package compute
 
 import (
 	"fmt"