Fix issue IBM-Cloud#1450

VaishnaviGopal · Jun 2, 2020 · 5b5afae · 5b5afae
1 parent 94d032a
commit 5b5afae
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 0 deletions.
diff --git a/go.sum b/go.sum
@@ -58,6 +58,8 @@ github.com/IBM-Cloud/power-go-client v1.0.0 h1:iy7ElG6CmCYOeRal07JMGtIvby0qOKBPP
 github.com/IBM-Cloud/power-go-client v1.0.0/go.mod h1:+mOxjyLeLIloR4EMHTpiDbN+FilZpiVHTwu5eqi+cbI=
 github.com/IBM-Cloud/power-go-client v1.0.14 h1:trQkSz3WEjVSnsOCHhW+jTs9zci3T0iOt7htdwilckg=
 github.com/IBM-Cloud/power-go-client v1.0.14/go.mod h1:+mOxjyLeLIloR4EMHTpiDbN+FilZpiVHTwu5eqi+cbI=
+github.com/IBM-Cloud/power-go-client v1.0.24 h1:C3rjKpTnVn63F+0mu66WNmDfJl6CyM/rpq1d7lx4Ahc=
+github.com/IBM-Cloud/power-go-client v1.0.24/go.mod h1:+mOxjyLeLIloR4EMHTpiDbN+FilZpiVHTwu5eqi+cbI=
 github.com/IBM/apigateway-go-sdk v0.0.0-20200319174228-a4e4a3b46d9e h1:LiWEe8x+iAktPSEiJ4HNhOqrvLZvpicgGnGIi8QuEfI=
 github.com/IBM/apigateway-go-sdk v0.0.0-20200319174228-a4e4a3b46d9e/go.mod h1:sNVpGpUv3jvA2dQbRPFjVrRFNdmnQrf2QTtKa/c2XrI=
 github.com/IBM/apigateway-go-sdk v0.0.0-20200414212859-416e5948678a h1:lX3vP+9Y5gTP0w6l+4oL0mvNfgXZYJsMdlsiUG43GBw=

diff --git a/ibm/data_source_ibm_is_vpc.go b/ibm/data_source_ibm_is_vpc.go
@@ -125,6 +125,12 @@ func dataSourceIBMISVPC() *schema.Resource {
 							Description: "subnet status",
 						},
 
+						"zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "subnet location",
+						},
+
 						totalIPV4AddressCount: {
 							Type:        schema.TypeInt,
 							Computed:    true,
@@ -237,6 +243,7 @@ func classicVpcGetByName(d *schema.ResourceData, meta interface{}, name string)
 							"name":                    *subnet.Name,
 							"id":                      *subnet.ID,
 							"status":                  *subnet.Status,
+							"zone":                    *subnet.Zone.Name,
 							totalIPV4AddressCount:     *subnet.TotalIpv4AddressCount,
 							availableIPV4AddressCount: *subnet.AvailableIpv4AddressCount,
 						}
@@ -323,6 +330,7 @@ func vpcGetByName(d *schema.ResourceData, meta interface{}, name string) error {
 							"name":                    *subnet.Name,
 							"id":                      *subnet.ID,
 							"status":                  *subnet.Status,
+							"zone":                    *subnet.Zone.Name,
 							totalIPV4AddressCount:     *subnet.TotalIpv4AddressCount,
 							availableIPV4AddressCount: *subnet.AvailableIpv4AddressCount,
 						}

diff --git a/ibm/resource_ibm_is_vpc.go b/ibm/resource_ibm_is_vpc.go
@@ -206,6 +206,12 @@ func resourceIBMISVPC() *schema.Resource {
 							Description: "subnet status",
 						},
 
+						"zone": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "subnet location",
+						},
+
 						totalIPV4AddressCount: {
 							Type:        schema.TypeInt,
 							Computed:    true,
@@ -528,6 +534,7 @@ func classicVpcGet(d *schema.ResourceData, meta interface{}, id string) error {
 					"name":                    *subnet.Name,
 					"id":                      *subnet.ID,
 					"status":                  *subnet.Status,
+					"zone":                    *subnet.Zone.Name,
 					totalIPV4AddressCount:     *subnet.TotalIpv4AddressCount,
 					availableIPV4AddressCount: *subnet.AvailableIpv4AddressCount,
 				}
@@ -623,6 +630,7 @@ func vpcGet(d *schema.ResourceData, meta interface{}, id string) error {
 					"name":                    *subnet.Name,
 					"id":                      *subnet.ID,
 					"status":                  *subnet.Status,
+					"zone":                    *subnet.Zone.Name,
 					totalIPV4AddressCount:     *subnet.TotalIpv4AddressCount,
 					availableIPV4AddressCount: *subnet.AvailableIpv4AddressCount,
 				}

diff --git a/website/docs/d/is_vpc.html.markdown b/website/docs/d/is_vpc.html.markdown
@@ -48,5 +48,6 @@ The following attributes are exported:
   * `name` - Name of the subnet.
   * `id` - ID of the subnet.
   * `status` -  Status of the subnet.
+  * `zone` -  Zone of the subnet.
   * `total_ipv4_address_count` - Total IPv4 addresses under the subnet.
   * `available_ipv4_address_count` - Available IPv4 addresses available for the usage in the subnet.
diff --git a/website/docs/r/is_vpc.html.markdown b/website/docs/r/is_vpc.html.markdown
@@ -58,6 +58,7 @@ The following attributes are exported:
   * `name` - Name of the subnet.
   * `id` - ID of the subnet.
   * `status` -  Status of the subnet.
+  * `zone` -  Zone of the subnet.
   * `total_ipv4_address_count` - Total IPv4 addresses under the subnet.
   * `available_ipv4_address_count` - Available IPv4 addresses available for the usage in the subnet.