Skip to content

Commit

Permalink
Merge pull request #1193 from jihoon-seo/221012_Implement_cloud_conf_…
Browse files Browse the repository at this point in the history 
…manifest_handling_feature

Implement `cloud_conf.yaml` manifest handling feat. for NLB
  • Loading branch information
@seokho-son
seokho-son authored Oct 12, 2022
2 parents 4e16a99 + 2e99b11 commit 0a4e996
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 20 deletions.
1 change: 1 addition & 0 deletions src/core/common/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ type Cloud struct {
Tencent CloudSetting `yaml:"tencent"`
Ibm CloudSetting `yaml:"ibm"`
Openstack CloudSetting `yaml:"openstack"`
Cloudit CloudSetting `yaml:"cloudit"`
}

// CloudSetting is structure for cloud settings per CSP in details
Expand Down
2 changes: 1 addition & 1 deletion src/core/mcir/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func init() {
// internally dereferences during it's type checks.
validate.RegisterStructValidation(TbDataDiskReqStructLevelValidation, TbDataDiskReq{})
validate.RegisterStructValidation(TbImageReqStructLevelValidation, TbImageReq{})
validate.RegisterStructValidation(TbCustomImageReqStructLevelValidation, TbImageReq{})
validate.RegisterStructValidation(TbCustomImageReqStructLevelValidation, TbCustomImageReq{})
validate.RegisterStructValidation(TbSecurityGroupReqStructLevelValidation, TbSecurityGroupReq{})
validate.RegisterStructValidation(TbSpecReqStructLevelValidation, TbSpecReq{})
validate.RegisterStructValidation(TbSshKeyReqStructLevelValidation, TbSshKeyReq{})
Expand Down
72 changes: 56 additions & 16 deletions src/core/mcis/nlb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -297,22 +297,62 @@ func CreateNLB(nsId string, mcisId string, u *TbNLBReq, option string) (TbNLBInf
tempReq.ReqInfo.VMGroup.Port = u.TargetGroup.Port
tempReq.ReqInfo.VMGroup.Protocol = u.TargetGroup.Protocol

// // TODO: update this part to assign availble values for each CSP (current code does not work)
fmt.Println("NLB available values (AWS): ", common.RuntimeConf.Cloud.Aws)
fmt.Println("NLB available values (Azure): ", common.RuntimeConf.Cloud.Azure)
// if cloud-type == aws {
// tempReq.ReqInfo.HealthChecker.Interval = common.RuntimeConf.Cloud.Aws.Nlb.Interval
// tempReq.ReqInfo.HealthChecker.Timeout = common.RuntimeConf.Cloud.Aws.Nlb.Timeout
// tempReq.ReqInfo.HealthChecker.Threshold = common.RuntimeConf.Cloud.Aws.Nlb.Threshold
// } else if cloud-type == azure {
// tempReq.ReqInfo.HealthChecker.Interval = common.RuntimeConf.Cloud.Azure.Nlb.Interval
// tempReq.ReqInfo.HealthChecker.Timeout = common.RuntimeConf.Cloud.Azure.Nlb.Timeout
// tempReq.ReqInfo.HealthChecker.Threshold = common.RuntimeConf.Cloud.Azure.Nlb.Threshold
// } else {
// tempReq.ReqInfo.HealthChecker.Interval = common.RuntimeConf.Cloud.Common.Nlb.Interval
// tempReq.ReqInfo.HealthChecker.Timeout = common.RuntimeConf.Cloud.Common.Nlb.Timeout
// tempReq.ReqInfo.HealthChecker.Threshold = common.RuntimeConf.Cloud.Common.Nlb.Threshold
// }
connConfig, err := common.GetConnConfig(u.ConnectionName)
if err != nil {
err := fmt.Errorf("Failed to get the connConfig " + u.ConnectionName + ".")
return TbNLBInfo{}, err
}

cloudType := connConfig.ProviderName

valuesFromYaml := NLBHealthCheckerInfo{}

switch cloudType {
case "AWS":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Aws.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Aws.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Aws.Nlb.Threshold)
case "AZURE":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Azure.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Azure.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Azure.Nlb.Threshold)
case "GCP":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Gcp.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Gcp.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Gcp.Nlb.Threshold)
case "ALIBABA":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Alibaba.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Alibaba.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Alibaba.Nlb.Threshold)
case "TENCENT":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Tencent.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Tencent.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Tencent.Nlb.Threshold)
case "IBM":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Ibm.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Ibm.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Ibm.Nlb.Threshold)
case "OPENSTACK":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Openstack.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Openstack.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Openstack.Nlb.Threshold)
case "CLOUDIT":
valuesFromYaml.Interval, _ = strconv.Atoi(common.RuntimeConf.Cloud.Cloudit.Nlb.Interval)
valuesFromYaml.Timeout, _ = strconv.Atoi(common.RuntimeConf.Cloud.Cloudit.Nlb.Timeout)
valuesFromYaml.Threshold, _ = strconv.Atoi(common.RuntimeConf.Cloud.Cloudit.Nlb.Threshold)
default:

}

if u.HealthChecker.Interval == "default" || u.HealthChecker.Interval == "" {
tempReq.ReqInfo.HealthChecker.Interval = strconv.Itoa(valuesFromYaml.Interval)
}
if u.HealthChecker.Timeout == "default" || u.HealthChecker.Timeout == "" {
tempReq.ReqInfo.HealthChecker.Timeout = strconv.Itoa(valuesFromYaml.Timeout)
}
if u.HealthChecker.Threshold == "default" || u.HealthChecker.Threshold == "" {
tempReq.ReqInfo.HealthChecker.Threshold = strconv.Itoa(valuesFromYaml.Threshold)
}

vmIDs, err := ListMcisGroupVms(nsId, mcisId, u.TargetGroup.VmGroupId)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions src/testclient/scripts/10.nlb/create-NLB.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ resp=$(
"HealthChecker": {
"Protocol" : "TCP",
"Port" : "22",
"Interval" : "10",
"Timeout" : "9",
"Threshold" : "3"
"Interval" : "default",
"Timeout" : "default",
"Threshold" : "default"
}
}
EOF
Expand Down

0 comments on commit 0a4e996

Please sign in to comment.