From 1966848820d4665a248edf570656a2b21b60bd27 Mon Sep 17 00:00:00 2001
From: Mark Hamzy <hamzy@us.ibm.com>
Date: Fri, 5 Jan 2024 05:58:47 -0600
Subject: [PATCH] PowerVS: Support newly added regions

There are a bunch of new regions added to PowerVS.
---
 region.go      | 27 ++++++++++++++++++++++++++-
 region_test.go | 30 ++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/region.go b/region.go
index cbef76e..f6ba24c 100644
--- a/region.go
+++ b/region.go
@@ -30,6 +30,10 @@ func GetRegion(zone string) (region string, err error) {
 		region = "osa"
 	case strings.HasPrefix(zone, "mon"):
 		region = "mon"
+	case strings.HasPrefix(zone, "mad"):
+		region = "mad"
+	case strings.HasPrefix(zone, "wdc"):
+		region = "wdc"
 	default:
 		return "", fmt.Errorf("region not found for the zone, talk to the developer to add the support into the tool: %s", zone)
 	}
@@ -70,6 +74,15 @@ var Regions = map[string]Region{
 			"lon06",
 		},
 	},
+	"mad": {
+		Description: "Madrid, Spain",
+		VPCRegion:   "eu-es",
+		COSRegion:   "eu-es",
+		Zones: []string{
+			"mad02",
+			"mad04",
+		},
+	},
 	"mon": {
 		Description: "Montreal, Canada",
 		VPCRegion:   "ca-tor",
@@ -95,7 +108,10 @@ var Regions = map[string]Region{
 		Description: "São Paulo, Brazil",
 		VPCRegion:   "br-sao",
 		COSRegion:   "br-sao",
-		Zones:       []string{"sao01"},
+		Zones:       []string{
+			"sao01",
+			"sao04",
+		},
 	},
 	"tok": {
 		Description: "Tokyo, Japan",
@@ -109,6 +125,15 @@ var Regions = map[string]Region{
 		COSRegion:   "us-east",
 		Zones:       []string{"us-east"},
 	},
+	"wdc": {
+		Description: "Washington DC, USA",
+		VPCRegion:   "us-east",
+		COSRegion:   "us-east",
+		Zones: []string{
+			"wdc06",
+			"wdc07",
+		},
+	},
 }
 
 // VPCRegionForPowerVSRegion returns the VPC region for the specified PowerVS region.
diff --git a/region_test.go b/region_test.go
index 71b1fc8..8bc8a3b 100644
--- a/region_test.go
+++ b/region_test.go
@@ -38,12 +38,30 @@ func TestGetRegion(t *testing.T) {
 			"sao",
 			false,
 		},
+		{
+			"Sao Paulo 04",
+			args{"sao04"},
+			"sao",
+			false,
+		},
 		{
 			"Washington DC",
 			args{"us-east"},
 			"us-east",
 			false,
 		},
+		{
+			"Washington DC 06",
+			args{"wdc06"},
+			"wdc",
+			false,
+		},
+		{
+			"Washington DC 07",
+			args{"wdc07"},
+			"wdc",
+			false,
+		},
 		{
 			"Toronto",
 			args{"tor01"},
@@ -86,6 +104,18 @@ func TestGetRegion(t *testing.T) {
 			"osa",
 			false,
 		},
+		{
+			"Madrid 02",
+			args{"mad02"},
+			"mad",
+			false,
+		},
+		{
+			"Madrid 04",
+			args{"mad04"},
+			"mad",
+			false,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {