Block volume supports size in gigabytes (#289)

codycushing · web-flow · commit 0b4e7bee7588 · 2017-10-09T14:19:07.000-07:00
* Block volume supports size in gigabytes
* Adds block volume example
* Remove size param where not required in tests
* Update vendor manifest
diff --git a/data_source_obmcs_core_volume.go b/data_source_obmcs_core_volume.go
@@ -95,6 +95,7 @@ func (s *VolumeDatasourceCrud) SetData() {
 				"display_name":        v.DisplayName,
 				"id":                  v.ID,
 				"size_in_mbs":         v.SizeInMBs,
+				"size_in_gbs":         v.SizeInGBs,
 				"state":               v.State,
 				"time_created":        v.TimeCreated.String(),
 			}
diff --git a/data_source_obmcs_core_volume_attachment_test.go b/data_source_obmcs_core_volume_attachment_test.go
@@ -29,8 +29,7 @@ func (s *DatasourceCoreVolumeAttachmentTestSuite) SetupTest() {
 	resource "oci_core_volume" "t" {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 		compartment_id = "${var.compartment_id}"
-		display_name = "display_name"
-		size_in_mbs = 51200
+		display_name = "-tf-volume"
 	}
 	resource "oci_core_volume_attachment" "t" {
 		attachment_type = "iscsi"
diff --git a/data_source_obmcs_core_volume_backup.go b/data_source_obmcs_core_volume_backup.go
@@ -95,6 +95,7 @@ func (s *VolumeBackupDatasourceCrud) SetData() {
 				"id":                    v.ID,
 				"state":                 v.State,
 				"size_in_mbs":           v.SizeInMBs,
+				"size_in_gbs":           v.SizeInGBs,
 				"time_created":          v.TimeCreated.String(),
 				"time_request_received": v.TimeRequestReceived.String(),
 				"unique_size_in_mbs":    v.UniqueSizeInMBs,
diff --git a/data_source_obmcs_core_volume_backup_test.go b/data_source_obmcs_core_volume_backup_test.go
@@ -33,12 +33,10 @@ func (s *DatasourceCoreVolumeBackupTestSuite) SetupTest() {
 	resource "oci_core_volume" "t" {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 		compartment_id = "${var.compartment_id}"
-		display_name = "display_name"
-		size_in_mbs = 51200
 	}
 	resource "oci_core_volume_backup" "t" {
 		volume_id = "${oci_core_volume.t.id}"
-		display_name = "display_name"
+		display_name = "-tf-volume-backup"
 	}`
 	s.ResourceName = "data.oci_core_volume_backups.t"
 }
@@ -62,8 +60,16 @@ func (s *DatasourceCoreVolumeBackupTestSuite) TestAccDatasourceCoreVolumeBackup_
 				}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_id"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.id"),
 					resource.TestCheckResourceAttr(s.ResourceName, "volume_backups.#", "1"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.volume_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.time_created"),
+					resource.TestCheckResourceAttr(s.ResourceName, "volume_backups.0.display_name", "-tf-volume-backup"),
+					resource.TestCheckResourceAttr(s.ResourceName, "volume_backups.0.state", baremetal.ResourceAvailable),
+					resource.TestCheckResourceAttr(s.ResourceName, "volume_backups.0.size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(s.ResourceName, "volume_backups.0.size_in_gbs", "50"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.unique_size_in_mbs"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volume_backups.0.unique_size_in_gbs"),
 				),
 			},
 		},
diff --git a/data_source_obmcs_core_volume_test.go b/data_source_obmcs_core_volume_test.go
@@ -32,8 +32,8 @@ func (s *DatasourceCoreVolumeTestSuite) SetupTest() {
 	resource "oci_core_volume" "t" {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 		compartment_id = "${var.compartment_id}"
-		display_name = "display_name"
-		size_in_mbs = 262144
+		display_name = "-tf-volume"
+		size_in_gbs = 50
 	}
 	data "oci_core_volumes" "t" {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
diff --git a/docs/datasources/core/volume_backups.md b/docs/datasources/core/volume_backups.md
@@ -31,9 +31,10 @@ The following attributes are exported:
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the Volume backup.
 * `state` - The current state of the volume. [CREATING,AVAILABLE,TERMINATING,TERMINATED,FAULTY,REQUEST_RECEIVED]
-* `size_in_mbs` - The size of the volume, in MBs.
+* `size_in_mbs` - (Deprecated) The size of the volume, in MBs.
+* `size_in_gbs` - The size of the volume, in GBs.
 * `time_created` - The date and time the Volume was created.
 * `time_requested` - The date and time the request to create the volume backup was received.
-* `unique_size_in_mbs` - The size used by the backup, in MBs. It is typically smaller than sizeInMBs, depending on the space consumed on the volume and whether the backup is full or incremental.
+* `unique_size_in_mbs` - (Deprecated) The size used by the backup, in MBs. It is typically smaller than sizeInMBs, depending on the space consumed on the volume and whether the backup is full or incremental.
+* `unique_size_in_gbs` - The size used by the backup, in GBs. It is typically smaller than sizeInGBs, depending on the space consumed on the volume and whether the backup is full or incremental.
 * `volume_id` - The OCID of the Volume.
-
diff --git a/docs/datasources/core/volumes.md b/docs/datasources/core/volumes.md
@@ -32,5 +32,6 @@ The following attributes are exported:
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the Volume.
 * `state` - The current state of the volume. [PROVISIONING,RESTORING,AVAILABLE,TERMINATING,TERMINATED,FAULTY]
-* `size_in_mbs` - The size of the volume, in MBs.
+* `size_in_mbs` - (Deprecated) The size of the volume, in MBs.
+* `size_in_gbs` - The size of the volume, in GBs.
 * `time_created` - The date and time the Volume was created.
diff --git a/docs/examples/compute/instance/block.tf b/docs/examples/compute/instance/block.tf
@@ -2,7 +2,7 @@ resource "oci_core_volume" "TFBlock0" {
   availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.AD - 1],"name")}"
   compartment_id = "${var.compartment_ocid}"
   display_name = "TFBlock0"
-  size_in_mbs = "${var.256GB}"
+  size_in_gbs = "${var.DBSize}"
 }
 
 resource "oci_core_volume_attachment" "TFBlock0Attach" {
diff --git a/docs/examples/compute/instance/variables.tf b/docs/examples/compute/instance/variables.tf
@@ -27,12 +27,8 @@ variable "InstanceOSVersion" {
     default = "7.3"
 }
 
-variable "2TB" {
-    default = "2097152"
-}
-
-variable "256GB" {
-    default = "262144"
+variable "DBSize" {
+    default = "50" // size in GBs
 }
 
 variable "BootStrapFile" {
diff --git a/docs/examples/storage/block/README.md b/docs/examples/storage/block/README.md
diff --git a/docs/examples/storage/block/block.tf b/docs/examples/storage/block/block.tf
@@ -0,0 +1,33 @@
+/*
+ * This example demonstrates how to spin up a block volume
+ *
+ * See docs/examples/compute/instance/ for a real world scenario
+ */
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "region" {}
+
+provider "oci" {
+  tenancy_ocid = "${var.tenancy_ocid}"
+  user_ocid = "${var.user_ocid}"
+  fingerprint = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+  region = "${var.region}"
+}
+
+variable "DBSize" {
+  default = "50" // size in GBs, min: 50, max 16384
+}
+
+data "oci_identity_availability_domains" "ADs" {
+  compartment_id = "${var.tenancy_ocid}"
+}
+
+resource "oci_core_volume" "t" {
+  availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
+  compartment_id = "${var.tenancy_ocid}"
+  display_name = "-tf-volume"
+  size_in_gbs = "${var.DBSize}"
+}
diff --git a/docs/resources/core/volume.md b/docs/resources/core/volume.md
@@ -8,7 +8,7 @@ Gets a list of volumes in a compartment.
 resource "oci_core_volume" "t" {
     availability_domain = "availability_domain"
     compartment_id = "compartment_id"
-    size_in_mbs = 262144
+    size_in_gbs = 50
     volume_backup_id = "volume_id"
 }
 ```
@@ -17,8 +17,8 @@ resource "oci_core_volume" "t" {
 
 The following arguments are supported:
 
-* `compartment_id` - (Required) The OCID of the compartment.
 * `availability_domain` - (Required) The Availability Domain of the volume.
+* `compartment_id` - (Required) The OCID of the compartment.
 * `display_name` - (Optional) A user-friendly name. Does not have to be unique, and it's changeable.
 * `volume_backup_id` - (Optional) The OCID of the volume backup from which the data should be restored on the newly created volume.
 
@@ -28,5 +28,6 @@ The following arguments are supported:
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the Volume backup.
 * `state` - The current state of the volume. [PROVISIONING,RESTORING,AVAILABLE,TERMINATING,TERMINATED,FAULTY]
-* `size_in_mbs` - The size of the volume, in MBs.
+* `size_in_mbs` - (Deprecated) The size of the volume, in MBs.
+* `size_in_gbs` - The size of the volume, in GBs.
 * `time_created` - The date and time the Volume was created.
diff --git a/docs/resources/core/volume_backup.md b/docs/resources/core/volume_backup.md
@@ -24,9 +24,10 @@ The following arguments are supported:
 * `display_name` - A user-friendly name. Does not have to be unique.
 * `id` - The OCID of the Volume backup.
 * `state` - The current state of the volume. [CREATING,AVAILABLE,TERMINATING,TERMINATED,FAULTY,REQUEST_RECEIVED]
-* `size_in_mbs` - The size of the volume, in MBs.
+* `size_in_mbs` - (Deprecated) The size of the volume, in MBs.
+* `size_in_gbs` - The size of the volume, in GBs.
 * `time_created` - The date and time the Volume was created.
 * `time_requested` - The date and time the request to create the volume backup was received.
-* `unique_size_in_mbs` - The size used by the backup, in MBs. It is typically smaller than sizeInMBs, depending on the space consumed on the volume and whether the backup is full or incremental.
+* `unique_size_in_mbs` - (Deprecated) The size used by the backup, in MBs. It is typically smaller than sizeInMBs, depending on the space consumed on the volume and whether the backup is full or incremental.
+* `unique_size_in_gbs` - The size used by the backup, in GBs. It is typically smaller than sizeInGBs, depending on the space consumed on the volume and whether the backup is full or incremental.
 * `volume_id` - The OCID of the Volume.
-
diff --git a/resource_obmcs_core_volume.go b/resource_obmcs_core_volume.go
@@ -3,6 +3,8 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/oracle/bmcs-go-sdk"
 
@@ -31,6 +33,13 @@ func VolumeResource() *schema.Resource {
 				ForceNew: true,
 			},
 			"size_in_mbs": {
+				Type:       schema.TypeInt,
+				Optional:   true,
+				ForceNew:   true,
+				Computed:   true,
+				Deprecated: "This property is deprecated, please use size_in_gbs",
+			},
+			"size_in_gbs": {
 				Type:     schema.TypeInt,
 				Optional: true,
 				ForceNew: true,
@@ -136,6 +145,15 @@ func (s *VolumeResourceCrud) Create() (e error) {
 	if ok {
 		opts.SizeInMBs = sizeInMBs.(int)
 	}
+	sizeInGBs, ok := s.D.GetOk("size_in_gbs")
+	if ok {
+		opts.SizeInGBs = sizeInGBs.(int)
+	}
+
+	if opts.SizeInMBs > 0 && opts.SizeInGBs > 0 {
+		return fmt.Errorf("Both size in Megabytes and Gigabytes cannot be set. Specify one or the other, or leave both undefined to use the default size.")
+	}
+
 	volumeBackupID, ok := s.D.GetOk("volume_backup_id")
 	if ok {
 		opts.VolumeBackupID = volumeBackupID.(string)
@@ -171,6 +189,7 @@ func (s *VolumeResourceCrud) SetData() {
 	s.D.Set("compartment_id", s.Res.CompartmentID)
 	s.D.Set("display_name", s.Res.DisplayName)
 	s.D.Set("size_in_mbs", s.Res.SizeInMBs)
+	s.D.Set("size_in_gbs", s.Res.SizeInGBs)
 	s.D.Set("state", s.Res.State)
 	s.D.Set("time_created", s.Res.TimeCreated.String())
 }
diff --git a/resource_obmcs_core_volume_attachment_test.go b/resource_obmcs_core_volume_attachment_test.go
@@ -75,7 +75,6 @@ func (s *ResourceCoreVolumeAttachmentTestSuite) SetupTest() {
 		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 		compartment_id = "${var.compartment_id}"
 		display_name = "display_name"
-		size_in_mbs = 262144
 	}`
 	s.ResourceName = "oci_core_volume_attachment.t"
 }
diff --git a/resource_obmcs_core_volume_backup.go b/resource_obmcs_core_volume_backup.go
@@ -38,6 +38,11 @@ func VolumeBackupResource() *schema.Resource {
 				Computed: true,
 			},
 			"size_in_mbs": {
+				Type:       schema.TypeInt,
+				Computed:   true,
+				Deprecated: "This property is deprecated, please use size_in_gbs",
+			},
+			"size_in_gbs": {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
@@ -50,6 +55,11 @@ func VolumeBackupResource() *schema.Resource {
 				Computed: true,
 			},
 			"unique_size_in_mbs": {
+				Type:       schema.TypeInt,
+				Computed:   true,
+				Deprecated: "This property is deprecated, please use unique_size_in_gbs",
+			},
+			"unique_size_in_gbs": {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
@@ -163,11 +173,13 @@ func (s *VolumeBackupResourceCrud) SetData() {
 	s.D.Set("display_name", s.Res.DisplayName)
 	s.D.Set("state", s.Res.State)
 	s.D.Set("size_in_mbs", s.Res.SizeInMBs)
+	s.D.Set("size_in_gbs", s.Res.SizeInGBs)
 	if !s.Res.TimeCreated.IsZero() {
 		s.D.Set("time_created", s.Res.TimeCreated.String())
 	}
 	s.D.Set("time_request_received", s.Res.TimeCreated.String())
-	s.D.Set("unique_size_in_mbs", s.Res.SizeInMBs)
+	s.D.Set("unique_size_in_mbs", s.Res.UniqueSizeInMBs)
+	s.D.Set("unique_size_in_gbs", s.Res.UniqueSizeInGBs)
 	s.D.Set("volume_id", s.Res.VolumeID)
 }
 
diff --git a/resource_obmcs_core_volume_backup_test.go b/resource_obmcs_core_volume_backup_test.go
@@ -8,7 +8,6 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/oracle/bmcs-go-sdk"
-
 	"github.com/stretchr/testify/suite"
 )
 
@@ -35,14 +34,14 @@ func (s *ResourceCoreVolumeBackupTestSuite) SetupTest() {
 			availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 			compartment_id = "${var.compartment_id}"
 			display_name = "-tf-volume"
-			size_in_mbs = 51200
+			size_in_gbs = 50
 		}`
 	s.ResourceName = "oci_core_volume_backup.t"
 }
 
-func (s *ResourceCoreVolumeBackupTestSuite) TestCreateVolumeBackup() {
+func (s *ResourceCoreVolumeBackupTestSuite) TestAccResourceCoreVolumeBackup_basic() {
 
-	resource.UnitTest(s.T(), resource.TestCase{
+	resource.Test(s.T(), resource.TestCase{
 		Providers: s.Providers,
 		Steps: []resource.TestStep{
 			// verify create
@@ -59,6 +58,10 @@ func (s *ResourceCoreVolumeBackupTestSuite) TestCreateVolumeBackup() {
 					resource.TestCheckResourceAttrSet(s.ResourceName, "display_name"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", baremetal.ResourceAvailable),
+					resource.TestCheckResourceAttr(s.ResourceName, "size_in_mbs", "51200"),
+					resource.TestCheckResourceAttr(s.ResourceName, "size_in_gbs", "50"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "unique_size_in_mbs"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "unique_size_in_gbs"),
 				),
 			},
 			// verify update
@@ -83,7 +86,7 @@ func (s *ResourceCoreVolumeBackupTestSuite) TestCreateVolumeBackup() {
 						availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
 						compartment_id = "${var.compartment_id}"
 						display_name = "-tf-volume-restored"
-						size_in_mbs = 51200
+						size_in_gbs = 50
 						volume_backup_id = "${oci_core_volume_backup.t.id}"
 					}`,
 				Check: resource.ComposeTestCheckFunc(
diff --git a/resource_obmcs_core_volume_test.go b/resource_obmcs_core_volume_test.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/Makefile b/vendor/github.com/oracle/bmcs-go-sdk/Makefile
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/core_vnic.go b/vendor/github.com/oracle/bmcs-go-sdk/core_vnic.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/core_volume.go b/vendor/github.com/oracle/bmcs-go-sdk/core_volume.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/core_volume_backup.go b/vendor/github.com/oracle/bmcs-go-sdk/core_volume_backup.go
diff --git a/vendor/github.com/oracle/bmcs-go-sdk/request_options.go b/vendor/github.com/oracle/bmcs-go-sdk/request_options.go
diff --git a/vendor/vendor.json b/vendor/vendor.json

Original file line number	Diff line number	Diff line change
`@@ -95,6 +95,7 @@ func (s *VolumeDatasourceCrud) SetData() {`
`95`	`95`	`"display_name": v.DisplayName,`
`96`	`96`	`"id": v.ID,`
`97`	`97`	`"size_in_mbs": v.SizeInMBs,`
	`98`	`+ "size_in_gbs": v.SizeInGBs,`
`98`	`99`	`"state": v.State,`
`99`	`100`	`"time_created": v.TimeCreated.String(),`
`100`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ resource "oci_core_volume" "TFBlock0" {`
`2`	`2`	`availability_domain = "${lookup(data.oci_identity_availability_domains.ADs.availability_domains[var.AD - 1],"name")}"`
`3`	`3`	`compartment_id = "${var.compartment_ocid}"`
`4`	`4`	`display_name = "TFBlock0"`
`5`		`- size_in_mbs = "${var.256GB}"`
	`5`	`+ size_in_gbs = "${var.DBSize}"`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`resource "oci_core_volume_attachment" "TFBlock0Attach" {`
Original file line number	Diff line number	Diff line change
`@@ -27,12 +27,8 @@ variable "InstanceOSVersion" {`
`27`	`27`	`default = "7.3"`
`28`	`28`	`}`
`29`	`29`
`30`		`-variable "2TB" {`
`31`		`- default = "2097152"`
`32`		`-}`
`33`		`-`
`34`		`-variable "256GB" {`
`35`		`- default = "262144"`
	`30`	`+variable "DBSize" {`
	`31`	`+ default = "50" // size in GBs`
`36`	`32`	`}`
`37`	`33`
`38`	`34`	`variable "BootStrapFile" {`