Skip to content

Commit

Permalink
chore: convert files' format from dos to unix
Browse files Browse the repository at this point in the history
  • Loading branch information
@sykim-etri
sykim-etri committed Dec 28, 2022
1 parent 8c60edb commit 18c7a79
Show file tree
Hide file tree
Showing 18 changed files with 1,561 additions and 1,561 deletions.
88 changes: 44 additions & 44 deletions conf/grpc_conf.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
version: 1
grpc:
ladybugsrv:
addr: :50254
#reflection: enable
#tls:
# tls_cert: $APP_ROOT/certs/server.crt
# tls_key: $APP_ROOT/certs/server.key
interceptors:
#auth_jwt:
# jwt_key: your_secret_key
prometheus_metrics:
listen_port: 9095
opentracing:
jaeger:
endpoint: localhost:6834
service_name: ladybug grpc server
sample_rate: 1
tumblebugcli:
server_addr: 127.0.0.1:50252
timeout: 90s
#tls:
# tls_ca: $APP_ROOT/certs/ca.crt
interceptors:
#auth_jwt:
# jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
opentracing:
jaeger:
endpoint: localhost:6832
service_name: tumblebug grpc client
sample_rate: 1
spidercli:
server_addr: 127.0.0.1:2048
timeout: 90s
#tls:
# tls_ca: $APP_ROOT/certs/ca.crt
interceptors:
#auth_jwt:
# jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
opentracing:
jaeger:
endpoint: localhost:6832
service_name: spider grpc client
sample_rate: 1
version: 1
grpc:
ladybugsrv:
addr: :50254
#reflection: enable
#tls:
# tls_cert: $APP_ROOT/certs/server.crt
# tls_key: $APP_ROOT/certs/server.key
interceptors:
#auth_jwt:
# jwt_key: your_secret_key
prometheus_metrics:
listen_port: 9095
opentracing:
jaeger:
endpoint: localhost:6834
service_name: ladybug grpc server
sample_rate: 1
tumblebugcli:
server_addr: 127.0.0.1:50252
timeout: 90s
#tls:
# tls_ca: $APP_ROOT/certs/ca.crt
interceptors:
#auth_jwt:
# jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
opentracing:
jaeger:
endpoint: localhost:6832
service_name: tumblebug grpc client
sample_rate: 1
spidercli:
server_addr: 127.0.0.1:2048
timeout: 90s
#tls:
# tls_ca: $APP_ROOT/certs/ca.crt
interceptors:
#auth_jwt:
# jwt_token: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJjbGllbnRJUCI6IjEyNy4wLjAuMSIsImV4cGlyZSI6MTkwODMyNTY1OCwib3JnTmFtZSI6IkVUUkkiLCJ1c2VyTmFtZSI6IkhvbmdHaWxEb25nIn0.4lkjYduo8iwv4AcKH96MpTnk8d7HRhi_p1xlnvZts8A
opentracing:
jaeger:
endpoint: localhost:6832
service_name: spider grpc client
sample_rate: 1
308 changes: 154 additions & 154 deletions src/grpc-api/cbadm/cmd/gclient.go
View file
Original file line number Diff line number Diff line change
@@ -1,154 +1,154 @@
package cmd

import (
"fmt"
"time"

"github.com/spf13/cobra"

"github.com/cloud-barista/cb-ladybug/src/grpc-api/cbadm/app"
"github.com/cloud-barista/cb-ladybug/src/grpc-api/logger"
lb_api "github.com/cloud-barista/cb-ladybug/src/grpc-api/request"
)

// ===== [ Constants and Variables ] =====

// ===== [ Types ] =====

// ===== [ Implementations ] =====

// ===== [ Private Functions ] =====

// ===== [ Public Functions ] =====

// SetupAndRun - Ladybug GRPC CLI 구동
func SetupAndRun(cmd *cobra.Command, o *app.Options) {
logger := logger.NewLogger()

var (
result = ""
err error
)

// panic 처리
defer func() {
if r := recover(); r != nil {
logger.Error("cbadm is stopped : ", r)
}
}()

if o.Output != "json" && o.Output != "yaml" {
logger.Error("failed to validate --output parameter : ", o.Output)
return
}
mcar := lb_api.NewMCARManager()
//cim := sp_api.NewCloudInfoManager()

if cmd.Name() == "cluster" || cmd.Name() == "node" || cmd.Name() == "healthy" {
// LB API 설정
ladybugcli := app.Config.GetCurrentContext().Ladybugcli

err := mcar.SetServerAddr(ladybugcli.ServerAddr)
if err != nil {
logger.Error("server_addr set failed", err)
}

timeout, _ := time.ParseDuration(ladybugcli.Timeout)
err = mcar.SetTimeout(timeout)
if err != nil {
logger.Error("timeout set failed", err)
}
err = mcar.Open()
if err != nil {
logger.Error("ladybug api open failed : ", err)
return
}
defer mcar.Close()

mcar.SetInType("json")
mcar.SetOutType(o.Output)
}
// todo
if cmd.Name() == "credential" {
/* cim := sp_api.NewCloudInfoManager()
fmt.Println(cim)
spidercli := app.Config.GetCurrentContext().SpiderCli
err := cim.SetServerAddr(spidercli.ServerAddr)
if err != nil {
logger.Error("server_addr set failed", err)
}
timeout, _ := time.ParseDuration(spidercli.Timeout)
err = cim.SetTimeout(timeout)
if err != nil {
logger.Error("timeout set failed", err)
}
err = cim.Open()
if err != nil {
logger.Error("spdier api open failed : ", err)
return
}
defer cim.Close()
*/
}
err = nil

switch cmd.Parent().Name() {
case "cbadm":
switch cmd.Name() {
case "healthy":
result, err = mcar.Healthy()
}
case "get":
switch cmd.Name() {
case "cluster":
if o.Name == "" {
result, err = mcar.ListClusterByParam(o.Namespace)
} else {
result, err = mcar.GetClusterByParam(o.Namespace, o.Name)
}
case "node":
if o.Name == "" {
result, err = mcar.ListNodeByParam(o.Namespace, clusterName)
} else {
result, err = mcar.GetNodeByParam(o.Namespace, clusterName, o.Name)
}
case "credential":
if o.Name == "" {
//result, err = cim.ListCredential()
} else {
//result, err = cim.GetCredentialByParam(o.Name)
}
}
case "create":
switch cmd.Name() {
case "cluster":
result, err = mcar.CreateCluster(o.Data)
case "node":
result, err = mcar.AddNode(o.Data)
case "credential":
// result, err = cim.CreateCredential(o.Data)
}
case "delete":
switch cmd.Name() {
case "cluster":
result, err = mcar.DeleteClusterByParam(o.Namespace, o.Name)
case "node":
result, err = mcar.RemoveNodeByParam(o.Namespace, clusterName, o.Name)
case "credential":
// result, err = cim.DeleteCredentialByParam(o.Name)
}
}

if err != nil {
if o.Output == "yaml" {
fmt.Fprintf(cmd.OutOrStdout(), "message: %v\n", err)
} else {
fmt.Fprintf(cmd.OutOrStdout(), "{\"message\": \"%v\"}\n", err)
}
} else {
fmt.Fprintf(cmd.OutOrStdout(), "%s\n", result)
}
}
package cmd

import (
"fmt"
"time"

"github.com/spf13/cobra"

"github.com/cloud-barista/cb-ladybug/src/grpc-api/cbadm/app"
"github.com/cloud-barista/cb-ladybug/src/grpc-api/logger"
lb_api "github.com/cloud-barista/cb-ladybug/src/grpc-api/request"
)

// ===== [ Constants and Variables ] =====

// ===== [ Types ] =====

// ===== [ Implementations ] =====

// ===== [ Private Functions ] =====

// ===== [ Public Functions ] =====

// SetupAndRun - Ladybug GRPC CLI 구동
func SetupAndRun(cmd *cobra.Command, o *app.Options) {
logger := logger.NewLogger()

var (
result = ""
err error
)

// panic 처리
defer func() {
if r := recover(); r != nil {
logger.Error("cbadm is stopped : ", r)
}
}()

if o.Output != "json" && o.Output != "yaml" {
logger.Error("failed to validate --output parameter : ", o.Output)
return
}
mcar := lb_api.NewMCARManager()
//cim := sp_api.NewCloudInfoManager()

if cmd.Name() == "cluster" || cmd.Name() == "node" || cmd.Name() == "healthy" {
// LB API 설정
ladybugcli := app.Config.GetCurrentContext().Ladybugcli

err := mcar.SetServerAddr(ladybugcli.ServerAddr)
if err != nil {
logger.Error("server_addr set failed", err)
}

timeout, _ := time.ParseDuration(ladybugcli.Timeout)
err = mcar.SetTimeout(timeout)
if err != nil {
logger.Error("timeout set failed", err)
}
err = mcar.Open()
if err != nil {
logger.Error("ladybug api open failed : ", err)
return
}
defer mcar.Close()

mcar.SetInType("json")
mcar.SetOutType(o.Output)
}
// todo
if cmd.Name() == "credential" {
/* cim := sp_api.NewCloudInfoManager()
fmt.Println(cim)
spidercli := app.Config.GetCurrentContext().SpiderCli
err := cim.SetServerAddr(spidercli.ServerAddr)
if err != nil {
logger.Error("server_addr set failed", err)
}
timeout, _ := time.ParseDuration(spidercli.Timeout)
err = cim.SetTimeout(timeout)
if err != nil {
logger.Error("timeout set failed", err)
}
err = cim.Open()
if err != nil {
logger.Error("spdier api open failed : ", err)
return
}
defer cim.Close()
*/
}
err = nil

switch cmd.Parent().Name() {
case "cbadm":
switch cmd.Name() {
case "healthy":
result, err = mcar.Healthy()
}
case "get":
switch cmd.Name() {
case "cluster":
if o.Name == "" {
result, err = mcar.ListClusterByParam(o.Namespace)
} else {
result, err = mcar.GetClusterByParam(o.Namespace, o.Name)
}
case "node":
if o.Name == "" {
result, err = mcar.ListNodeByParam(o.Namespace, clusterName)
} else {
result, err = mcar.GetNodeByParam(o.Namespace, clusterName, o.Name)
}
case "credential":
if o.Name == "" {
//result, err = cim.ListCredential()
} else {
//result, err = cim.GetCredentialByParam(o.Name)
}
}
case "create":
switch cmd.Name() {
case "cluster":
result, err = mcar.CreateCluster(o.Data)
case "node":
result, err = mcar.AddNode(o.Data)
case "credential":
// result, err = cim.CreateCredential(o.Data)
}
case "delete":
switch cmd.Name() {
case "cluster":
result, err = mcar.DeleteClusterByParam(o.Namespace, o.Name)
case "node":
result, err = mcar.RemoveNodeByParam(o.Namespace, clusterName, o.Name)
case "credential":
// result, err = cim.DeleteCredentialByParam(o.Name)
}
}

if err != nil {
if o.Output == "yaml" {
fmt.Fprintf(cmd.OutOrStdout(), "message: %v\n", err)
} else {
fmt.Fprintf(cmd.OutOrStdout(), "{\"message\": \"%v\"}\n", err)
}
} else {
fmt.Fprintf(cmd.OutOrStdout(), "%s\n", result)
}
}
Loading

0 comments on commit 18c7a79

Please sign in to comment.