Most of the core resources are tested. Encountering a timing problem with instance tests -- the construction of these tests takes longer than 10 minutes. We may have to have a combined instance test that checks a bunch of things.

Author: mikejihbe

data_source_obmcs_core_instance_credential_test.go

@@ -34,9 +34,9 @@ func (s *ResourceCoreInstanceCredentialTestSuite) SetupTest() {
 	s.Providers = map[string]terraform.ResourceProvider{
 		"baremetal": s.Provider,
 	}
-	s.Config = `
+	s.Config = instanceConfig + `
     data "baremetal_core_instance_credentials" "s" {
-      instance_id = "instanceid"
+      instance_id = "${baremetal_core_instance.t.id}"
     }
   `
 	s.Config += testProviderConfig()

data_source_obmcs_core_virtual_network_test.go

@@ -35,15 +35,15 @@ func (s *ResourceCoreVirtualNetworksTestSuite) 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 = "display_name"
-		}
-    data "baremetal_core_virtual_networks" "t" {
-      compartment_id = "${baremetal_core_virtual_network.t.compartment_id}"
-      limit = 1
-    }
+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_virtual_networks" "t" {
+	compartment_id = "${baremetal_core_virtual_network.t.compartment_id}"
+	limit = 1
+}
   `
 	s.Config += testProviderConfig()
 	s.ResourceName = "data.baremetal_core_virtual_networks.t"

provider_test.go

@@ -35,6 +35,94 @@ func testProviderConfig() string {
 	`
 }
 
+var instanceConfig = `
+data "baremetal_identity_availability_domains" "ADs" {
+  compartment_id = "${var.compartment_id}"
+}
+
+data "baremetal_core_images" "images" {
+    compartment_id = "${var.compartment_id}"
+}
+
+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_internet_gateway" "CompleteIG" {
+    compartment_id = "${var.compartment_id}"
+    display_name = "CompleteIG"
+    vcn_id = "${baremetal_core_virtual_network.t.id}"
+}
+
+resource "baremetal_core_route_table" "RouteForComplete" {
+    compartment_id = "${var.compartment_id}"
+    vcn_id = "${baremetal_core_virtual_network.t.id}"
+    display_name = "RouteTableForComplete"
+    route_rules {
+        cidr_block = "0.0.0.0/0"
+        network_entity_id = "${baremetal_core_internet_gateway.CompleteIG.id}"
+    }
+}
+
+resource "baremetal_core_security_list" "WebSubnet" {
+    compartment_id = "${var.compartment_id}"
+    display_name = "Public"
+    vcn_id = "${baremetal_core_virtual_network.t.id}"
+    egress_security_rules = [{
+        destination = "0.0.0.0/0"
+        protocol = "6"
+    }]
+    ingress_security_rules = [{
+        tcp_options {
+            "max" = 80
+            "min" = 80
+        }
+        protocol = "6"
+        source = "0.0.0.0/0"
+    },
+	{
+	protocol = "6"
+	source = "10.0.0.0/16"
+    }]
+}
+
+
+resource "baremetal_core_subnet" "WebSubnetAD1" {
+  availability_domain = "${lookup(data.baremetal_identity_availability_domains.ADs.availability_domains[0],"name")}"
+  cidr_block = "10.0.0.0/16"
+  display_name = "WebSubnetAD1"
+  compartment_id = "${var.compartment_id}"
+  vcn_id = "${baremetal_core_virtual_network.t.id}"
+  route_table_id = "${baremetal_core_route_table.RouteForComplete.id}"
+  security_list_ids = ["${baremetal_core_security_list.WebSubnet.id}"]
+}
+
+data "baremetal_core_images" "t" {
+	compartment_id = "${var.compartment_id}"
+	limit = 1
+}
+
+data "baremetal_core_shape" "shapes" {
+	compartment_id = "${var.compartment_id}"
+	availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
+	image_id = "${data.baremetal_core_images.t.images.0.id}"
+}
+
+resource "baremetal_core_instance" "t" {
+	availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"
+	compartment_id = "${var.compartment_id}"
+	display_name = "instance_name"
+      image = "${data.baremetal_core_images.t.images.0.id}"
+      shape = "${data.baremetal_core_shape.shapes.shapes.0.name}"
+      subnet_id = "${baremetal_core_subnet.WebSubnetAD1.id}"
+      metadata {
+        ssh_authorized_keys = "ssh-rsa KKKLK3NzaC1yc2EAAAADAQABAAABAQC+UC9MFNA55NIVtKPIBCNw7++ACXhD0hx+Zyj25JfHykjz/QU3Q5FAU3DxDbVXyubgXfb/GJnrKRY8O4QDdvnZZRvQFFEOaApThAmCAM5MuFUIHdFvlqP+0W+ZQnmtDhwVe2NCfcmOrMuaPEgOKO3DOW6I/qOOdO691Xe2S9NgT9HhN0ZfFtEODVgvYulgXuCCXsJs+NUqcHAOxxFUmwkbPvYi0P0e2DT8JKeiOOC8VKUEgvVx+GKmqasm+Y6zHFW7vv3g2GstE1aRs3mttHRoC/JPM86PRyIxeWXEMzyG5wHqUu4XZpDbnWNxi6ugxnAGiL3CrIFdCgRNgHz5qS1l MustWin"
+      }
+}
+`
+
 // This is a dummy object allowing coexistance between mocked API calls and real API calls in acceptance tests
 // Acceptance tests will use this object that "mocks" the mocks
 type mockableClient interface {
@@ -57,7 +145,11 @@ func (r *testClient) AssertCalled(t mock.TestingT, methodName string, arguments
 }
 
 func IsAccTest() bool {
-	acc, err := strconv.ParseBool(os.Getenv(resource.TestEnvVar))
+	val := os.Getenv(resource.TestEnvVar)
+	if val == "" {
+		return false
+	}
+	acc, err := strconv.ParseBool(val)
 	if err != nil {
 		panic("Err testing TF_ACC env var. It should be blank or a boolean value.")
 	}
@@ -132,6 +224,16 @@ xTHuOMkklNO7SiTluAUBvXrjxfGqe/gwJOHxXQGHC8W6vyhR2BdVx9PKFVebWjlr
 gzRMpGgWnjsaz0ldu3uO7ozRxZg8FgdToIzAIaTytpHKI8HvONvPJlYywOMC1gRi
 KwX6p26xaVtCV8PbDpF3RHuEJV1NU6PDIhaIHhdL374BiX/KmcJ6yv7tbkczpK+V
 -----END RSA PRIVATE KEY-----`
+var testPublicKey = `
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtBLQAGmKJ7tpfzYJyqLG
+ZDwHL51+d6T8Z00BnP9CFfzxZZZ48PcYSUHuTyCM8mR5JqYLyH6C8tZ/DKqwxUnc
+ONgBytG3MM42bgxfHIhsZRj5rCz1oqWlSLuXvgww1kuqWnt6r+NtnXog439YsGTH
+RotrTLTdEgOxH0EFP5uHUc9w/Uix7rWU7GB2ra060oeTB/hKpts5U70eI2EI6ec9
+1sJdUIj7xNfBJeQQrz4CFUrkyzL06211CFvhmxH2hA9gBKOqC3rGL8XraHZBhGWn
+mXlrQB7nNKsJrrv5fHwaPDrAY4iNP2W0q3LRpyNigJ6cgRuGJhHa82iHPmxgIx8m
+fwIDAQAB
+-----END PUBLIC KEY-----`
 
 var testKeyFingerPrint = "b4:8a:7d:54:e6:81:04:b2:fa:ce:ba:55:34:dd:00:00"
 var testTenancyOCID = "ocid1.tenancy.oc1..faketenancy"

resource_obmcs_core_cpe_test.go

@@ -46,7 +46,7 @@ func (s *ResourceCoreCpeTestSuite) SetupTest() {
 		resource "baremetal_core_cpe" "t" {
 			compartment_id = "${var.compartment_id}"
 			display_name = "displayname"
-      ip_address = "123.123.123.123"
+      			ip_address = "123.123.123.123"
 		}
 	`
 

resource_obmcs_core_dhcp_options_test.go

@@ -45,21 +45,21 @@ func (s *ResourceCoreDHCPOptionsTestSuite) SetupTest() {
 	s.TimeCreated = baremetal.Time{Time: time.Now()}
 
 	s.Config = `
-		resource "baremetal_core_dhcp_options" "t" {
-			compartment_id = "${var.compartment_id}"
-			display_name = "display_name"
-      options {
-				type = "type"
-				custom_dns_servers = [ "custom_dns_servers" ]
-				server_type = "server_type"
-			}
-      options {
-				type = "type"
-				custom_dns_servers = [ "custom_dns_servers" ]
-				server_type = "server_type"
-			}
-			vcn_id = "vcn_id"
+	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}"
+	}
 	`
 	s.Config += testProviderConfig()
 
@@ -113,15 +113,18 @@ func (s *ResourceCoreDHCPOptionsTestSuite) TestCreateResourceCoreDHCPOptions() {
 				Check: resource.ComposeTestCheckFunc(
 
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Res.DisplayName),
-					resource.TestCheckResourceAttr(s.ResourceName, "options.0.type", "type"),
-					resource.TestCheckResourceAttr(s.ResourceName, "options.1.server_type", "server_type"),
+					resource.TestCheckResourceAttr(s.ResourceName, "options.0.type", "DomainNameServer"),
+					resource.TestCheckResourceAttr(s.ResourceName, "options.0.server_type", "CustomDnsServer"),
 				),
 			},
 		},
 	})
 }
 
 func (s ResourceCoreDHCPOptionsTestSuite) TestUpdateDHCPOptions() {
+	if IsAccTest() {
+		s.T().Skip()
+	}
 	s.Client.On("GetDHCPOptions", "id").Return(s.Res, nil).Times(3)
 
 	config := `

resource_obmcs_core_drg_attachment_test.go

@@ -45,11 +45,20 @@ func (s *ResourceCoreDrgAttachmentTestSuite) SetupTest() {
 	s.TimeCreated = baremetal.Time{Time: time.Now()}
 
 	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_drg" "t" {
+			compartment_id = "${var.compartment_id}"
+			display_name = "display_name"
+		}
 		resource "baremetal_core_drg_attachment" "t" {
 			compartment_id = "${var.compartment_id}"
 			display_name = "display_name"
-			drg_id = "drg_id"
-			vcn_id = "vcn_id"
+			drg_id = "${baremetal_core_drg.t.id}"
+			vcn_id = "${baremetal_core_virtual_network.t.id}"
 		}
 	`
 	s.Config += testProviderConfig()

resource_obmcs_core_drg_test.go

@@ -106,6 +106,9 @@ func (s *ResourceCoreDrgTestSuite) TestCreateResourceCoreDrg() {
 }
 
 func (s *ResourceCoreDrgTestSuite) TestCreateResourceCoreDrgWithoutDisplayName() {
+	if IsAccTest() {
+		s.T().Skip()
+	}
 	s.Client.On("GetDrg", "id").Return(s.Res, nil).Times(2)
 	s.Client.On("GetDrg", "id").Return(s.DeletedRes, nil)