解决冲突

This commit is contained in:
屈轩
2019-03-03 14:54:48 +08:00
5 changed files with 38 additions and 22 deletions

View File

@@ -9,11 +9,10 @@ import (
func init() {
type InstanceListOptions struct {
ZoneID string `help:"Zone ID for filter instance list"`
Host string `help:"Host name for filter instance list"`
Host string `help:"Host name for filter instance list"`
}
shellutils.R(&InstanceListOptions{}, "instance-list", "List instances", func(cli *openstack.SRegion, args *InstanceListOptions) error {
instances, err := cli.GetInstances(args.ZoneID, args.Host)
instances, err := cli.GetInstances(args.Host)
if err != nil {
return err
}