Skip to content

Commit

Permalink
VolumeGet implementation for VMware FCD (#339)
Browse files Browse the repository at this point in the history
* VolumeGet implementation

* Set fields to default values

* Update the doc string

* Fix the import order

* Add error check

* Address review comments
  • Loading branch information
Hakan Memisoglu authored and mergify[bot] committed Oct 9, 2019
1 parent 6911c75 commit 3baeb82
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1 deletion.
37 changes: 37 additions & 0 deletions pkg/blockstorage/vmware/conversion.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package vmware

import (
"github.com/vmware/govmomi/vim25/types"

"github.com/kanisterio/kanister/pkg/blockstorage"
)

func convertFromObjectToVolume(vso *types.VStorageObject) *blockstorage.Volume {
return &blockstorage.Volume{
Type: blockstorage.TypeFCD,
ID: vso.Config.Id.Id,
CreationTime: blockstorage.TimeStamp(vso.Config.CreateTime),
Size: vso.Config.CapacityInMB / 1024,
Az: "",
Iops: 0,
Encrypted: false,
VolumeType: "",
Tags: blockstorage.VolumeTags{},
Attributes: map[string]string{},
}
}

// vimID wraps ID string with vim25.ID struct.
func vimID(id string) types.ID {
return types.ID{
Id: id,
}
}

func convertKeyValueToTags(kvs []types.KeyValue) []*blockstorage.KeyValue {
tags := make(map[string]string)
for _, kv := range kvs {
tags[kv.Key] = kv.Value
}
return blockstorage.MapToKeyValue(tags)
}
12 changes: 11 additions & 1 deletion pkg/blockstorage/vmware/vmware.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,17 @@ func (p *fcdProvider) VolumeDelete(ctx context.Context, volume *blockstorage.Vol
}

func (p *fcdProvider) VolumeGet(ctx context.Context, id string, zone string) (*blockstorage.Volume, error) {
return nil, errors.New("Not implemented")
obj, err := p.gom.Retrieve(ctx, vimID(id))
if err != nil {
return nil, errors.Wrap(err, "Failed to query the disk")
}
kvs, err := p.gom.RetrieveMetadata(ctx, vimID(id), nil, "")
if err != nil {
return nil, errors.Wrap(err, "Failed to get volume metadata")
}
vol := convertFromObjectToVolume(obj)
vol.Tags = convertKeyValueToTags(kvs)
return vol, nil
}

func (p *fcdProvider) SnapshotCopy(ctx context.Context, from blockstorage.Snapshot, to blockstorage.Snapshot) (*blockstorage.Snapshot, error) {
Expand Down

0 comments on commit 3baeb82

Please sign in to comment.