Fix IPSec resources and acceptance tests (we were not handling state for some reason on these).

Author: mikejihbe

Makefile

@@ -16,6 +16,13 @@ test_acceptance_debug:
 	TF_LOG=DEBUG DEBUG=true TF_ORACLE_ENV=test TF_ACC=1 go test -v -timeout 120m
 
 test_acceptance:
+	# You MUST export these variables
+	# export TF_VAR_private_key_path=/Users/Mike/.ssh/oracle2
+	# export TF_VAR_fingerprint=46:08:e3:7b:95:0a:d6:5f:78:24:32:87:23:3f:56:31
+	# export TF_VAR_user_ocid=ocid1.user.oc1..aaaaaaaa5hpflij6krfusympeuugy2bawg25pralmnw7v4xdveysdpoxdjsk
+	# export TF_VAR_tenancy_ocid=ocid1.tenancy.oc1..aaaaaaaayfzsknaowsjdlheebqsaicjddtlubq7dnwz5izbvs3vfs4xmkargta
+	# export TF_VAR_compartment_id=ocid1.compartment.oc1..aaaaaaaajszpk2siudrmdhaknxvny7vktxk2dm43xpk7sa5d4vmrol2n2qsa
+	# export TF_VAR_namespace=mustwin
 	TF_ORACLE_ENV=test TF_ACC=1 go test -v -timeout 120m
 
 build:

data_source_obmcs_core_ipsec_config_test.go

@@ -39,6 +39,7 @@ func (s *DatasourceCoreIPSecConfigTestSuite) SetupTest() {
 			compartment_id = "${var.compartment_id}"
 			display_name = "displayname"
       			ip_address = "123.123.123.123"
+  			depends_on = ["baremetal_core_drg.t"}
 		}
 		resource "baremetal_core_ipsec" "t" {
 			compartment_id = "${var.compartment_id}"

resource_obmcs_core_ipsec_connection.go

@@ -98,17 +98,21 @@ func (s *IPSecConnectionResourceCrud) ID() string {
 	return s.Resource.ID
 }
 
-// TODO: I'm not sure whether we need to
-//       manage delete states for IPSec tunnels.
-//       We'll need to determine this in testing.
-// func (s *IPSecSync) CreatedTarget() []string {
-// 	return []string{baremetal.ResourceUp,
-//   baremetal.ResourceDownForMaintenance}
-// }
-//
-// func (s *IPSecSync) DeletedTarget() []string {
-// 	return []string{baremetal.ResourceDown}
-// }
+func (s *IPSecConnectionResourceCrud) CreatedPending() []string {
+	return []string{baremetal.ResourceProvisioning}
+}
+
+func (s *IPSecConnectionResourceCrud) CreatedTarget() []string {
+	return []string{baremetal.ResourceAvailable}
+}
+
+func (s *IPSecConnectionResourceCrud) DeletedPending() []string {
+	return []string{baremetal.ResourceTerminating}
+}
+
+func (s *IPSecConnectionResourceCrud) DeletedTarget() []string {
+	return []string{baremetal.ResourceTerminated}
+}
 
 func (s *IPSecConnectionResourceCrud) Create() (e error) {
 	compartmentID := s.D.Get("compartment_id").(string)

resource_obmcs_core_ipsec_test.go

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

resource_obmcs_core_security_list_test.go

@@ -20,10 +20,8 @@ type ResourceCoreSecurityListTestSuite struct {
 	Providers    map[string]terraform.ResourceProvider
 	TimeCreated  baremetal.Time
 	Config       string
+	SLConfig     string
 	ResourceName string
-	Res          *baremetal.SecurityList
-	DeletingRes  *baremetal.SecurityList
-	DeletedRes   *baremetal.SecurityList
 }
 
 func extraWait(ew crud.ExtraWaitPostCreateDelete) {
@@ -68,7 +66,8 @@ resource "baremetal_core_route_table" "RouteForComplete" {
         network_entity_id = "${baremetal_core_internet_gateway.CompleteIG.id}"
     }
 }
-
+`
+	s.SLConfig = `
 resource "baremetal_core_security_list" "t" {
     compartment_id = "${var.compartment_id}"
     display_name = "Public"
@@ -104,9 +103,11 @@ func (s *ResourceCoreSecurityListTestSuite) TestCreateResourceCoreSecurityList()
 			{
 				ImportState:       true,
 				ImportStateVerify: true,
-				Config:            s.Config,
+				Config:            s.Config + s.SLConfig,
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "Public"),
+					resource.TestCheckResourceAttr(s.ResourceName, "egress_security_rules.#", "1"),
+					resource.TestCheckResourceAttr(s.ResourceName, "ingress_security_rules.#", "2"),
 					resource.TestCheckResourceAttr(s.ResourceName, "egress_security_rules.0.stateless", "false"),
 					resource.TestCheckResourceAttr(s.ResourceName, "ingress_security_rules.0.tcp_options.0.max", "80"),
 				),
@@ -115,6 +116,37 @@ func (s *ResourceCoreSecurityListTestSuite) TestCreateResourceCoreSecurityList()
 	})
 }
 
+func (s *ResourceCoreSecurityListTestSuite) TestCreateResourceCoreSecurityListRemoveRules() {
+
+	resource.UnitTest(s.T(), resource.TestCase{
+		Providers: s.Providers,
+		Steps: []resource.TestStep{
+			{
+				ImportState:       true,
+				ImportStateVerify: true,
+				Config:            s.Config + s.SLConfig,
+			},
+			{
+				Config: s.Config + `
+					resource "baremetal_core_security_list" "t" {
+					    compartment_id = "${var.compartment_id}"
+					    display_name = "Public"
+					    vcn_id = "${baremetal_core_virtual_network.t.id}"
+					    egress_security_rules = []
+					    ingress_security_rules = []
+					}
+				`,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr(s.ResourceName, "display_name", "Public"),
+					resource.TestCheckResourceAttr(s.ResourceName, "egress_security_rules.#", "0"),
+					resource.TestCheckResourceAttr(s.ResourceName, "ingress_security_rules.#", "0"),
+				),
+			},
+		},
+	})
+}
+
+
 func (s *ResourceCoreSecurityListTestSuite) TestDeleteSecurityList() {
 
 	resource.UnitTest(s.T(), resource.TestCase{