Merge pull request #14543 from hashicorp/b-opc-ip-addr-res

provider/opc: Correctly export `ip_address` in IP Addr Reservation
hashicorp · May 16, 2017 · e4a50f2 · e4a50f2
2 parents 24aa40a + bc1a6b0
commit e4a50f2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/builtin/providers/opc/resource_ip_address_reservation.go b/builtin/providers/opc/resource_ip_address_reservation.go
@@ -92,6 +92,7 @@ func resourceOPCIPAddressReservationRead(d *schema.ResourceData, meta interface{
 	d.Set("name", result.Name)
 	d.Set("description", result.Description)
 	d.Set("ip_address_pool", result.IPAddressPool)
+	d.Set("ip_address", result.IPAddress)
 	d.Set("uri", result.Uri)
 
 	if err := setStringList(d, "tags", result.Tags); err != nil {

diff --git a/builtin/providers/opc/resource_ip_address_reservation_test.go b/builtin/providers/opc/resource_ip_address_reservation_test.go
@@ -24,6 +24,7 @@ func TestAccOPCIPAddressReservation_Basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccOPCCheckIPAddressReservationExists,
 					resource.TestCheckResourceAttr(resName, "name", fmt.Sprintf("testing-ip-address-reservation-%d", rInt)),
+					resource.TestCheckResourceAttrSet(resName, "ip_address"),
 				),
 			},
 		},

diff --git a/...te/source/docs/providers/opc/r/opc_compute_ip_address_reservation.html.markdown b/...te/source/docs/providers/opc/r/opc_compute_ip_address_reservation.html.markdown
@@ -25,7 +25,7 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the ip address reservation.
 
-* `ip_address_pool` - (Required) The IP address pool from which you want to reserve an IP address.
+* `ip_address_pool` - (Required) The IP address pool from which you want to reserve an IP address. Must be either `public-ippool` or `cloud-ippool`.
 
 * `description` - (Optional) A description of the ip address reservation.