Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update test-cli for gcp-aws vpn tunnel #1541

Merged
merged 2 commits into from
May 3, 2024
Merged

Update test-cli for gcp-aws vpn tunnel #1541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54e33ae
Be sure to log what is processed internally for mcisDynamic API
yunkon-kim May 3, 2024
9701dfd
Update test-cli for gcp-aws vpn tunnel
yunkon-kim May 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/core/mcis/provisioning.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1668,10 +1668,12 @@ func CreateVm(nsId string, mcisId string, vmInfoData *TbVmInfo, option string) e

requestBody.ReqInfo.VMSpecName, err = common.GetCspResourceId(nsId, common.StrSpec, vmInfoData.SpecId)
if requestBody.ReqInfo.VMSpecName == "" || err != nil {
log.Info().Msg(err.Error())
log.Warn().Msg(err.Error())
errAgg := err.Error()
// If cannot find the resource, use common resource
requestBody.ReqInfo.VMSpecName, err = common.GetCspResourceId(common.SystemCommonNs, common.StrSpec, vmInfoData.SpecId)
log.Info().Msgf("Use the common VMSpecName: %s", requestBody.ReqInfo.VMSpecName)

if requestBody.ReqInfo.ImageName == "" || err != nil {
errAgg += err.Error()
err = fmt.Errorf(errAgg)
Expand Down
213 changes: 122 additions & 91 deletions src/testclient/test-clis/vpn-tunnel/gcp-aws/app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"io"
"os"
"strings"
"time"

"github.com/cloud-barista/cb-tumblebug/src/core/common"
_ "github.com/cloud-barista/cb-tumblebug/src/core/common/logger"
Expand Down Expand Up @@ -194,44 +195,34 @@ func createMcis(cmd *cobra.Command, args []string) {
}

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: health check
// Tumblebug API: check readiness

// Set the API path
urlTumblebugHealth := fmt.Sprintf("%s/health", tbApiBase)
urlTumblebugReadiness := fmt.Sprintf("%s/readyz", tbApiBase)

// Request health check
// Request readiness check
var respBytes []byte
respBytes, err = callApi("GET", urlTumblebugHealth, tbAuth, nil)
respBytes, err = callApi("GET", urlTumblebugReadiness, tbAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
}

// Print the response
health := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, health); err != nil {
resTbReadiness := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, resTbReadiness); err != nil {
log.Error().Err(err).Msg("")
return
}

prettyHealth, err := json.MarshalIndent(health, "", " ")
prettyResTbReadiness, err := json.MarshalIndent(resTbReadiness, "", " ")
if err != nil {
log.Error().Err(err).Msgf("")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyHealth))
log.Debug().Msgf("[Response] %+v", string(prettyResTbReadiness))

isTbHealthy := false
if health.Message == "API server of CB-Tumblebug is alive" {
isTbHealthy = true
}

if !isTbHealthy {
log.Error().Msg("Tumblebug API server is not healthy")
return
}

log.Info().Msg("Tumblebug API server is healthy")
log.Info().Msg(resTbReadiness.Message)

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: mcisDynamic
Expand Down Expand Up @@ -352,44 +343,34 @@ func createVpnTunnel(cmd *cobra.Command, args []string) {
}

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: health check
// Tumblebug API: readiness check

// Set the API path
urlTumblebugHealth := fmt.Sprintf("%s/health", tbApiBase)
urlTumblebugReadiness := fmt.Sprintf("%s/readyz", tbApiBase)

// Request health check
// Request readiness check
var respBytes []byte
respBytes, err = callApi("GET", urlTumblebugHealth, tbAuth, nil)
respBytes, err = callApi("GET", urlTumblebugReadiness, tbAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
}

// Print the response
health := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, health); err != nil {
resTbReadiness := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, resTbReadiness); err != nil {
log.Error().Err(err).Msg("")
return
}

prettyHealth, err := json.MarshalIndent(health, "", " ")
prettyResTbReadiness, err := json.MarshalIndent(resTbReadiness, "", " ")
if err != nil {
log.Error().Err(err).Msgf("")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyHealth))
log.Debug().Msgf("[Response] %+v", string(prettyResTbReadiness))

isTbHealthy := false
if health.Message == "API server of CB-Tumblebug is alive" {
isTbHealthy = true
}

if !isTbHealthy {
log.Error().Msg("Tumblebug API server is not healthy")
return
}

log.Info().Msg("Tumblebug API server is healthy")
log.Info().Msg(resTbReadiness.Message)

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Get MCIS
Expand Down Expand Up @@ -463,15 +444,16 @@ func createVpnTunnel(cmd *cobra.Command, args []string) {
vNetId := ""
// Print the mcisInfo
for _, vm := range mcisInfo.Vm {
switch vm.ConnectionConfig.ProviderName {
case "AWS":
providerName := strings.ToLower(vm.ConnectionConfig.ProviderName)
switch providerName {
case "aws":
awsRegion = vm.CspViewVmDetail.Region.Region
awsVpcId = vm.CspViewVmDetail.VpcIID.SystemId
awsSubnetId = vm.CspViewVmDetail.SubnetIID.SystemId
case "GCP":
case "gcp":
gcpRegion = vm.CspViewVmDetail.Region.Region
gcpVpcNetworkName = vm.CspViewVmDetail.VpcIID.SystemId
case "AZURE":
case "azure":
azureRegion = vm.CspViewVmDetail.Region.Region

// Sample
Expand Down Expand Up @@ -545,12 +527,12 @@ func createVpnTunnel(cmd *cobra.Command, args []string) {
mcNetAuth := tbAuth

///////////////////////////////////////////////////////////////////////////////////////////////////
// MC-Net API: Health check
// MC-Net API: readiness check

urlMcNetHealth := fmt.Sprintf("%s/health", mcNetApiBase)
urlMcNetReadiness := fmt.Sprintf("%s/readyz", mcNetApiBase)

// Request health check
respBytes, err = callApi("GET", urlMcNetHealth, mcNetAuth, nil)
// Request readiness check
respBytes, err = callApi("GET", urlMcNetReadiness, mcNetAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
Expand All @@ -562,33 +544,27 @@ func createVpnTunnel(cmd *cobra.Command, args []string) {
}

// Print the response

mcNetHealth := new(Response)
if err := json.Unmarshal(respBytes, mcNetHealth); err != nil {
resMcNetReadiness := new(Response)
if err := json.Unmarshal(respBytes, resMcNetReadiness); err != nil {
log.Error().Err(err).Msg("")
return
}

prettyMcNetHealth, err := json.MarshalIndent(mcNetHealth, "", " ")
prettyResMcNetReadiness, err := json.MarshalIndent(resMcNetReadiness, "", " ")
if err != nil {
log.Error().Err(err).Msgf("")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyMcNetHealth))
log.Debug().Msgf("[Response] %+v", string(prettyResMcNetReadiness))

if !mcNetHealth.Success {
log.Error().Msg("mc-net API server is not healthy")
return
}

log.Info().Msg("mc-net API server is healthy")
log.Info().Msg(resMcNetReadiness.Text)

///////////////////////////////////////////////////////////////////////////////////////////////////
// MC-Net API: Initialize providers for VPN tunnel (i.e, GCP and AwS)

urlInit := fmt.Sprintf("%s/rg/%s/vpn/gcp-aws/init", mcNetApiBase, rgId)

// Request health check
// Request init
respBytes, err = callApi("POST", urlInit, mcNetAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
Expand Down Expand Up @@ -737,12 +713,12 @@ func destroyVpnTunnel(cmd *cobra.Command, args []string) {
mcNetAuth := tbAuth

///////////////////////////////////////////////////////////////////////////////////////////////////
// MC-Net API: Health check
// MC-Net API: readiness check

urlMcNetHealth := fmt.Sprintf("%s/health", mcNetApiBase)
urlMcNetReadiness := fmt.Sprintf("%s/readyz", mcNetApiBase)

// Request health check
respBytes, err := callApi("GET", urlMcNetHealth, mcNetAuth, nil)
respBytes, err := callApi("GET", urlMcNetReadiness, mcNetAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
Expand All @@ -754,25 +730,20 @@ func destroyVpnTunnel(cmd *cobra.Command, args []string) {
}

// Print the response
mcNetHealth := new(Response)
if err := json.Unmarshal(respBytes, mcNetHealth); err != nil {
resMcNetReadiness := new(Response)
if err := json.Unmarshal(respBytes, resMcNetReadiness); err != nil {
log.Error().Err(err).Msg("")
return
}

prettyMcNetHealth, err := json.MarshalIndent(mcNetHealth, "", " ")
prettyResMcNetReadiness, err := json.MarshalIndent(resMcNetReadiness, "", " ")
if err != nil {
log.Error().Err(err).Msgf("")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyMcNetHealth))

if !mcNetHealth.Success {
log.Error().Msg("mc-net API server is not healthy")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyResMcNetReadiness))

log.Info().Msg("mc-net API server is healthy")
log.Info().Msg(resMcNetReadiness.Text)

///////////////////////////////////////////////////////////////////////////////////////////////////
// MC-Net API: Destory providers for VPN tunnel (i.e, GCP and AWS)
Expand Down Expand Up @@ -861,44 +832,34 @@ func terminateMcis(cmd *cobra.Command, args []string) {
}

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: health check
// Tumblebug API: readiness check

// Set the API path
urlTumblebugHealth := fmt.Sprintf("%s/health", tbApiBase)
urlTumblebugReadiness := fmt.Sprintf("%s/readyz", tbApiBase)

// Request health check
// Request readiness check
var respBytes []byte
respBytes, err = callApi("GET", urlTumblebugHealth, tbAuth, nil)
respBytes, err = callApi("GET", urlTumblebugReadiness, tbAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
}

// Print the response
health := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, health); err != nil {
resTbReadiness := new(common.SimpleMsg)
if err := json.Unmarshal(respBytes, resTbReadiness); err != nil {
log.Error().Err(err).Msg("")
return
}

prettyHealth, err := json.MarshalIndent(health, "", " ")
prettyResTbReadiness, err := json.MarshalIndent(resTbReadiness, "", " ")
if err != nil {
log.Error().Err(err).Msgf("")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyHealth))

isTbHealthy := false
if health.Message == "API server of CB-Tumblebug is alive" {
isTbHealthy = true
}

if !isTbHealthy {
log.Error().Msg("Tumblebug API server is not healthy")
return
}
log.Debug().Msgf("[Response] %+v", string(prettyResTbReadiness))

log.Info().Msg("Tumblebug API server is healthy")
log.Info().Msg(resTbReadiness.Message)

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Suspend MCIS
Expand Down Expand Up @@ -934,6 +895,41 @@ func terminateMcis(cmd *cobra.Command, args []string) {

log.Debug().Msgf("[Response] %+v", respText)

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Keep checking the status of MCIS until it is suspended

for {
time.Sleep(5 * time.Second)

// Set the API path
queryParams = "" //"option=status"
urlGetMcisStatus := fmt.Sprintf("%s/ns/%s/mcis/%s", tbApiBase, nsId, mcisId)
if queryParams != "" {
urlGetMcisStatus += "?" + queryParams
}

// Request to create an mcis dynamically
respBytes, err = callApi("GET", urlGetMcisStatus, tbAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
}

// Print the response
mcisInfo := new(mcis.TbMcisInfo)
if err := json.Unmarshal(respBytes, mcisInfo); err != nil {
log.Error().Err(err).Msg("")
return
}

if strings.Contains(mcisInfo.Status, "Suspended") && !strings.Contains(mcisInfo.Status, "Partial") {
log.Info().Msgf("MCIS(id: %s) status: ", mcisInfo.Status)
break
} else {
log.Debug().Msgf("MCIS(id: %s) status: ", mcisInfo.Status)
}
}

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Terminate MCIS

Expand Down Expand Up @@ -968,7 +964,42 @@ func terminateMcis(cmd *cobra.Command, args []string) {
log.Debug().Msgf("[Response] %+v", respText)

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Terminate MCIS
// Tumblebug API: Keep checking the status of MCIS until it is terminated

for {
time.Sleep(5 * time.Second)

// Set the API path
queryParams = "" //"option=status"
urlGetMcisStatus := fmt.Sprintf("%s/ns/%s/mcis/%s", tbApiBase, nsId, mcisId)
if queryParams != "" {
urlGetMcisStatus += "?" + queryParams
}

// Request to create an mcis dynamically
respBytes, err = callApi("GET", urlGetMcisStatus, tbAuth, nil)
if err != nil {
log.Error().Err(err).Msg(string(respBytes))
return
}

// Print the response
mcisInfo := new(mcis.TbMcisInfo)
if err := json.Unmarshal(respBytes, mcisInfo); err != nil {
log.Error().Err(err).Msg("")
return
}

if strings.Contains(mcisInfo.Status, "Terminated") && !strings.Contains(mcisInfo.Status, "Partial") {
log.Info().Msgf("MCIS(id: %s) status: %s", mcisInfo.Id, mcisInfo.Status)
break
} else {
log.Debug().Msgf("MCIS(id: %s) status: %s", mcisInfo.Id, mcisInfo.Status)
}
}

///////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Tumblebug API: Delete MCIS

// Set the API path
queryParams = ""
Expand Down
Loading