TF now waits for instances to be AVAILABLE

core/drg_resource_crud.go

@@ -32,10 +32,6 @@ func (s *DrgResourceCrud) DeletedTarget() []string {
 	return []string{baremetal.ResourceTerminated}
 }
 
-func (s *DrgResourceCrud) State() string {
-	return s.Res.State
-}
-
 func (s *DrgResourceCrud) Create() (e error) {
 	opts := &baremetal.CreateOptions{}
 	compartmentID := s.D.Get("compartment_id").(string)

core/instance_resource_crud.go

@@ -3,8 +3,9 @@
 package core
 
 import (
-	"github.com/MustWin/baremetal-sdk-go"
+	"time"
 
+	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/crud"
 )
 
@@ -17,6 +18,10 @@ func (s *InstanceResourceCrud) ID() string {
 	return s.Resource.ID
 }
 
+func (s *InstanceResourceCrud) CustomTimeout() time.Duration {
+	return 15 * time.Minute
+}
+
 func (s *InstanceResourceCrud) CreatedPending() []string {
 	return []string{
 		baremetal.ResourceProvisioning,

core/security_list_datasource_crud.go

@@ -67,6 +67,7 @@ func (s *SecurityListDatasourceCrud) SetData() {
 					egressRule.ICMPOptions,
 					egressRule.TCPOptions,
 					egressRule.UDPOptions,
+					&egressRule.IsStateless,
 				)
 				confEgressRules = append(confEgressRules, confEgressRule)
 			}
@@ -82,6 +83,7 @@ func (s *SecurityListDatasourceCrud) SetData() {
 					ingressRule.ICMPOptions,
 					ingressRule.TCPOptions,
 					ingressRule.UDPOptions,
+					nil,
 				)
 				confIngressRules = append(confIngressRules, confIngressRule)
 			}

core/security_list_resource.go

@@ -77,6 +77,11 @@ func SecurityListResource() *schema.Resource {
 						},
 						"tcp_options": transportSchema,
 						"udp_options": transportSchema,
+						"stateless": {
+							Type:     schema.TypeBool,
+							Optional: true,
+							Default: false,
+						},
 					},
 				},
 			},

core/security_list_resource_crud.go

@@ -3,9 +3,6 @@
 package core
 
 import (
-	"time"
-	"fmt"
-
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/crud"
 )
@@ -35,11 +32,6 @@ func (s *SecurityListResourceCrud) DeletedTarget() []string {
 	return []string{baremetal.ResourceTerminated}
 }
 
-func (s *SecurityListResourceCrud) ExtraWaitPostDelete() time.Duration {
-	fmt.Println("=====================================")
-	return time.Duration(0 * time.Second)
-}
-
 func (s *SecurityListResourceCrud) State() string {
 	return s.Res.State
 }
@@ -91,6 +83,7 @@ func (s *SecurityListResourceCrud) SetData() {
 			egressRule.ICMPOptions,
 			egressRule.TCPOptions,
 			egressRule.UDPOptions,
+			&egressRule.IsStateless,
 		)
 		confEgressRules = append(confEgressRules, confEgressRule)
 	}
@@ -106,6 +99,7 @@ func (s *SecurityListResourceCrud) SetData() {
 			ingressRule.ICMPOptions,
 			ingressRule.TCPOptions,
 			ingressRule.UDPOptions,
+			nil,
 		)
 		confIngressRules = append(confIngressRules, confIngressRule)
 	}
@@ -131,6 +125,7 @@ func (s *SecurityListResourceCrud) buildEgressRules() (sdkRules []baremetal.Egre
 			Protocol:    confRule["protocol"].(string),
 			TCPOptions:  s.buildTCPOptions(confRule),
 			UDPOptions:  s.buildUDPOptions(confRule),
+			IsStateless: confRule["stateless"].(bool),
 		}
 
 		sdkRules = append(sdkRules, sdkRule)
@@ -218,6 +213,7 @@ func buildConfRule(
 	icmpOpts *baremetal.ICMPOptions,
 	tcpOpts *baremetal.TCPOptions,
 	udpOpts *baremetal.UDPOptions,
+	stateless *bool,
 ) map[string]interface{} {
 	confRule["protocol"] = protocol
 	if icmpOpts != nil {
@@ -229,5 +225,8 @@ func buildConfRule(
 	if udpOpts != nil {
 		confRule["udp_options"] = buildConfTransportOptions(udpOpts.DestinationPortRange)
 	}
+	if stateless != nil {
+		confRule["stateless"] = *stateless
+	}
 	return confRule
 }

core/subnet_resource_crud.go

@@ -4,7 +4,6 @@ package core
 
 import (
 	"time"
-	"fmt"
 
 	"github.com/MustWin/baremetal-sdk-go"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/crud"
@@ -36,8 +35,7 @@ func (s *SubnetResourceCrud) DeletedTarget() []string {
 }
 
 func (s *SubnetResourceCrud) ExtraWaitPostDelete() time.Duration {
-	fmt.Println("=====================================")
-	return time.Duration(10 * time.Second)
+	return time.Duration(15 * time.Second)
 }
 
 func (s *SubnetResourceCrud) Create() (e error) {

core/virtual_network_resource_crud.go

@@ -32,10 +32,6 @@ func (s *VirtualNetworkResourceCrud) DeletedTarget() []string {
 	return []string{baremetal.ResourceTerminated}
 }
 
-func (s *VirtualNetworkResourceCrud) State() string {
-	return s.Res.State
-}
-
 func (s *VirtualNetworkResourceCrud) Create() (e error) {
 	cidrBlock := s.D.Get("cidr_block").(string)
 	compartmentID := s.D.Get("compartment_id").(string)

core_instance_test.go

@@ -12,6 +12,8 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
+	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/core"
+	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/crud"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -64,7 +66,7 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
 		CompartmentID:      "compartment_id",
 		DisplayName:        "display_name",
 		ID:                 "id",
-		ImageID:              "imageid",
+		ImageID:            "imageid",
 		Metadata: map[string]string{
 			"ssh_authorized_keys": "mypublickey",
 		},
@@ -76,7 +78,8 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
 	s.Res.ETag = "etag"
 	s.Res.RequestID = "opcrequestid"
 
-	s.DeletedRes = s.Res
+	s.DeletedRes = &baremetal.Instance{}
+	*s.DeletedRes = *s.Res
 	s.DeletedRes.State = baremetal.ResourceTerminated
 
 	opts := &baremetal.LaunchInstanceOptions{}
@@ -94,7 +97,8 @@ func (s *ResourceCoreInstanceTestSuite) SetupTest() {
 }
 
 func (s *ResourceCoreInstanceTestSuite) TestCreateResourceCoreInstance() {
-	s.Client.On("GetInstance", "id").Return(s.Res, nil)
+	s.Client.On("GetInstance", "id").Return(s.Res, nil).Twice()
+	s.Client.On("GetInstance", "id").Return(s.DeletedRes, nil)
 
 	resource.UnitTest(s.T(), resource.TestCase{
 		Providers: s.Providers,
@@ -116,7 +120,8 @@ func (s *ResourceCoreInstanceTestSuite) TestCreateResourceCoreInstance() {
 }
 
 func (s *ResourceCoreInstanceTestSuite) TestCreateResourceCoreInstanceWithoutDisplayName() {
-	s.Client.On("GetInstance", "id").Return(s.Res, nil)
+	s.Client.On("GetInstance", "id").Return(s.Res, nil).Twice()
+	s.Client.On("GetInstance", "id").Return(s.DeletedRes, nil)
 
 	s.Config = `
 		resource "baremetal_core_instance" "t" {
@@ -180,7 +185,7 @@ func (s ResourceCoreInstanceTestSuite) TestUpdateInstanceDisplayName() {
 		CompartmentID:      "compartment_id",
 		DisplayName:        "new_display_name",
 		ID:                 "id",
-		ImageID:              "imageid",
+		ImageID:            "imageid",
 		Metadata: map[string]string{
 			"ssh_authorized_keys": "mypublickey",
 		},
@@ -195,7 +200,8 @@ func (s ResourceCoreInstanceTestSuite) TestUpdateInstanceDisplayName() {
 	opts := &baremetal.UpdateOptions{}
 	opts.DisplayName = "new_display_name"
 	s.Client.On("UpdateInstance", "id", opts).Return(res, nil)
-	s.Client.On("GetInstance", "id").Return(res, nil)
+	s.Client.On("GetInstance", "id").Return(res, nil).Times(2)
+	s.Client.On("GetInstance", "id").Return(s.DeletedRes, nil).Times(2)
 
 	resource.UnitTest(s.T(), resource.TestCase{
 		Providers: s.Providers,
@@ -214,7 +220,7 @@ func (s ResourceCoreInstanceTestSuite) TestUpdateInstanceDisplayName() {
 }
 
 func (s ResourceCoreInstanceTestSuite) TestUpdateAvailabilityDomainForcesNewInstance() {
-	s.Client.On("GetInstance", "id").Return(s.Res, nil)
+	s.Client.On("GetInstance", "id").Return(s.Res, nil).Times(2)
 
 	config := `
 		resource "baremetal_core_instance" "t" {
@@ -237,7 +243,7 @@ func (s ResourceCoreInstanceTestSuite) TestUpdateAvailabilityDomainForcesNewInst
 		CompartmentID:      "compartment_id",
 		DisplayName:        "display_name",
 		ID:                 "new_id",
-		ImageID:              "imageid",
+		ImageID:            "imageid",
 		Metadata: map[string]string{
 			"ssh_authorized_keys": "mypublickey",
 		},
@@ -261,8 +267,10 @@ func (s ResourceCoreInstanceTestSuite) TestUpdateAvailabilityDomainForcesNewInst
 		"subnetid",
 		opts).Return(res, nil)
 
-	s.Client.On("GetInstance", res.ID).Return(res, nil)
+	s.Client.On("GetInstance", s.Res.ID).Return(s.DeletedRes, nil)
+	s.Client.On("GetInstance", res.ID).Return(res, nil).Times(2)
 	s.Client.On("TerminateInstance", res.ID, (*baremetal.IfMatchOptions)(nil)).Return(nil)
+	s.Client.On("GetInstance", "new_id").Return(s.DeletedRes, nil).Twice()
 
 	resource.UnitTest(s.T(), resource.TestCase{
 		Providers: s.Providers,
@@ -300,6 +308,14 @@ func (s *ResourceCoreInstanceTestSuite) TestTerminateInstance() {
 	s.Client.AssertCalled(s.T(), "TerminateInstance", "id", (*baremetal.IfMatchOptions)(nil))
 }
 
+func TestIsStatefulResource(t *testing.T) {
+	var sr crud.StatefulResource
+	sr = &core.InstanceResourceCrud{}
+	if sr == nil {
+		t.Fail()
+	}
+}
+
 func TestResourceCoreInstanceTestSuite(t *testing.T) {
 	suite.Run(t, new(ResourceCoreInstanceTestSuite))
 }

core_internet_gateway_test.go

@@ -13,6 +13,8 @@ import (
 	"github.com/hashicorp/terraform/terraform"
 
 	"github.com/stretchr/testify/suite"
+	//	"errors"
+	"errors"
 )
 
 type ResourceCoreInternetGatewayTestSuite struct {
@@ -65,7 +67,8 @@ func (s *ResourceCoreInternetGatewayTestSuite) SetupTest() {
 	s.Res.ETag = "etag"
 	s.Res.RequestID = "requestid"
 
-	s.DeletedRes = s.Res
+	s.DeletedRes = &baremetal.InternetGateway{}
+	*s.DeletedRes = *s.Res
 	s.DeletedRes.State = baremetal.ResourceTerminated
 
 	opts := &baremetal.CreateOptions{}
@@ -80,7 +83,8 @@ func (s *ResourceCoreInternetGatewayTestSuite) SetupTest() {
 }
 
 func (s *ResourceCoreInternetGatewayTestSuite) TestCreateResourceCoreInternetGateway() {
-	s.Client.On("GetInternetGateway", "id").Return(s.Res, nil)
+	s.Client.On("GetInternetGateway", "id").Return(s.Res, nil).Times(2)
+	s.Client.On("GetInternetGateway", "id").Return(s.DeletedRes, nil).Times(2)
 
 	resource.UnitTest(s.T(), resource.TestCase{
 		Providers: s.Providers,
@@ -100,7 +104,8 @@ func (s *ResourceCoreInternetGatewayTestSuite) TestCreateResourceCoreInternetGat
 }
 
 func (s ResourceCoreInternetGatewayTestSuite) TestUpdateCompartmentIDForcesNewInternetGateway() {
-	s.Client.On("GetInternetGateway", "id").Return(s.Res, nil)
+	s.Client.On("GetInternetGateway", s.Res.ID).Return(s.Res, nil).Times(2)
+	s.Client.On("GetInternetGateway", s.Res.ID).Return(s.DeletedRes, nil).Times(2)
 
 	config := `
   resource "baremetal_core_internet_gateway" "t" {
@@ -115,7 +120,7 @@ func (s ResourceCoreInternetGatewayTestSuite) TestUpdateCompartmentIDForcesNewIn
 	res := &baremetal.InternetGateway{
 		CompartmentID: "new_compartment_id",
 		DisplayName:   "display_name",
-		ID:            "id2",
+		ID:            "id",
 		IsEnabled:     true,
 		State:         baremetal.ResourceAvailable,
 		ModifiedTime:  s.TimeCreated,
@@ -124,6 +129,10 @@ func (s ResourceCoreInternetGatewayTestSuite) TestUpdateCompartmentIDForcesNewIn
 	s.Res.ETag = "etag"
 	s.Res.RequestID = "requestid"
 
+	delRes := &baremetal.InternetGateway{}
+	*delRes = *res
+	delRes.State = baremetal.ResourceTerminated
+
 	opts := &baremetal.CreateOptions{}
 	opts.DisplayName = "display_name"
 	s.Client.On(
@@ -133,9 +142,12 @@ func (s ResourceCoreInternetGatewayTestSuite) TestUpdateCompartmentIDForcesNewIn
 		res.IsEnabled,
 		opts).Return(res, nil)
 
-	s.Client.On("GetInternetGateway", res.ID).Return(res, nil)
 	s.Client.On("DeleteInternetGateway", res.ID, (*baremetal.IfMatchOptions)(nil)).Return(nil)
 
+	s.Client.On("GetInternetGateway", res.ID).Return(res, nil).Times(2)
+	s.Client.On("GetInternetGateway", res.ID).Return(delRes, nil).Once()
+	s.Client.On("GetInternetGateway", res.ID).Return(nil, errors.New("blah does not exist"))
+
 	resource.UnitTest(s.T(), resource.TestCase{
 		Providers: s.Providers,
 		Steps: []resource.TestStep{

core_security_list_test.go

@@ -12,8 +12,8 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
-	"github.com/stretchr/testify/suite"
 	"github.com/MustWin/terraform-Oracle-BareMetal-Provider/crud"
+	"github.com/stretchr/testify/suite"
 )
 
 type ResourceCoreSecurityListTestSuite struct {
@@ -59,6 +59,7 @@ func (s *ResourceCoreSecurityListTestSuite) SetupTest() {
 					"type" = 2
 				}
 				protocol = "protocol"
+				stateless = true
 			}
       ingress_security_rules {
 				tcp_options {
@@ -79,6 +80,7 @@ func (s *ResourceCoreSecurityListTestSuite) SetupTest() {
 			Destination: "destination",
 			ICMPOptions: &baremetal.ICMPOptions{Code: 1, Type: 2},
 			Protocol:    "protocol",
+			IsStateless: true,
 		},
 	}
 	ingressRules := []baremetal.IngressSecurityRule{
@@ -104,7 +106,6 @@ func (s *ResourceCoreSecurityListTestSuite) SetupTest() {
 	s.Res.ETag = "etag"
 	s.Res.RequestID = "opcrequestid"
 
-
 	deletingRes := *s.Res
 	s.DeletingRes = &deletingRes
 	s.DeletingRes.State = baremetal.ResourceTerminating
@@ -140,6 +141,7 @@ func (s *ResourceCoreSecurityListTestSuite) TestCreateResourceCoreSecurityList()
 					resource.TestCheckResourceAttr(s.ResourceName, "compartment_id", s.Res.CompartmentID),
 					resource.TestCheckResourceAttr(s.ResourceName, "display_name", s.Res.DisplayName),
 					resource.TestCheckResourceAttr(s.ResourceName, "egress_security_rules.0.icmp_options.0.code", "1"),
+					resource.TestCheckResourceAttr(s.ResourceName, "egress_security_rules.0.stateless", "true"),
 					resource.TestCheckResourceAttr(s.ResourceName, "ingress_security_rules.0.tcp_options.0.max", "2"),
 				),
 			},
@@ -161,6 +163,7 @@ func (s ResourceCoreSecurityListTestSuite) TestUpdateSecurityList() {
 					"type" = 2
 				}
 				protocol = "protocol"
+				stateless = true
 			}
       ingress_security_rules {
 				tcp_options {