Merge pull request #7 from citrix/support_multiple_lb_vservers

Support multiple lb vservers per servicegroup

Makefile

@@ -39,4 +39,4 @@ release: clean build
 	tar cvzf terraform-provider-netscaler-darwin-amd64.tar.gz terraform-provider-netscaler
 
 release-linux: clean build-linux
-	tar cvzf terraform-provider-netscaler-darwin-amd64.tar.gz terraform-provider-netscaler
+	tar cvzf terraform-provider-netscaler-linux-amd64.tar.gz terraform-provider-netscaler

config.tf

@@ -103,7 +103,7 @@ resource "netscaler_lbmonitor" "foo-monitor-2" {
 
 resource "netscaler_servicegroup" "backend_group" {
   servicegroupname = "backend_group_1"
-  lbvserver = "${netscaler_lbvserver.sample_lb2.name}"
+  lbvservers = ["${netscaler_lbvserver.sample_lb.name}"]
   servicetype = "HTTP"
   lbmonitor = "${netscaler_lbmonitor.foo-monitor.monitorname}"
   servicegroupmembers = ["172.20.0.20:200:50","172.20.0.101:80:10",  "172.20.0.10:80:40"]

examples/content_switch_ssl_lb_mon/resources.tf

@@ -45,7 +45,7 @@ resource "netscaler_lbvserver" "lb_catalog" {
 
 resource "netscaler_servicegroup" "backend_cart" {
   servicegroupname = "${lookup(var.backend_service_config_cart, "name")}"
-  lbvserver = "${netscaler_lbvserver.lb_cart.name}"
+  lbvservers = ["${netscaler_lbvserver.lb_cart.name}"]
   lbmonitor = "${netscaler_lbmonitor.cart_monitor.monitorname}"
   servicetype = "${lookup(var.backend_service_config_cart, "servicetype")}"
   clttimeout = "${lookup(var.backend_service_config_cart, "client_timeout")}"
@@ -54,7 +54,7 @@ resource "netscaler_servicegroup" "backend_cart" {
 
 resource "netscaler_servicegroup" "backend_catalog" {
   servicegroupname = "${lookup(var.backend_service_config_catalog, "name")}"
-  lbvserver = "${netscaler_lbvserver.lb_catalog.name}"
+  lbvservers = ["${netscaler_lbvserver.lb_catalog.name}"]
   lbmonitor = "${netscaler_lbmonitor.catalog_monitor.monitorname}"
   servicegroupmembers = "${var.backend_services_catalog}"
   servicetype = "${lookup(var.backend_service_config_catalog, "servicetype")}"

examples/simple_lb/provider.tf

@@ -1,3 +1,3 @@
 provider "netscaler" {
-    endpoint = "http://localhost:32772/"
+    endpoint = "http://localhost:32783/"
 }

examples/simple_lb/resources.tf

@@ -8,7 +8,7 @@ resource "netscaler_lbvserver" "production_lb" {
 
 resource "netscaler_servicegroup" "backend" {
   servicegroupname = "productionBackend"
-  lbvserver = "${netscaler_lbvserver.production_lb.name}"
+  lbvservers = ["${netscaler_lbvserver.production_lb.name}"]
   servicetype = "HTTP"
   clttimeout = "${lookup(var.backend_service_config, "clttimeout")}"
   servicegroupmembers = "${formatlist("%s:%s", var.backend_services, var.backend_service_config["backend_port"])}"

netscaler/resource_service.go

@@ -264,6 +264,7 @@ func resourceNetScalerService() *schema.Resource {
 			"lbmonitor": &schema.Schema{
 				Type:     schema.TypeString,
 				Optional: true,
+				Computed: true,
 			},
 		},
 	}
@@ -489,6 +490,7 @@ func readServiceFunc(d *schema.ResourceData, meta interface{}) error {
 		mon, ok := monitor["monitor_name"]
 		if ok {
 			boundMonitor = mon.(string)
+			log.Printf("[INFO] netscaler-provider:  Found %s  lbmonitor bound to %s", boundMonitor, serviceName)
 			break
 		}
 	}

netscaler/resource_servicegroup.go

@@ -246,10 +246,11 @@ func resourceNetScalerServicegroup() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
-
-			"lbvserver": &schema.Schema{
-				Type:     schema.TypeString,
-				Required: true,
+			"lbvservers": &schema.Schema{
+				Type:     schema.TypeSet,
+				Optional: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+				Set:      schema.HashString,
 			},
 			"lbmonitor": &schema.Schema{
 				Type:     schema.TypeString,
@@ -284,11 +285,15 @@ func createServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	lbvserver, lok := d.GetOk("lbvserver")
+	var lbvservers []string
+	l, lok := d.GetOk("lbvservers")
 	if lok {
-		exists := client.ResourceExists(netscaler.Lbvserver.Type(), lbvserver.(string))
-		if !exists {
-			return fmt.Errorf("[ERROR] netscaler-provider: Specified lb vserver does not exist on netscaler!")
+		lbvservers = expandStringList(l.(*schema.Set).List())
+		for _, lbvserver := range lbvservers {
+			exists := client.ResourceExists(netscaler.Lbvserver.Type(), lbvserver)
+			if !exists {
+				return fmt.Errorf("[ERROR] netscaler-provider: Specified lb vserver %s does not exist on netscaler!", lbvserver)
+			}
 		}
 	}
 
@@ -350,22 +355,10 @@ func createServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 	if err != nil {
 		return err
 	}
-	if lok { //lbvserver is specified
-		lbvserverName := d.Get("lbvserver").(string)
-		binding := lb.Lbvserverservicegroupbinding{
-			Name:             lbvserverName,
-			Servicegroupname: servicegroupName,
-		}
-		log.Printf("[INFO] netscaler-provider:  Binding servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
-		err = client.BindResource(netscaler.Lbvserver.Type(), lbvserverName, netscaler.Servicegroup.Type(), servicegroupName, &binding)
+	if lok { //lbvservers is specified
+		err = addLbvserverBindings(client, servicegroupName, lbvservers)
 		if err != nil {
-			log.Printf("[ERROR] netscaler-provider:  Failed to bind servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
-			err2 := client.DeleteResource(netscaler.Servicegroup.Type(), servicegroupName)
-			if err2 != nil {
-				log.Printf("[ERROR] netscaler-provider:  Failed to delete servicegroup %s after bind to lb vserver failed", servicegroupName)
-				return fmt.Errorf("[ERROR] netscaler-provider:  Failed to delete servicegroup %s after bind to lbvserver failed", servicegroupName)
-			}
-			return fmt.Errorf("[ERROR] netscaler-provider:  Failed to bind  servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
+			return err
 		}
 	}
 
@@ -470,6 +463,33 @@ func removeServicegroupMemberBindings(client *netscaler.NitroClient, servicegrou
 	return nil
 }
 
+func addLbvserverBindings(client *netscaler.NitroClient, servicegroupName string, lbvservers []string) error {
+	for _, lbvserverName := range lbvservers {
+		binding := lb.Lbvserverservicegroupbinding{
+			Name:             lbvserverName,
+			Servicegroupname: servicegroupName,
+		}
+		log.Printf("[INFO] netscaler-provider:  Binding servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
+		err := client.BindResource(netscaler.Lbvserver.Type(), lbvserverName, netscaler.Servicegroup.Type(), servicegroupName, &binding)
+		if err != nil {
+			log.Printf("[ERROR] netscaler-provider:  Failed to bind servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
+			return fmt.Errorf("[ERROR] netscaler-provider:  Failed to bind  servicegroup %s to lbvserver %s", servicegroupName, lbvserverName)
+		}
+	}
+	return nil
+}
+
+func removeLbvserverBindings(client *netscaler.NitroClient, servicegroupName string, lbvservers []string) error {
+	for _, lbvserverName := range lbvservers {
+		err := client.UnbindResource(netscaler.Lbvserver.Type(), lbvserverName, netscaler.Servicegroup.Type(), servicegroupName, "servicegroupname")
+		if err != nil {
+			log.Printf("[ERROR] netscaler-provider: Error unbinding lbvserver %s from servicegroup %s", lbvserverName, servicegroupName)
+			return fmt.Errorf("[ERROR] netscaler-provider: Error unbinding lbvserver %s from servicegroup %s", lbvserverName, servicegroupName)
+		}
+	}
+	return nil
+}
+
 func readServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 	log.Printf("[DEBUG] netscaler-provider:  In readServicegroupFunc")
 	client := meta.(*NetScalerNitroClient).client
@@ -488,7 +508,7 @@ func readServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 		d.SetId("")
 		return nil
 	}
-	//read bound vserver.
+	//read bound vservers.
 	vserverBindings, err := client.FindResourceArray(netscaler.Servicegroupbindings.Type(), servicegroupName)
 	if err != nil {
 		log.Printf("[WARN] netscaler-provider: Clearing servicegroup state %s", servicegroupName)
@@ -564,14 +584,15 @@ func readServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 
 	//vserverBindings is of type []map[string]interface{}
 	var boundVserver string
+	lbvservers := make([]string, 0, len(vserverBindings))
 	for _, vserver := range vserverBindings {
 		vs, ok := vserver["vservername"]
 		if ok {
 			boundVserver = vs.(string)
-			break
+			lbvservers = append(lbvservers, boundVserver)
 		}
 	}
-	d.Set("lbvserver", boundVserver)
+	d.Set("lbvservers", lbvservers)
 
 	var boundMonitor string
 	for _, monitor := range boundMonitors {
@@ -597,7 +618,7 @@ func updateServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 	}
 
 	hasChange := false
-	lbvserverChanged := false
+	lbvserversChanged := false
 	lbmonitorChanged := false
 	servicegroupmembersChanged := false
 
@@ -826,9 +847,9 @@ func updateServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 		servicegroup.Weight = d.Get("weight").(int)
 		hasChange = true
 	}
-	if d.HasChange("lbvserver") {
-		log.Printf("[DEBUG] netscaler-provider:  lb vserver has changed for servicegroup %s, starting update", servicegroupName)
-		lbvserverChanged = true
+	if d.HasChange("lbvservers") {
+		log.Printf("[DEBUG] netscaler-provider:  lb vservers has changed for servicegroup %s, starting update", servicegroupName)
+		lbvserversChanged = true
 	}
 	if d.HasChange("lbmonitor") {
 		log.Printf("[DEBUG] netscaler-provider:  lb monitor has changed for servicegroup %s, starting update", servicegroupName)
@@ -840,18 +861,26 @@ func updateServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 		servicegroupmembersChanged = true
 	}
 
-	lbvserverName := d.Get("lbvserver").(string)
-	if lbvserverChanged {
+	if lbvserversChanged {
 		//Binding has to be updated
-		//First we unbind from lb vserver
-		oldLbvserver, _ := d.GetChange("lbvserver")
-		oldLbvserverName := oldLbvserver.(string)
-		if oldLbvserverName != "" {
-			err := client.UnbindResource(netscaler.Lbvserver.Type(), oldLbvserverName, netscaler.Servicegroup.Type(), servicegroupName, "servicegroupname")
+		o, n := d.GetChange("lbvservers")
+		os := o.(*schema.Set)
+		ns := n.(*schema.Set)
+
+		remove := expandStringList(os.Difference(ns).List())
+		add := expandStringList(ns.Difference(os).List())
+
+		if len(remove) > 0 {
+			err := removeLbvserverBindings(client, servicegroupName, remove)
 			if err != nil {
-				return fmt.Errorf("[ERROR] netscaler-provider: Error unbinding lbvserver from servicegroup %s", oldLbvserverName)
+				return err
+			}
+		}
+		if len(add) > 0 {
+			err := addLbvserverBindings(client, servicegroupName, add)
+			if err != nil {
+				return err
 			}
-			log.Printf("[DEBUG] netscaler-provider: lbvserver has been unbound from servicegroup for lb vserver %s ", oldLbvserverName)
 		}
 	}
 
@@ -878,22 +907,6 @@ func updateServicegroupFunc(d *schema.ResourceData, meta interface{}) error {
 		}
 	}
 
-	if lbvserverChanged && lbvserverName != "" {
-		//Binding has to be updated
-		//rebind
-		binding := lb.Lbvserverservicegroupbinding{
-			Name:             lbvserverName,
-			Servicegroupname: servicegroupName,
-		}
-		log.Printf("[INFO] netscaler-provider:  Binding vserver %s to servicegroup %s", lbvserverName, servicegroupName)
-		err := client.BindResource(netscaler.Lbvserver.Type(), lbvserverName, netscaler.Servicegroup.Type(), servicegroupName, &binding)
-		if err != nil {
-			log.Printf("[ERROR] netscaler-provider:  Failed to bind  lbvserver %s to servicegroup %s", lbvserverName, servicegroupName)
-			return fmt.Errorf("[ERROR] netscaler-provider:  Failed to bind lb vserver %s to servicegroup %s", lbvserverName, servicegroupName)
-		}
-		log.Printf("[DEBUG] netscaler-provider: new lbvserver has been bound to servicegroup  lbvserver %s servicegroup %s", lbvserverName, servicegroupName)
-	}
-
 	if lbmonitorChanged && lbmonitorName != "" {
 		//Binding has to be updated
 		//rebind

netscaler/resource_servicegroup_test.go

@@ -102,22 +102,29 @@ func testAccCheckServicegroupDestroy(s *terraform.State) error {
 
 const testAccServicegroup_basic = `
 
-resource "netscaler_lbvserver" "foo" {
+resource "netscaler_lbvserver" "foo1" {
   
-  name = "foo_lb"
+  name = "foo_lb_1"
   ipv46 = "10.202.11.11"
   port = 80
   servicetype = "HTTP"
 }
 
+resource "netscaler_lbvserver" "foo2" {
+  
+  name = "foo_lb_2"
+  ipv46 = "10.202.11.12"
+  port = 80
+  servicetype = "HTTP"
+}
+
 
 resource "netscaler_servicegroup" "foo" {
   
   servicegroupname = "test_servicegroup"
   servicetype = "HTTP"
-  servicegroupmembers = ["172.20.0.9:80", "172.20.0.10:80", "172.20.0.11:8080"]
-  lbvserver = "foo_lb"
-  depends_on = ["netscaler_lbvserver.foo"]
-
+  servicegroupmembers = ["172.20.0.9:80:10", "172.20.0.10:80:10", "172.20.0.11:8080:20"]
+  lbvservers = ["foo_lb_1", "foo_lb_2"]
+  depends_on = ["netscaler_lbvserver.foo1", "netscaler_lbvserver.foo2"]
 }
 `

netscaler/resource_sslcertkey_test.go

@@ -54,7 +54,7 @@ func testAccCheckSslcertkeyExist(n string, id *string) resource.TestCheckFunc {
 		}
 
 		if rs.Primary.ID == "" {
-			return fmt.Errorf("No lb vserver name is set")
+			return fmt.Errorf("No ssl cert name is set")
 		}
 
 		if id != nil {
@@ -73,7 +73,7 @@ func testAccCheckSslcertkeyExist(n string, id *string) resource.TestCheckFunc {
 		}
 
 		if data == nil {
-			return fmt.Errorf("LB vserver %s not found", n)
+			return fmt.Errorf("SSL cert %s not found", n)
 		}
 
 		return nil
@@ -94,7 +94,7 @@ func testAccCheckSslcertkeyDestroy(s *terraform.State) error {
 
 		_, err := nsClient.FindResource(netscaler.Sslcertkey.Type(), rs.Primary.ID)
 		if err == nil {
-			return fmt.Errorf("LB vserver %s still exists", rs.Primary.ID)
+			return fmt.Errorf("SSL certkey %s still exists", rs.Primary.ID)
 		}
 
 	}