Add in a slightly hacky fix to handle updating backendsets, remove name from backends to correspond to updated API

Author: mikejihbe

data_source_obmcs_load_balancer_backends_test.go

@@ -31,8 +31,8 @@ data "baremetal_load_balancer_backends" "t" {
 	backendsetName := "stub_backendset_name"
 	list := &baremetal.ListBackends{
 		Backends: []baremetal.Backend{
-			{Name: "stub_name1"},
-			{Name: "stub_name2"},
+			{IPAddress: "123.123.123.123"},
+			{IPAddress: "122.122.122.122"},
 		},
 	}
 	client.On(
@@ -50,8 +50,8 @@ data "baremetal_load_balancer_backends" "t" {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "load_balancer_id", loadbalancerID),
 					resource.TestCheckResourceAttr(resourceName, "backends.#", "2"),
-					resource.TestCheckResourceAttr(resourceName, "backends.0.name", "stub_name1"),
-					resource.TestCheckResourceAttr(resourceName, "backends.1.name", "stub_name2"),
+					resource.TestCheckResourceAttr(resourceName, "backends.0.name", "123.123.123.123"),
+					resource.TestCheckResourceAttr(resourceName, "backends.1.name", "122.122.122.122"),
 				),
 			},
 		},

data_source_obmcs_loadbalancer_backend.go

@@ -59,7 +59,6 @@ func (s *BackendDatasourceCrud) SetData() {
 		resources := []map[string]interface{}{}
 		for _, v := range s.Res.Backends {
 			res := map[string]interface{}{
-				"name":       v.Name,
 				"ip_address": v.IPAddress,
 				"port":       v.Port,
 				"backup":     v.Backup,

data_source_obmcs_loadbalancer_backendset.go

@@ -81,7 +81,6 @@ func (s *BackendSetDatasourceCrud) SetData() {
 		backends := []map[string]interface{}{}
 		for _, backend := range v.Backends {
 			res := map[string]interface{}{
-				"name":       backend.Name,
 				"ip_address": backend.IPAddress,
 				"port":       backend.Port,
 				"backup":     backend.Backup,

resource_obmcs_loadbalancer_backend.go

@@ -30,10 +30,6 @@ func LoadBalancerBackendResource() *schema.Resource {
 				Required: true,
 				ForceNew: true,
 			},
-			"name": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"ip_address": {
 				Type:     schema.TypeString,
 				Required: true,

resource_obmcs_loadbalancer_backend_set.go

@@ -163,6 +163,13 @@ func (s *LoadBalancerBackendSetResourceCrud) Update() (e error) {
 	opts.SSLConfig = s.sslConfig()
 	opts.Policy = s.D.Get("policy").(string)
 
+	// This is hacky and a race condition, but works for now. Ideally backends are not a required parameter to a backendset update
+	bes, err := s.Client.GetBackendSet(s.D.Get("load_balancer_id").(string), s.D.Id(), nil)
+	if err != nil {
+		return err
+	}
+	opts.Backends = bes.Backends
+
 	var workReqID string
 	workReqID, e = s.Client.UpdateBackendSet(s.D.Get("load_balancer_id").(string), s.D.Id(), opts)
 	if e != nil {
@@ -209,7 +216,6 @@ func (s *LoadBalancerBackendSetResourceCrud) SetData() {
 			"backup":     v.Backup,
 			"drain":      v.Drain,
 			"ip_address": v.IPAddress,
-			"name":       v.Name,
 			"offline":    v.Offline,
 			"port":       v.Port,
 			"weight":     v.Weight,
@@ -266,7 +272,6 @@ func (s *LoadBalancerBackendSetResourceCrud) backends() []baremetal.Backend {
 			Backup:    v["backup"].(bool),
 			Drain:     v["drain"].(bool),
 			IPAddress: v["ip_address"].(string),
-			Name:      v["name"].(string),
 			Offline:   v["offline"].(bool),
 			Port:      v["port"].(int),
 			Weight:    v["weight"].(int),

resource_obmcs_loadbalancer_listener.go

@@ -223,7 +223,6 @@ func (s *LoadBalancerListenerResourceCrud) SetData() {
 	s.D.Set("default_backend_set_name", s.Resource.DefaultBackendSetName)
 	s.D.Set("port", s.Resource.Port)
 	s.D.Set("protocol", s.Resource.Protocol)
-	// TODO: verify testing
 	s.D.Set("ssl_configuration", s.Resource.SSLConfig)
 }
 

resource_obmcs_loadbalancer_test.go

@@ -4,7 +4,7 @@ package main
 
 import (
 	"testing"
-	//"regexp"
+	"regexp"
 
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
@@ -322,7 +322,7 @@ resource "baremetal_load_balancer_backend" "f" {
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backend.f", "backup", "true"),
 					resource.TestCheckResourceAttr("baremetal_load_balancer_backendset.t", "ssl_configuration.0.certificate_name", "stub_certificate_name"),
 				),
-				//ExpectError: regexp.
+				ExpectError: regexp.MustCompile("state FAILED"),
 			},
 		},
 	})