-
Notifications
You must be signed in to change notification settings - Fork 911
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3539 from dougm/disk-attach
Add support for using storage profiles when creating and attaching VirtualDisks
- Loading branch information
Showing
18 changed files
with
541 additions
and
81 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| /* | ||
| Copyright (c) 2024-2024 VMware, Inc. All Rights Reserved. | ||
| 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 disk | ||
|
|
||
| import ( | ||
| "context" | ||
| "flag" | ||
|
|
||
| "github.com/vmware/govmomi/govc/cli" | ||
| "github.com/vmware/govmomi/govc/flags" | ||
| "github.com/vmware/govmomi/vim25/mo" | ||
| ) | ||
|
|
||
| type attach struct { | ||
| *flags.VirtualMachineFlag | ||
| *flags.DatastoreFlag | ||
| } | ||
|
|
||
| func init() { | ||
| cli.Register("disk.attach", &attach{}) | ||
| } | ||
|
|
||
| func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) { | ||
| cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx) | ||
| cmd.VirtualMachineFlag.Register(ctx, f) | ||
| cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx) | ||
| cmd.DatastoreFlag.Register(ctx, f) | ||
| } | ||
|
|
||
| func (cmd *attach) Process(ctx context.Context) error { | ||
| if err := cmd.VirtualMachineFlag.Process(ctx); err != nil { | ||
| return err | ||
| } | ||
| return cmd.DatastoreFlag.Process(ctx) | ||
| } | ||
|
|
||
| func (cmd *attach) Usage() string { | ||
| return "ID" | ||
| } | ||
|
|
||
| func (cmd *attach) Description() string { | ||
| return `Attach disk ID on VM. | ||
| See also: govc vm.disk.attach | ||
| Examples: | ||
| govc disk.attach -vm $vm ID | ||
| govc disk.attach -vm $vm -ds $ds ID` | ||
| } | ||
|
|
||
| func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error { | ||
| if f.NArg() != 1 { | ||
| return flag.ErrHelp | ||
| } | ||
|
|
||
| ds, err := cmd.DatastoreIfSpecified() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| vm, err := cmd.VirtualMachine() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if ds == nil { | ||
| var props mo.VirtualMachine | ||
| err = vm.Properties(ctx, vm.Reference(), []string{"datastore"}, &props) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if len(props.Datastore) != 1 { | ||
| ds, err = cmd.Datastore() // likely results in MultipleFoundError | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| id := f.Arg(0) | ||
|
|
||
| return vm.AttachDisk(ctx, id, ds, 0, nil) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| /* | ||
| Copyright (c) 2024-2024 VMware, Inc. All Rights Reserved. | ||
| 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 disk | ||
|
|
||
| import ( | ||
| "context" | ||
| "flag" | ||
|
|
||
| "github.com/vmware/govmomi/govc/cli" | ||
| "github.com/vmware/govmomi/govc/flags" | ||
| ) | ||
|
|
||
| type detach struct { | ||
| *flags.VirtualMachineFlag | ||
| } | ||
|
|
||
| func init() { | ||
| cli.Register("disk.detach", &detach{}) | ||
| } | ||
|
|
||
| func (cmd *detach) Register(ctx context.Context, f *flag.FlagSet) { | ||
| cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx) | ||
| cmd.VirtualMachineFlag.Register(ctx, f) | ||
| } | ||
|
|
||
| func (cmd *detach) Usage() string { | ||
| return "ID" | ||
| } | ||
|
|
||
| func (cmd *detach) Description() string { | ||
| return `Detach disk ID from VM. | ||
| See also: govc device.remove | ||
| Examples: | ||
| govc disk.detach -vm $vm ID` | ||
| } | ||
|
|
||
| func (cmd *detach) Run(ctx context.Context, f *flag.FlagSet) error { | ||
| if f.NArg() != 1 { | ||
| return flag.ErrHelp | ||
| } | ||
|
|
||
| vm, err := cmd.VirtualMachine() | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| id := f.Arg(0) | ||
|
|
||
| return vm.DetachDisk(ctx, id) | ||
| } |
Oops, something went wrong.