add a given vm to a custom VServerGroup

Author: chushenmeshile

ci/assets/terraform/terraform.tf

@@ -136,6 +136,11 @@ resource "alicloud_slb" "default" {
   address_type             = "internet"
 }
 
+
+resource "alicloud_slb_server_group" "default" {
+  load_balancer_id = alicloud_slb.default.id
+  name             = var.env_name
+}
 resource "alicloud_slb_listener" "http" {
   load_balancer_id = alicloud_slb.default.id
   backend_port     = 80
@@ -272,6 +277,10 @@ output "slb" {
   value = alicloud_slb.default.id
 }
 
+output "server_group_slb" {
+  value = alicloud_slb_server_group.default.id
+}
+
 output "blobstore_bucket" {
   value = alicloud_oss_bucket.blobstore.id
 }

ci/tasks/run-integration.sh

@@ -45,6 +45,7 @@ exportMetadata2Env CPI_INTERNAL_GW internal_gw
 exportMetadata2Env CPI_EXTERNAL_IP external_ip
 exportMetadata2Env CPI_STEMCELL_OSS_BUCKET integration_bucket
 exportMetadata2Env CPI_SLB_ID slb
+exportMetadata2Env CPI_SLB_SERVER_GROUP_ID server_group_slb
 exportMetadata2Env RAM_ROLE_NAME ram_role
 export CIDR_NOTATION=$(getCidrNotation $CPI_INTERNAL_CIDR)
 export CPI_INTERNAL_NETMASK=$(cdr2mask $CIDR_NOTATION)

src/bosh-alicloud-cpi/action/create_vm.go

@@ -8,6 +8,7 @@ import (
 	"bosh-alicloud-cpi/registry"
 	"encoding/json"
 	"fmt"
+	"strconv"
 	"strings"
 
 	bosherr "github.com/cloudfoundry/bosh-utils/errors"
@@ -42,6 +43,8 @@ type InstanceProps struct {
 	AvailabilityZone string                    `json:"availability_zone"`
 	InstanceName     string                    `json:"instance_name"`
 	InstanceType     string                    `json:"instance_type"`
+	SlbServerGroupPort string	`json:"slb_server_group_port"`
+	SlbServerGroup     []string                    `json:"slb_server_group"`
 	Slbs             []string                  `json:"slbs"`
 	SlbWeight        json.Number               `json:"slb_weight"`
 	Password         string                    `json:"password"`
@@ -368,6 +371,18 @@ func (a CreateVMMethod) updateInstance(instCid string, associatedDiskCIDs []apiv
 			return bosherr.WrapErrorf(err, "bind %s to slb %s failed ", instCid, slb)
 		}
 	}
+	slbServerGroupPort,err:=strconv.Atoi(instProps.SlbServerGroupPort)
+	if err!=nil{
+		slbServerGroupPort=alicloud.DefaultSlbServerGroupProt
+	}else if slbServerGroupPort==0{
+		slbServerGroupPort=alicloud.DefaultSlbServerGroupProt
+	}
+	for _,slbServerGroup:=range instProps.SlbServerGroup{
+		err := a.networks.BindSlbServerGroup(instProps.Region, instCid, slbServerGroup, int(slbWeight),slbServerGroupPort)
+		if err != nil {
+			return bosherr.WrapErrorf(err, "bind %s to slbServerGroup %s failed,weight:%d,prot:%d ", instCid, slbServerGroup,int(slbWeight),slbServerGroupPort)
+		}
+	}
 	return nil
 }
 

src/bosh-alicloud-cpi/alicloud/config.go

@@ -52,6 +52,7 @@ const (
 	DefaultSlbWeight      = 100
 	BoshCPI               = "Bosh-Alicloud-Cpi"
 	BoshCPIVersion        = "1.0"
+	DefaultSlbServerGroupProt =33333
 )
 
 type OpenApi struct {

src/bosh-alicloud-cpi/alicloud/network_manager.go

@@ -21,6 +21,7 @@ type NetworkManager interface {
 	WaitForEipStatus(region, eip string, toStatus EipStatus) error
 
 	BindSLB(region, instanceId, slbId string, weight int) error
+	BindSlbServerGroup(region, instanceId, slbId string, weight int,port int) error
 	DescribeSecurityGroupAttribute(region, groupId string) (ecs.DescribeSecurityGroupAttributeResponse, error)
 	JoinSecurityGroup(region, instanceId, groupId string) error
 }
@@ -34,6 +35,11 @@ type BackendServerType struct {
 	ServerId string
 	Weight   int
 }
+type SlbServerGroupBackendServerType struct {
+	ServerId string
+	Weight   int
+	Port int
+}
 
 func NewNetworkManager(config Config, logger boshlog.Logger) NetworkManager {
 	return NetworkManagerImpl{
@@ -139,6 +145,29 @@ func (a NetworkManagerImpl) WaitForEipStatus(region, eip string, toStatus EipSta
 	return nil
 }
 
+func (a NetworkManagerImpl) BindSlbServerGroup(region, instanceId string, slbServerGroupId string, weight int,port int) error {
+	client,err:=a.config.NewSlbClient(region)
+	if err!=nil{
+		return err
+	}
+	if weight == 0 {
+		weight = DefaultSlbWeight
+	}
+	bytes, _ := json.Marshal([]SlbServerGroupBackendServerType{
+		{ServerId: instanceId, Weight: weight,Port: port},
+	})
+	args := slb.CreateAddVServerGroupBackendServersRequest()
+	args.VServerGroupId = slbServerGroupId
+	args.BackendServers = string(bytes)
+	servers, err :=client.AddVServerGroupBackendServers(args)
+	if err != nil {
+		a.logger.Error("NetworkManager", "BindSlbServerGroup %s to %s failed %v", instanceId, slbServerGroupId, err)
+		return bosherr.WrapErrorf(err, "BindSlbServerGroup %s to %s failed", instanceId, slbServerGroupId)
+	}
+
+	a.logger.Info("NetworkManager", "BindSlbServerGroup %s to %s, after bind server=%v", instanceId, slbServerGroupId, servers)
+	return err
+}
 //
 // TODO: add retry
 func (a NetworkManagerImpl) BindSLB(region, instanceId string, slbId string, weight int) error {

src/bosh-alicloud-cpi/integration/config.go

@@ -34,6 +34,7 @@ var (
 	internalNetmask = envOrDefault("CPI_INTERNAL_NETMASK", "255.240.0.0")
 	internalGw      = envOrDefault("CPI_INTERNAL_GW", "172.16.0.1")
 	slbId           = envOrDefault("CPI_SLB_ID", "")
+	slbServerGroupId= envOrDefault("CPI_SLB_SERVER_GROUP_ID", "")
 	externalIp      = envOrDefault("CPI_EXTERNAL_IP", "")
 
 	// spot