rebase master

This commit is contained in:
ioito
2019-05-09 20:57:21 +08:00
parent 746a7d424e
commit ff2cca8611
82 changed files with 2247 additions and 717 deletions

View File

@@ -20,6 +20,23 @@ func init() {
return nil
})
type DiskIdOptions struct {
ID string
}
shellutils.R(&DiskIdOptions{}, "disk-show", "Show disk", func(cli *zstack.SRegion, args *DiskIdOptions) error {
disk, err := cli.GetDisk(args.ID)
if err != nil {
return err
}
printObject(disk)
return nil
})
shellutils.R(&DiskIdOptions{}, "disk-delete", "Delete disk", func(cli *zstack.SRegion, args *DiskIdOptions) error {
return cli.DeleteDisk(args.ID)
})
type DiskCreateOptions struct {
NAME string
Description string
@@ -38,14 +55,6 @@ func init() {
return nil
})
type DiskDelete struct {
ID string
}
shellutils.R(&DiskDelete{}, "disk-delete", "Delete disk", func(cli *zstack.SRegion, args *DiskDelete) error {
return cli.DeleteDisk(args.ID)
})
type DiskResize struct {
ID string
SIZEGB int64