Fix a few outstanding acceptance tests. Mostly in good shape. The db_system test is not working, sub objects are not saved somehow

Author: mikejihbe

data_source_obmcs_core_console_history_data_test.go

@@ -32,15 +32,13 @@ func (s *CoreConsoleHistoryDataDatasourceTestSuite) SetupTest() {
 	s.Providers = map[string]terraform.ResourceProvider{
 		"baremetal": s.Provider,
 	}
-	s.Config = `
-
+	s.Config = instanceConfig + `
     resource "baremetal_core_console_history" "t" {
-			instance_id = "instance_id"
+	instance_id = "${baremetal_core_instance.t.id}"
     }
     data "baremetal_core_console_history_data" "s" {
       console_history_id = "${baremetal_core_console_history.t.id}"
       length = 1
-      offset = 1
     }
   `
 	s.Config += testProviderConfig()

data_source_obmcs_core_cpe_test.go

@@ -61,7 +61,7 @@ func (s *DatasourceCoreCpeTestSuite) TestCpeList() {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(s.ResourceName, "cpes.0.ip_address", "142.10.10.2"),
 					resource.TestCheckResourceAttr(s.ResourceName, "cpes.0.display_name", "name1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "cpes.#", "1"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "cpes.#"),
 				),
 			},
 		},

data_source_obmcs_core_dhcp_options_test.go

@@ -33,11 +33,25 @@ func (s *ResourceCoreDHCPOptionsDatasourceTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
+	resource "baremetal_core_virtual_network" "t" {
+		cidr_block = "10.0.0.0/16"
+		compartment_id = "${var.compartment_id}"
+		display_name = "network_name"
+	}
+	resource "baremetal_core_dhcp_options" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+     		options {
+			type = "DomainNameServer"
+			custom_dns_servers = [ "8.8.8.8" ]
+			server_type = "CustomDnsServer"
+		}
+     		vcn_id = "${baremetal_core_virtual_network.t.id}"
+	}
     data "baremetal_core_dhcp_options" "t" {
       compartment_id = "${var.compartment_id}"
       limit = 1
-      page = "page"
-      vcn_id = "vcn_id"
+      vcn_id = "${baremetal_core_virtual_network.t.id}"
     }
   `
 	s.Config += testProviderConfig()

data_source_obmcs_core_drg_test.go

@@ -34,7 +34,6 @@ func (s *ResourceCoreDrgsTestSuite) SetupTest() {
     data "baremetal_core_drgs" "t" {
       compartment_id = "${var.compartment_id}"
       limit = 1
-      page = "page"
     }
   `
 	s.Config += testProviderConfig()

data_source_obmcs_core_instance_credential_test.go

@@ -49,9 +49,9 @@ func (s *ResourceCoreInstanceCredentialTestSuite) TestResourceReadCoreInstanceCr
 			{
 				Config: s.Config,
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr(s.ResourceName, "instance_id", "instanceid"),
-					resource.TestCheckResourceAttr(s.ResourceName, "username", "username"),
-					resource.TestCheckResourceAttr(s.ResourceName, "password", "password"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "instance_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "username"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "password"),
 				),
 			},
 		},

data_source_obmcs_core_instance_test.go

@@ -31,9 +31,25 @@ func (s *DatasourceCoreIPSecStatusTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
-    data "baremetal_core_ipsec_status" "s" {
-      ipsec_id = "ipsecid"
-    }
+	resource "baremetal_core_drg" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+	}
+	resource "baremetal_core_cpe" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "displayname"
+		ip_address = "123.123.123.123"
+	}
+	resource "baremetal_core_ipsec" "t" {
+		compartment_id = "${var.compartment_id}"
+		cpe_id = "${baremetal_core_cpe.t.id}"
+		drg_id = "${baremetal_core_drg.t.id}"
+		display_name = "display_name"
+		static_routes = ["10.0.0.0/16"]
+	}
+    	data "baremetal_core_ipsec_status" "s" {
+      		ipsec_id = "${baremetal_core_ipsec.t.id}"
+    	}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_ipsec_status.s"
@@ -52,8 +68,7 @@ func (s *DatasourceCoreIPSecStatusTestSuite) TestIPSecStatus() {
 				Check: resource.ComposeTestCheckFunc(
 
 					resource.TestCheckResourceAttr(s.ResourceName, "id", "id"),
-					resource.TestCheckResourceAttr(s.ResourceName, "tunnels.0.ip_address", "10.10.10.2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "tunnels.1.ip_address", "10.10.10.3"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "tunnels.#"),
 				),
 			},
 		},

data_source_obmcs_core_ipsec_status_test.go

@@ -31,11 +31,26 @@ func (s *DatasourceCoreIPSecTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
-    data "baremetal_core_ipsec_connections" "s" {
-      compartment_id = "${var.compartment_id}"
-      cpe_id = "cpeid"
-      drg_id = "drgid"
-    }
+	resource "baremetal_core_drg" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+	}
+	resource "baremetal_core_cpe" "t" {
+		compartment_id = "${var.compartment_id}"
+		display_name = "displayname"
+		ip_address = "123.123.123.123"
+	}
+	resource "baremetal_core_ipsec" "t" {
+		compartment_id = "${var.compartment_id}"
+		cpe_id = "${baremetal_core_cpe.t.id}"
+		drg_id = "${baremetal_core_drg.t.id}"
+		display_name = "display_name"
+		static_routes = ["10.0.0.0/16"]
+	}
+	data "baremetal_core_ipsec_connections" "s" {
+	      compartment_id = "${var.compartment_id}"
+	      cpe_id = "${baremetal_core_cpe.t.id}"
+	}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_ipsec_connections.s"
@@ -52,13 +67,10 @@ func (s *DatasourceCoreIPSecTestSuite) TestResourceListIPConnections() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-
-					resource.TestCheckResourceAttr(s.ResourceName, "drg_id", "drgid"),
-					resource.TestCheckResourceAttr(s.ResourceName, "cpe_id", "cpeid"),
-					resource.TestCheckResourceAttr(s.ResourceName, "connections.0.compartment_id", "compartmentid"),
-					resource.TestCheckResourceAttr(s.ResourceName, "connections.0.id", "id1"),
-					resource.TestCheckResourceAttr(s.ResourceName, "connections.1.id", "id2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "connections.#", "2"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "drg_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "connections.0.compartment_id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "connections.0.id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "connections.#"),
 				),
 			},
 		},

data_source_obmcs_core_ipsec_test.go

@@ -32,9 +32,14 @@ func (s *DatasourceCoreVnicTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
-    data "baremetal_core_vnic" "t" {
-      vnic_id = "vnicid"
-    }
+	resource "baremetal_core_virtual_network" "t" {
+		cidr_block = "10.0.0.0/16"
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+	}
+    	data "baremetal_core_vnic" "t" {
+      		vnic_id = "${baremetal_core_virtual_network.t.id}"
+    	}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_vnic.t"
@@ -50,11 +55,9 @@ func (s *DatasourceCoreVnicTestSuite) TestReadVnic() {
 				ImportStateVerify: true,
 				Config:            s.Config,
 				Check: resource.ComposeTestCheckFunc(
-
-					resource.TestCheckResourceAttr(s.ResourceName, "availability_domain", "availabilitydomain"),
 					resource.TestCheckResourceAttr(s.ResourceName, "state", baremetal.ResourceActive),
-					resource.TestCheckResourceAttr(s.ResourceName, "private_ip_address", "10.10.10.10"),
-					resource.TestCheckResourceAttr(s.ResourceName, "public_ip_address", "52.53.54.55"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "private_ip_address"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "public_ip_address"),
 				),
 			},
 		},

data_source_obmcs_core_vnic_test.go

@@ -31,8 +31,17 @@ func (s *ResourceCoreVolumesTestSuite) SetupTest() {
 		"baremetal": s.Provider,
 	}
 	s.Config = `
+	data "baremetal_identity_availability_domains" "ADs" {
+		compartment_id = "${var.compartment_id}"
+	}
+	resource "baremetal_core_volume" "t" {
+		availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
+		compartment_id = "${var.compartment_id}"
+		display_name = "display_name"
+		size_in_mbs = 262144
+	}
     data "baremetal_core_volumes" "t" {
-      availability_domain = "availability_domain"
+      availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
       compartment_id = "${var.compartment_id}"
       limit = 1
     }
@@ -53,13 +62,9 @@ func (s *ResourceCoreVolumesTestSuite) TestReadVolumes() {
 				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.1.id", "id2"),
-					resource.TestCheckResourceAttr(s.ResourceName, "volumes.#", "2"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.availability_domain"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.0.id"),
+					resource.TestCheckResourceAttrSet(s.ResourceName, "volumes.#"),
 				),
 			},
 		},