Fix most remaining acceptance tests. These are still left: TestDatabaseDatabasesTestSuite, TestResourceCoreImageTestSuite, TestDatasourceCoreIPSecConfigTestSuite, TestDatasourceCoreIPSecStatusTestSuite, TestDatasourceCoreIPSecTestSuite, TestResourceCoreIPSecTestSuite.

Author: mikejihbe

crud/helpers.go

@@ -82,7 +82,6 @@ func handleMissingResourceError(sync ResourceVoider, err *error) {
 func LoadBalancerResourceID(res interface{}, workReq *baremetal.WorkRequest) (id *string, workReqSucceeded bool) {
 	v := reflect.ValueOf(res).Elem()
 	if v.IsValid() {
-		log.Printf("=========== Resource IS VALID")
 		// This is super fugly. It's this way because this API has no convention for ID formats.
 
 		// Load balancer
@@ -101,7 +100,7 @@ func LoadBalancerResourceID(res interface{}, workReq *baremetal.WorkRequest) (id
 		ip := v.FieldByName("ip_address")
 		port := v.FieldByName("port")
 		if ip.IsValid() && port.IsValid() {
-			s := ip.String() + ":" + strconv.Itoa(int(port.Int()))
+			s := ip.String() + ":" + strconv.Itoa(int(int(port.Int())))
 			return &s, false
 		}
 	}

data_source_obmcs_core_dhcp_options_test.go

@@ -68,13 +68,9 @@ func (s *ResourceCoreDHCPOptionsDatasourceTestSuite) TestReadDHCPOptions() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-
-					resource.TestCheckResourceAttr(s.ResourceName, "limit", "1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "page", "page"),
-					resource.TestCheckResourceAttr(s.ResourceName, "options.0.id", "id1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "options.1.id", "id2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "options.#", "2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "vcn_id", "vcn_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "options.0.id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "options.#"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "vcn_id"),
 				),
 			},
 		},

data_source_obmcs_core_drg_test.go

@@ -31,10 +31,10 @@ func (s *ResourceCoreDrgsTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
-    data "baremetal_core_drgs" "t" {
-      compartment_id = "${var.compartment_id}"
-      limit = 1
-    }
+	resource "baremetal_core_drg" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+	}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_drgs.t"
@@ -50,6 +50,13 @@ func (s *ResourceCoreDrgsTestSuite) TestReadDrgs() {
 				ImportState:       true,
 				ImportStateVerify: true,
 				Config:            s.Config,
+			},
+			{
+				Config: s.Config + `
+				data "baremetal_core_drgs" "t" {
+					compartment_id = "${var.compartment_id}"
+					limit = 1
+				}`,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet(s.ResourceName, "drgs.0.id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "drgs.#"),

data_source_obmcs_core_vnic_attachment_test.go

@@ -35,7 +35,6 @@ func (s *ResourceCoreVnicAttachmentsTestSuite) SetupTest() {
     data "baremetal_core_vnic_attachments" "s" {
       compartment_id = "${var.compartment_id}"
       availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
-      vnic_id = "${baremetal_core_virtual_network.t.id}"
       instance_id = "${baremetal_core_instance.t.id}"
     }
   `
@@ -54,10 +53,7 @@ func (s *ResourceCoreVnicAttachmentsTestSuite) TestResourceReadCoreVnicAttachmen
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-
-					resource.TestCheckResourceAttrSet(s.ResourceName, "availability_domain"),
-					resource.TestCheckResourceAttrSet(s.ResourceName, "vnic_id"),
-					resource.TestCheckResourceAttr(s.ResourceName, "vnic_attachments.#", "0"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "vnic_attachments.#"),
 				),
 			},
 		},

data_source_obmcs_core_vnic_test.go

@@ -61,7 +61,7 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumes() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(s.ResourceName, "availability_domain", "availability_domain"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "availability_domain"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.availability_domain"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.id"),
 					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.#"),
@@ -84,14 +84,9 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumesWithPagination() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(s.ResourceName, "availability_domain", "availability_domain"),
-
-					resource.TestCheckResourceAttr(s.ResourceName, "limit", "1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "page", "page"),
-					resource.TestCheckResourceAttr(s.ResourceName, "volumes.0.availability_domain", "availability_domain"),
-					resource.TestCheckResourceAttr(s.ResourceName, "volumes.0.id", "id1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "volumes.3.id", "id4"),
-					resource.TestCheckResourceAttr(s.ResourceName, "volumes.#", "4"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.availability_domain"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.#"),
 				),
 			},
 		},

data_source_obmcs_core_volume_test.go

@@ -27,7 +27,7 @@ func DatabasesDatasource() *schema.Resource {
 			},
 			"limit": {
 				Type:     schema.TypeInt,
-				Required: true,
+				Optional: true,
 			},
 			"page": {
 				Type:     schema.TypeString,

data_source_obmcs_database_databases.go

@@ -57,7 +57,7 @@ func (s *DatabaseDatabasesTestSuite) TestReadDatabases() {
 				      db_home_id = "${data.baremetal_database_db_homes.t.id}"
 				}
 				data "baremetal_database_database" "t" {
-				      database_id = "${data.baremetal_database_databases.databases.0.id}"
+				      database_id = "${data.baremetal_database_databases.t.databases.0.id}"
 				}
 			        data "baremetal_database_db_nodes" "t" {
 				      compartment_id = "${var.compartment_id}"

data_source_obmcs_database_databases_test.go

@@ -27,7 +27,7 @@ func DBHomesDatasource() *schema.Resource {
 			},
 			"limit": {
 				Type:     schema.TypeInt,
-				Required: true,
+				Optional: true,
 			},
 			"page": {
 				Type:     schema.TypeString,

data_source_obmcs_database_db_homes.go

@@ -27,7 +27,7 @@ func DBNodesDatasource() *schema.Resource {
 			},
 			"limit": {
 				Type:     schema.TypeInt,
-				Required: true,
+				Optional: true,
 			},
 			"page": {
 				Type:     schema.TypeString,