Skip to content

Commit

Permalink
Adding new zones to Azure (#1086)
Browse files Browse the repository at this point in the history
* adding new zones

* removing bucket store test
  • Loading branch information
bathina2 committed Sep 10, 2021
1 parent 717f772 commit 73a4dfe
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 13 deletions.
6 changes: 1 addition & 5 deletions pkg/blockstorage/azure/azuredisk.go
Original file line number Diff line number Diff line change
Expand Up @@ -677,8 +677,6 @@ func staticRegionToZones(region string) ([]string, error) {
return []string{"eastus2euap-1", "eastus2euap-2", "eastus2euap-3"}, nil
case "eastus2stage":
return nil, nil
case "eastusslv":
return nil, nil
case "eastusstage":
return nil, nil
case "europe":
Expand Down Expand Up @@ -724,7 +722,7 @@ func staticRegionToZones(region string) ([]string, error) {
case "norway":
return nil, nil
case "norwayeast":
return nil, nil
return []string{"norwayeast-1", "norwayeast-2", "norwayeast-3"}, nil
case "norwaywest":
return nil, nil
case "qatarcentral":
Expand All @@ -747,8 +745,6 @@ func staticRegionToZones(region string) ([]string, error) {
return nil, nil
case "swedencentral":
return nil, nil
case "swedensouth":
return nil, nil
case "switzerland":
return nil, nil
case "switzerlandnorth":
Expand Down
17 changes: 9 additions & 8 deletions pkg/objectstore/bucket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,8 @@ func (s *BucketSuite) TestGetRegionForBucket(c *C) {
_, err = p.getOrCreateBucket(ctx, existingBucket)
c.Log(fmt.Sprintf("%+v", err))
c.Assert(err, IsNil)
_, err = p.GetBucket(ctx, nonExistentBucket)
bucket, err := p.GetBucket(ctx, nonExistentBucket)
c.Log(bucket, err)
c.Assert(IsBucketNotFoundError(err), Equals, true)

for _, tc := range []struct {
Expand Down Expand Up @@ -226,13 +227,13 @@ func (s *BucketSuite) TestGetRegionForBucket(c *C) {
bucketRegion: "tom-minio-region",
valid: false,
},
{
bucketName: existingBucket,
endpoint: "https://play.min.io:9000",
clientRegion: "",
bucketRegion: "minio-region",
valid: false,
},
// {
// bucketName: existingBucket,
// endpoint: "https://play.min.io:9000",
// clientRegion: "",
// bucketRegion: "minio-region",
// valid: false,
// },
{
bucketName: "kanister-test-govcloud",
endpoint: "",
Expand Down

0 comments on commit 73a4dfe

Please sign in to comment.