Add more accptance tests to LBs, test all objects with/without certs, test backends without optional options.

Author: mikejihbe

resource_obmcs_loadbalancer_backend.go

@@ -59,6 +59,7 @@ func LoadBalancerBackendResource() *schema.Resource {
 			"weight": {
 				Type:     schema.TypeInt,
 				Optional: true,
+				Computed: true,
 			},
 			// internal for work request access
 			"state": {

resource_obmcs_loadbalancer_listener.go

@@ -129,16 +129,17 @@ func (s *LoadBalancerListenerResourceCrud) DeletedTarget() []string {
 }
 
 func (s *LoadBalancerListenerResourceCrud) sslConfig() (sslConfig *baremetal.SSLConfiguration) {
-	sslConfig = &baremetal.SSLConfiguration{}
 	vs := s.D.Get("ssl_configuration").([]interface{})
 	if len(vs) == 1 {
+		sslConfig = new(baremetal.SSLConfiguration)
 		v := vs[0].(map[string]interface{})
 		sslConfig.CertificateName = v["certificate_name"].(string)
 		sslConfig.VerifyDepth = v["verify_depth"].(int)
 		sslConfig.VerifyPeerCertificate = v["verify_peer_certificate"].(bool)
+		return sslConfig
 	}
 
-	return
+	return nil
 }
 
 func (s *LoadBalancerListenerResourceCrud) Create() (e error) {

resource_obmcs_loadbalancer_loadbalancer.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/oracle/terraform-provider-baremetal/client"
 	"github.com/oracle/terraform-provider-baremetal/crud"
+	"strings"
 )
 
 func LoadBalancerResource() *schema.Resource {
@@ -228,6 +229,10 @@ func (s *LoadBalancerResourceCrud) SetData() {
 
 // Delete makes a request to delete the load balancer
 func (s *LoadBalancerResourceCrud) Delete() (e error) {
+	// TODO: make sure this actually works
+	if strings.Contains(s.D.Id(), "ocid1.loadbalancerworkrequest") {
+		return
+	}
 	var workReqID string
 	workReqID, e = s.Client.DeleteLoadBalancer(s.D.Id(), nil)
 	if e != nil {

resource_obmcs_loadbalancer_test.go

@@ -70,6 +70,21 @@ resource "baremetal_load_balancer_backendset" "t" {
   }
 }
 
+
+resource "baremetal_load_balancer_backendset" "tcp" {
+  load_balancer_id = "${baremetal_load_balancer.t.id}"
+  name             = "stub_backendset_name_tcp"
+  policy           = "ROUND_ROBIN"
+
+  health_checker {
+    interval_ms         = 30000
+    port                = 1234
+    protocol            = "TCP"
+    response_body_regex = ".*"
+    url_path = "/"
+  }
+}
+
 resource "baremetal_load_balancer_listener" "t" {
   load_balancer_id         = "${baremetal_load_balancer.t.id}"
   name                     = "stub_listener_name"
@@ -84,6 +99,22 @@ resource "baremetal_load_balancer_listener" "t" {
   }
 }
 
+resource "baremetal_load_balancer_listener" "tcp" {
+  load_balancer_id         = "${baremetal_load_balancer.t.id}"
+  name                     = "stub_listener_name_tcp"
+  default_backend_set_name = "${baremetal_load_balancer_backendset.tcp.name}"
+  port                     = 8080
+  protocol                 = "TCP"
+}
+
+resource "baremetal_load_balancer_listener" "no_cert" {
+  load_balancer_id         = "${baremetal_load_balancer.t.id}"
+  name                     = "stub_listener_name_no_cert"
+  default_backend_set_name = "${baremetal_load_balancer_backendset.t.name}"
+  port                     = 80
+  protocol                 = "HTTP"
+}
+
 resource "baremetal_load_balancer_backend" "t" {
   load_balancer_id = "${baremetal_load_balancer.t.id}"
   backendset_name  = "${baremetal_load_balancer_backendset.t.name}"
@@ -94,6 +125,24 @@ resource "baremetal_load_balancer_backend" "t" {
   offline          = true
   weight           = 1
 }
+
+resource "baremetal_load_balancer_backend" "f" {
+  load_balancer_id = "${baremetal_load_balancer.t.id}"
+  backendset_name  = "${baremetal_load_balancer_backendset.t.name}"
+  ip_address       = "1.2.3.5"
+  port             = 1234
+  backup           = false
+  drain            = false
+  offline          = false
+  weight           = 1
+}
+
+resource "baremetal_load_balancer_backend" "minimal" {
+  load_balancer_id = "${baremetal_load_balancer.t.id}"
+  backendset_name  = "${baremetal_load_balancer_backendset.t.name}"
+  ip_address       = "1.2.3.6"
+  port             = 1234
+}
 `
 	s.Config += testProviderConfig()
 }
@@ -131,17 +180,34 @@ func (s *ResourceLoadBalancerTestSuite) TestCreateResourceLoadBalancerMaximal()
 
 					// Listener
 					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.t", "name", "stub_listener_name"),
-
 					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.t", "ssl_configuration.0.certificate_name", "stub_certificate_name"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.t", "ssl_configuration.0.verify_depth", "6"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.t", "ssl_configuration.0.verify_peer_certificate", "false"),
 
+					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.no_cert", "name", "stub_listener_name_no_cert"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.no_cert", "port", "80"),
+
+					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.tcp", "name", "stub_listener_name_tcp"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_listener.tcp", "port", "8080"),
+
 					// Backend
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.t", "ip_address", "1.2.3.4"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.t", "backup", "true"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.t", "drain", "true"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.t", "offline", "true"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.t", "weight", "1"),
+
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "ip_address", "1.2.3.5"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "backup", "false"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "drain", "false"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "offline", "false"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "weight", "1"),
+
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.minimal", "ip_address", "1.2.3.6"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.minimal", "backup", "false"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.minimal", "drain", "false"),
+					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.minimal", "offline", "false"),
+					resource.TestCheckResourceAttrSet("baremetal_load_balancer_backend.minimal", "weight"),
 				),
 			},
 		},