Update VolumeList() func to include zone (#4755)

kanisterio · Jan 16, 2019 · 27efe42 · 27efe42
1 parent c1f5a5a
commit 27efe42
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/pkg/blockstorage/awsebs/awsebs.go b/pkg/blockstorage/awsebs/awsebs.go
@@ -155,7 +155,7 @@ func (s *ebsStorage) volumeParse(ctx context.Context, volume interface{}) *block
 	}
 }
 
-func (s *ebsStorage) VolumesList(ctx context.Context, tags map[string]string) ([]*blockstorage.Volume, error) {
+func (s *ebsStorage) VolumesList(ctx context.Context, tags map[string]string, zone string) ([]*blockstorage.Volume, error) {
 	var vols []*blockstorage.Volume
 	var fltrs []*ec2.Filter
 	dvi := &ec2.DescribeVolumesInput{}

diff --git a/pkg/blockstorage/blockstorage.go b/pkg/blockstorage/blockstorage.go
@@ -21,6 +21,6 @@ type Provider interface {
 	SnapshotGet(ctx context.Context, id string) (*Snapshot, error)
 	// Others
 	SetTags(ctx context.Context, resource interface{}, tags map[string]string) error
-	VolumesList(ctx context.Context, tags map[string]string) ([]*Volume, error)
+	VolumesList(ctx context.Context, tags map[string]string, zone string) ([]*Volume, error)
 	SnapshotsList(ctx context.Context, tags map[string]string) ([]*Snapshot, error)
 }
diff --git a/pkg/blockstorage/blockstorage_test.go b/pkg/blockstorage/blockstorage_test.go
@@ -172,12 +172,21 @@ func (s *BlockStorageProviderSuite) TestSnapshotCopy(c *C) {
 
 func (s *BlockStorageProviderSuite) testVolumesList(c *C) {
 	var tags map[string]string
+	var zone string
 	if s.provider.Type() == blockstorage.TypeGPD {
 		tags = map[string]string{"name": "*"}
 	} else {
 		tags = map[string]string{"status": "available"}
 	}
-	vols, err := s.provider.VolumesList(context.Background(), tags)
+	switch s.storageType {
+	case blockstorage.TypeGPD:
+		zone = "us-west1-b"
+	case blockstorage.TypeEBS:
+		zone = "us-west-2b"
+	case blockstorage.TypeAD:
+		zone = "centralus"
+	}
+	vols, err := s.provider.VolumesList(context.Background(), tags, zone)
 	c.Assert(err, IsNil)
 	c.Assert(vols, NotNil)
 	c.Assert(vols, FitsTypeOf, []*blockstorage.Volume{})

diff --git a/pkg/testutil/mockblockstorage/mockblockstorage.go b/pkg/testutil/mockblockstorage/mockblockstorage.go
@@ -183,7 +183,7 @@ func (p *Provider) MockSnapshot() *blockstorage.Snapshot {
 }
 
 // VolumesList mock
-func (p *Provider) VolumesList(ctx context.Context, tags map[string]string) ([]*blockstorage.Volume, error) {
+func (p *Provider) VolumesList(ctx context.Context, tags map[string]string, zone string) ([]*blockstorage.Volume, error) {
 	return []*blockstorage.Volume{p.MockVolume(), p.MockVolume()}, nil
 }