From ec9ca59aa195238b0fcc7d4623cc556cae05e41c Mon Sep 17 00:00:00 2001
From: Qiu Jian <qiujian@yunionyun.com>
Date: Thu, 25 Oct 2018 23:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=9B=E5=BB=BAhost?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E6=8C=87=E5=AE=9Azone?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cmd/climc/shell/hosts.go          | 3 +--
 cmd/climc/shell/serverdisks.go    | 3 +++
 cmd/climc/shell/servernetworks.go | 2 ++
 pkg/mcclient/options/base.go      | 3 +++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/cmd/climc/shell/hosts.go b/cmd/climc/shell/hosts.go
index 5644f29465..0831e7d44f 100644
--- a/cmd/climc/shell/hosts.go
+++ b/cmd/climc/shell/hosts.go
@@ -475,7 +475,6 @@ func init() {
 	})
 
 	type HostCreateOptions struct {
-		ZONE       string `help:"Zone where the host is located"`
 		NAME       string `help:"Name of baremetal"`
 		MAC        string `help:"Default MAC address of baremetal"`
 		Rack       string `help:"Rack number of baremetal"`
@@ -500,7 +499,7 @@ func init() {
 		if len(args.IpmiAddr) > 0 {
 			params.Add(jsonutils.NewString(args.IpmiAddr), "ipmi_ip_addr")
 		}
-		result, err := modules.Hosts.CreateInContext(s, params, &modules.Zones, args.ZONE)
+		result, err := modules.Hosts.Create(s, params)
 		if err != nil {
 			return err
 		}
diff --git a/cmd/climc/shell/serverdisks.go b/cmd/climc/shell/serverdisks.go
index 98186a768d..ef21ad8619 100644
--- a/cmd/climc/shell/serverdisks.go
+++ b/cmd/climc/shell/serverdisks.go
@@ -12,6 +12,7 @@ func init() {
 	type ServerDiskListOptions struct {
 		options.BaseListOptions
 		Server string `help:"ID or Name of Server"`
+		Disk   string `help:"ID or Name of Disk"`
 	}
 	R(&ServerDiskListOptions{}, "server-disk-list", "List server disk pairs", func(s *mcclient.ClientSession, args *ServerDiskListOptions) error {
 		var params *jsonutils.JSONDict
@@ -27,6 +28,8 @@ func init() {
 		var err error
 		if len(args.Server) > 0 {
 			result, err = modules.Serverdisks.ListDescendent(s, args.Server, params)
+		} else if len(args.Disk) > 0 {
+			result, err = modules.Serverdisks.ListDescendent2(s, args.Disk, params)
 		} else {
 			result, err = modules.Serverdisks.List(s, params)
 		}
diff --git a/cmd/climc/shell/servernetworks.go b/cmd/climc/shell/servernetworks.go
index 2674d48e2b..c9bb5a0123 100644
--- a/cmd/climc/shell/servernetworks.go
+++ b/cmd/climc/shell/servernetworks.go
@@ -38,6 +38,8 @@ func init() {
 		var err error
 		if len(args.Server) > 0 {
 			result, err = modules.Servernetworks.ListDescendent(s, args.Server, params)
+		} else if len(args.Network) > 0 {
+			result, err = modules.Servernetworks.ListDescendent2(s, args.Network, params)
 		} else {
 			result, err = modules.Servernetworks.List(s, params)
 		}
diff --git a/pkg/mcclient/options/base.go b/pkg/mcclient/options/base.go
index aeacdce442..fdc8fe1b4c 100644
--- a/pkg/mcclient/options/base.go
+++ b/pkg/mcclient/options/base.go
@@ -175,5 +175,8 @@ func (opts *BaseListOptions) Params() (*jsonutils.JSONDict, error) {
 			params.Set("admin", jsonutils.NewBool(true))
 		}
 	}
+	if opts.Details == nil {
+		params.Set("details", jsonutils.JSONFalse)
+	}
 	return params, nil
 }