Fix #119, Fix #100

Author: mikejihbe

provider_test.go

@@ -222,6 +222,8 @@ variable "DBNodeHostName" {
 	    database {
 	      "admin_password" = "${var.DBAdminPassword}"
 	      "db_name" = "${var.DBName}"
+	      character_set = "AL32UTF8"
+	      ncharacter_set = "AL16UTF16"
 	    }
 	    db_version = "${var.DBVersion}"
 	    display_name = "MyTFDB"

resource_obmcs_core_ipsec_test.go

@@ -49,8 +49,8 @@ func (s *ResourceCoreIPSecTestSuite) SetupTest() {
 		resource "baremetal_core_cpe" "t" {
 			compartment_id = "${var.compartment_id}"
 			display_name = "displayname"
-      			ip_address = "123.123.123.123"
-      			depends_on = ["baremetal_core_drg.t"}
+      		ip_address = "123.123.123.123"
+      		depends_on = ["baremetal_core_drg.t"}
 		}
 		resource "baremetal_core_ipsec" "t" {
 			compartment_id = "${var.compartment_id}"

resource_obmcs_database_db_system.go

@@ -93,6 +93,14 @@ func DBSystemResource() *schema.Resource {
 										Type:     schema.TypeString,
 										Required: true,
 									},
+									"character_set": {
+										Type: schema.TypeString,
+										Optional: true,
+									},
+									"ncharacter_set": {
+										Type: schema.TypeString,
+										Optional: true,
+									},
 								},
 							},
 						},
@@ -231,15 +239,18 @@ func (s *DBSystemResourceCrud) Create() (e error) {
 			displayName := dbHome["display_name"]
 			adminPassword := db["admin_password"].(string)
 			dbName := db["db_name"].(string)
+			characterSet := db["character_set"].(string)
+			ncharacterSet := db["ncharacter_set"].(string)
 			dbVersion := dbHome["db_version"].(string)
 
+
 			dbHomeOpts := &baremetal.DisplayNameOptions{}
 			if displayName != nil {
 				dbHomeOpts.DisplayName = displayName.(string)
 			}
 
 			dbHomeDetails := baremetal.NewCreateDBHomeDetails(
-				adminPassword, dbName, dbVersion, dbHomeOpts,
+				adminPassword, dbName, dbVersion, characterSet, ncharacterSet, dbHomeOpts,
 			)
 			opts.DBHome = dbHomeDetails
 		}