opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #885 in YUNIONIO/onecloud from ~NINGYU/onecloud:release/ningyu-node-discovery to release/2.5.0

Browse Source 
* commit 'fb65aa6a3c4d4494b65f69cc43634107672d9410':
  feat: 添加机器时，可以指定机器是宿主机，还是虚拟机
This commit is contained in:
邱剑
2019-01-04 23:09:02 +08:00
parent e0dcb033bb fb65aa6a3c
commit 16a7306746
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/nodes.go
+4 -3
View File
@@ -161,11 +161,12 @@ func init() {
})
type NodeCreateOptions struct {
NAME string `help:"Node name"`
IP string `help:"Node IP"`
NAME string `help:"Node name"`
IP string `help:"Node IP"`
ResType string `help:"Resource type" choices:"host|guest"`
}
R(&NodeCreateOptions{}, "node-create", "Create a monitor node record", func(s *mcclient.ClientSession, args *NodeCreateOptions) error {
data, err := modules.Nodes.NewNode(s, args.NAME, args.IP)
data, err := modules.Nodes.NewNode(s, args.NAME, args.IP, args.ResType)
if err != nil {
return err
}
pkg/mcclient/modules/mod_nodes.go
+4 -1
View File
@@ -58,10 +58,13 @@ func (this *NodeManager) BatchPerformActionInContexts(s *mcclient.ClientSession,
}
}
func (this *NodeManager) NewNode(s *mcclient.ClientSession, name string, ip string) (jsonutils.JSONObject, error) {
func (this *NodeManager) NewNode(s *mcclient.ClientSession, name string, ip string, res_type string) (jsonutils.JSONObject, error) {
data := jsonutils.NewDict()
data.Add(jsonutils.NewString(name), "name")
data.Add(jsonutils.NewString(ip), "ip")
if len(res_type) > 0 {
data.Add(jsonutils.NewString(res_type), "res_type")
}
arr := jsonutils.NewArray()
arr.Add(data)
params := jsonutils.NewDict()