Add VMDB and licenseModel support for DBSystem (#317)

* Add VMDB and licenseModel support for DBSystem
* Change the delete DBSystem to wait until the operation completes.  TestResourceDatabaseDBSystemTestSuite now succeeds.

Author: kohashim

data_source_obmcs_database_db_system.go

@@ -101,15 +101,19 @@ func (s *DBSystemDatasourceCrud) SetData() {
 				"compartment_id":          r.CompartmentID,
 				"cpu_core_count":          int(r.CPUCoreCount),
 				"data_storage_percentage": r.DataStoragePercentage,
+				"data_storage_size_in_gb": int(r.DataStorageSizeInGBs),
 				"database_edition":        r.DatabaseEdition,
 				"db_home":                 []interface{}{dbHome},
 				"display_name":            r.DisplayName,
 				"disk_redundancy":         r.DiskRedundancy,
 				"domain":                  r.Domain,
 				"hostname":                r.Hostname,
 				"id":                      r.ID,
+				"license_model":           r.LicenseModel,
 				"lifecycle_details":       r.LifecycleDetails,
 				"listener_port":           int(r.ListenerPort),
+				"node_count":              int(r.NodeCount),
+				"reco_storage_size_in_gb": int(r.RecoStorageSizeInGB),
 				"scan_dns_record_id":      r.ScanDnsRecordId,
 				"scan_ip_ids":             r.ScanIpIds,
 				"shape":                   r.Shape,

docs/examples/db_systems/DBSystem.tf

@@ -22,5 +22,8 @@ resource "oci_database_db_system" "TFDBNode" {
   display_name = "${var.DBNodeDisplayName}"
   domain = "${var.DBNodeDomainName}"
   hostname = "${var.DBNodeHostName}"
-  data_storage_percentage = "40" 
+  data_storage_percentage = "40"
+  initial_data_storage_size_in_gb = "${var.InitialDataStorageSizeInGB}"
+  license_model = "${var.LicenseModel}"
+  node_count = "${var.NodeCount}"
 }

docs/examples/db_systems/variables.tf

@@ -17,7 +17,7 @@ variable "AD" {
 
 # DBSystem specific 
 variable "DBNodeShape" {
-    default = "BM.DenseIO1.36"
+    default = "VM.Standard1.2"
 }
 
 variable "CPUCoreCount" {
@@ -85,5 +85,14 @@ variable "PDBName" {
 	default = "pdbName"
 }
 
+variable "InitialDataStorageSizeInGB" {
+	default = "256"
+}
 
+variable "LicenseModel" {
+	default = "LICENSE_INCLUDED"
+}
 
+variable "NodeCount" {
+	default = "1"
+}

docs/resources/database/db_system.md

@@ -32,6 +32,9 @@ resource "oci_database_db_system" "TFDBNode" {
   domain = "${var.DBNodeDomainName}"
   hostname = "${var.DBNodeHostName}"
   data_storage_percentage = "${var.DataStoragePercentage}"
+  initial_data_storage_size_in_gb = "${var.InitialDataStorageSizeInGB}"
+  license_model = "${var.LicenseModel}"
+  node_count = "${var.NodeCount}"
 }
 ```
 
@@ -51,6 +54,9 @@ The following arguments are supported:
 * `display_name` - (Optional) The user-friendly name for the DB System. It does not have to be unique.
 * `domain` - (Optional) A domain name to assign to the DB System.
 * `hostname` - (Required) The host name to assign to the DB Node.
+* `data_storage_size_in_gb` - (Optional) Size, in GBs, of the data volume that will be created and attached to VM-shape based DB system. This storage can later be scaled up if needed. Note that the total storage size attached will be more than what is requested, to account for REDO/RECO space and software volume.
+* `license_model` - (Optional) The Oracle license model that applies to all the databases on the DB System. The default is LICENSE_INCLUDED.
+* `node_count` - (Optional) Number of nodes to launch for a VM-shape based RAC DB system.
 * `shape` - (Required) The shape of the DB System.
 * `ssh_public_keys` - (Required) The public key portion of the key pair to use for SSH access to the DB System.
 * `subnet_id` - (Required) The OCID of the subnet the DB System is associated with.
@@ -81,6 +87,7 @@ The following attributes are exported:
 * `id` - The OCID of the DB System.
 * `lifecycle_details` - Additional information about the current lifecycleState.
 * `listener_port` - The port number configured for the listener on the DB System.
+* `reco_storage_size_in_gb` - RECO/REDO storage size, in GBs, that is currently allocated to the DB system. This is applicable only for VM-based DBs.
 * `scan_dns_record_id` - The OCID of the DNS record for the SCAN IP addresses that are associated with the DB System.
 * `scan_ip_ids` - The OCID of the Single Client Access Name (SCAN) IP addresses associated with the DB System. SCAN IP addresses are typically used for load balancing and are not assigned to any interface.
 * `state` - The current state of the DB System.

resource_obmcs_database_db_system.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/hashicorp/terraform/helper/validation"
 	"github.com/oracle/bmcs-go-sdk"
 
 	"github.com/oracle/terraform-provider-oci/crud"
@@ -171,6 +172,27 @@ func DBSystemResource() *schema.Resource {
 				Optional: true,
 				ForceNew: true,
 			},
+			"data_storage_size_in_gb": {
+				Type:     schema.TypeInt,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+			},
+			"license_model": {
+				Type:     schema.TypeString,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+				ValidateFunc: validation.StringInSlice([]string{
+					string(baremetal.LicenseIncluded),
+					string(baremetal.BringYourOwnLicense)}, false),
+			},
+			"node_count": {
+				Type:     schema.TypeInt,
+				Computed: true,
+				Optional: true,
+				ForceNew: true,
+			},
 
 			//Computed
 			"id": {
@@ -185,6 +207,10 @@ func DBSystemResource() *schema.Resource {
 				Type:     schema.TypeInt,
 				Computed: true,
 			},
+			"reco_storage_size_in_gb": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
 			"scan_dns_record_id": {
 				Type:     schema.TypeString,
 				Computed: true,
@@ -240,7 +266,7 @@ func deleteDBSystem(d *schema.ResourceData, m interface{}) (e error) {
 	sync := &DBSystemResourceCrud{}
 	sync.D = d
 	sync.Client = client.clientWithoutNotFoundRetries
-	return sync.Delete()
+	return crud.DeleteResource(d, sync)
 }
 
 type DBSystemResourceCrud struct {
@@ -343,6 +369,15 @@ func (s *DBSystemResourceCrud) Create() (e error) {
 	if domain, ok := s.D.GetOk("domain"); ok {
 		opts.Domain = domain.(string)
 	}
+	if initialDataStorageSizeInGB, ok := s.D.GetOk("data_storage_size_in_gb"); ok {
+		opts.InitialDataStorageSizeInGB = initialDataStorageSizeInGB.(int)
+	}
+	if licenseModel, ok := s.D.GetOk("license_model"); ok {
+		opts.LicenseModel = baremetal.LicenseModel(licenseModel.(string))
+	}
+	if nodeCount, ok := s.D.GetOk("node_count"); ok {
+		opts.NodeCount = nodeCount.(int)
+	}
 
 	s.Res, e = s.Client.LaunchDBSystem(
 		availabilityDomain, compartmentID, cpuCoreCount, databaseEdition, dbHomeDetails,
@@ -378,14 +413,18 @@ func (s *DBSystemResourceCrud) SetData() {
 	s.D.Set("backup_subnet_id", s.Res.BackupSubnetID)
 	s.D.Set("cluster_name", s.Res.ClusterName)
 	s.D.Set("data_storage_percentage", s.Res.DataStoragePercentage)
+	s.D.Set("data_storage_size_in_gb", s.Res.DataStorageSizeInGBs)
 	s.D.Set("disk_redundancy", s.Res.DiskRedundancy)
 	s.D.Set("display_name", s.Res.DisplayName)
 	s.D.Set("domain", s.Res.Domain)
+	s.D.Set("license_model", s.Res.LicenseModel)
+	s.D.Set("node_count", s.Res.NodeCount)
 
 	//Computed
 	s.D.Set("id", s.Res.ID)
 	s.D.Set("lifecycle_details", s.Res.LifecycleDetails)
 	s.D.Set("listener_port", s.Res.ListenerPort)
+	s.D.Set("reco_storage_size_in_gb", s.Res.RecoStorageSizeInGB)
 	s.D.Set("scan_dns_record_id", s.Res.ScanDnsRecordId)
 	s.D.Set("scan_ip_ids", s.Res.ScanIpIds)
 	s.D.Set("state", s.Res.State)

resource_obmcs_database_db_system_test.go

@@ -25,7 +25,6 @@ func (s *ResourceDatabaseDBSystemTestSuite) SetupTest() {
 	s.Provider = testAccProvider
 	s.Providers = testAccProviders
 	s.Config = testProviderConfig() + `
-
 	data "oci_identity_availability_domains" "ADs" {
 		compartment_id = "${var.compartment_id}"
 	}
@@ -34,6 +33,7 @@ func (s *ResourceDatabaseDBSystemTestSuite) SetupTest() {
 		compartment_id = "${var.compartment_id}"
 		cidr_block = "10.0.0.0/16"
 		display_name = "-tf-vcn"
+		dns_label = "tfvcn"
 	}
 
 	resource "oci_core_subnet" "t" {
@@ -44,31 +44,8 @@ func (s *ResourceDatabaseDBSystemTestSuite) SetupTest() {
 		vcn_id              = "${oci_core_virtual_network.t.id}"
 		route_table_id      = "${oci_core_virtual_network.t.default_route_table_id}"
 		dhcp_options_id     = "${oci_core_virtual_network.t.default_dhcp_options_id}"
-		security_list_ids = ["${oci_core_virtual_network.t.default_security_list_id}"]
-	}
-	
-	resource "oci_database_db_system" "t" {
-		availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
-		compartment_id = "${var.compartment_id}"
-		subnet_id = "${oci_core_subnet.t.id}"
-		database_edition = "ENTERPRISE_EDITION"
-		disk_redundancy = "NORMAL"
-		shape = "BM.DenseIO1.36"
-		cpu_core_count = "2"
-		ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
-		display_name = "-tf-db-system"
-		domain = "mycompany.com"
-		hostname = "myOracleDB"
-		db_home {
-			db_version = "12.1.0.2"
-			display_name = "-tf-db-home"
-			database {
-				"admin_password" = "BEstrO0ng_#11"
-				"db_name" = "aTFdb"
-				character_set = "AL32UTF8"
-				ncharacter_set = "AL16UTF16"
-			}
-		}
+		security_list_ids   = ["${oci_core_virtual_network.t.default_security_list_id}"]
+		dns_label           = "tfsubnet"
 	}`
 	s.ResourceName = "oci_database_db_system.t"
 }
@@ -77,10 +54,37 @@ func (s *ResourceDatabaseDBSystemTestSuite) TestAccResourceDatabaseDBSystem() {
 	resource.Test(s.T(), resource.TestCase{
 		Providers: s.Providers,
 		Steps: []resource.TestStep{
+			// verify create
 			{
 				ImportState:       true,
 				ImportStateVerify: true,
-				Config:            s.Config,
+				Config: s.Config + `
+				resource "oci_database_db_system" "t" {
+					availability_domain = "${data.oci_identity_availability_domains.ADs.availability_domains.0.name}"
+					compartment_id = "${var.compartment_id}"
+					subnet_id = "${oci_core_subnet.t.id}"
+					database_edition = "ENTERPRISE_EDITION"
+					disk_redundancy = "NORMAL"
+					shape = "VM.Standard1.2"
+					cpu_core_count = "2"
+					ssh_public_keys = ["ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"]
+					display_name = "-tf-db-system"
+					domain = "mycompany.com"
+					hostname = "myOracleDB"
+					data_storage_size_in_gb = "256"
+					license_model = "LICENSE_INCLUDED"
+					node_count = "1"
+					db_home {
+						db_version = "12.1.0.2"
+						display_name = "-tf-db-home"
+						database {
+							"admin_password" = "BEstrO0ng_#11"
+							"db_name" = "aTFdb"
+							character_set = "AL32UTF8"
+							ncharacter_set = "AL16UTF16"
+						}
+					}
+				}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "time_created"),

vendor/github.com/oracle/bmcs-go-sdk/constants.go

@@ -2972,10 +2972,12 @@
 			"revisionTime": "2017-01-25T16:36:56Z"
 		},
 		{
-			"checksumSHA1": "0lB36Au95tRAfvQ8rA93XEz3tLk=",
+			"checksumSHA1": "16wWla3HWHMOrJHo0yN7iu1YIhw=",
 			"path": "github.com/oracle/bmcs-go-sdk",
-			"revision": "9482e75ceee221a25ad6edbbc5ca3f5657e4c371",
-			"revisionTime": "2017-10-12T00:22:16Z"
+			"revision": "2f3eb845627cb625dc2de52ccd7c4b69ecf60240",
+			"revisionTime": "2017-10-20T17:32:20Z",
+			"version": "add-db-license-model",
+			"versionExact": "add-db-license-model"
 		},
 		{
 			"checksumSHA1": "ImgLNIpeXsGjZGXw4rd+rwzQxpo=",