diff --git a/cmd/create/create_loadbalancer.go b/cmd/create/create_loadbalancer.go index e9ff5a7..6cccc5c 100644 --- a/cmd/create/create_loadbalancer.go +++ b/cmd/create/create_loadbalancer.go @@ -50,7 +50,7 @@ type CreateLoadBalancerOptions struct { SecIPs []string Select string Name string - Path string + Host string } type CreateLoadBalancerResult struct { @@ -132,7 +132,7 @@ func NewCreateLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command { o := CreateLoadBalancerOptions{} var createLbCmd = &cobra.Command{ - Use: "lb IP [--select=] [--tcp=:] [--udp=:] [--sctp=:] [--icmp] [--mark=] [--secips=,][--endpoints=:,] [--mode=] [--bgp] [--monitor] [--inatimeout=] [--name=] [--attachEP] [--detachEP] [--security=] [--path=]", + Use: "lb IP [--select=] [--tcp=:] [--udp=:] [--sctp=:] [--icmp] [--mark=] [--secips=,][--endpoints=:,] [--mode=] [--bgp] [--monitor] [--inatimeout=] [--name=] [--attachEP] [--detachEP] [--security=] [--host=]", Short: "Create a LoadBalancer", Long: `Create a LoadBalancer @@ -150,7 +150,7 @@ func NewCreateLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command { ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --security=https - loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --path=loxilb.io + loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --host=loxilb.io loxicmd create lb 192.168.0.200 --tcp=80:32015 --name="http-service" --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 loxicmd create lb 192.168.0.200 --udp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 --mark=10 loxicmd create lb 192.168.0.200 --tcp=80:32015 --udp=80:32015 --endpoints=10.212.0.1:1,10.212.0.2:1,10.212.0.3:1 @@ -230,7 +230,7 @@ ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.2 Name: o.Name, Oper: api.LbOP(oper), Security: api.LbSec(SecStringToNum(o.Security)), - Path: o.Path, + Host: o.Host, } if o.Mode == "dsr" && targetPort != port { @@ -290,7 +290,7 @@ ex) loxicmd create lb 192.168.0.200 --tcp=80:32015 --endpoints=10.212.0.1:1,10.2 createLbCmd.Flags().BoolVarP(&o.Attach, "attachEP", "", false, "Attach endpoints to the load balancer rule") createLbCmd.Flags().BoolVarP(&o.Detach, "detachEP", "", false, "Detach endpoints from the load balancer rule") createLbCmd.Flags().StringVarP(&o.Security, "security", "", o.Security, "Security mode for load balancer rule") - createLbCmd.Flags().StringVarP(&o.Path, "path", "", o.Path, "Ingress URL Path") + createLbCmd.Flags().StringVarP(&o.Host, "host", "", o.Host, "Ingress Host URL Path") return createLbCmd } diff --git a/cmd/delete/delete_loadbalancer.go b/cmd/delete/delete_loadbalancer.go index a81d98c..4124e48 100644 --- a/cmd/delete/delete_loadbalancer.go +++ b/cmd/delete/delete_loadbalancer.go @@ -51,13 +51,13 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command { var BGP bool var Mark uint16 var Name string - var Path string + var Host string var externalIP string //var endpointList []string var deleteLbCmd = &cobra.Command{ - Use: "lb [--tcp portNumber] [--udp portNumber] [--sctp portNumber] [--icmp portNumber] [--bgp] [--mark=] [--name=] [--path=]", + Use: "lb [--tcp portNumber] [--udp portNumber] [--sctp portNumber] [--icmp portNumber] [--bgp] [--mark=] [--name=] [--host=]", Short: "Delete a LoadBalancer", Long: `Delete a LoadBalancer.`, PreRun: func(cmd *cobra.Command, args []string) { @@ -113,13 +113,13 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command { PortNumberList["icmp"] = []int{0} } fmt.Printf("PortNumberList: %v\n", PortNumberList) - if Path == "" { - Path = "any" + if Host == "" { + Host = "any" } for proto, portNum := range PortNumberList { for _, port := range portNum { subResources := []string{ - "urlpath", Path, + "hosturl", Host, "externalipaddress", externalIP, "port", strconv.Itoa(port), "protocol", proto, @@ -152,7 +152,7 @@ func NewDeleteLoadBalancerCmd(restOptions *api.RESTOptions) *cobra.Command { deleteLbCmd.Flags().BoolVarP(&BGP, "bgp", "", false, "BGP enable information'") deleteLbCmd.Flags().Uint16VarP(&Mark, "mark", "", 0, "Specify the mark num to segregate a load-balancer VIP service") deleteLbCmd.Flags().StringVarP(&Name, "name", "", Name, "Name for load balancer rule") - deleteLbCmd.Flags().StringVarP(&Path, "path", "", Path, "Ingress URL Path") + deleteLbCmd.Flags().StringVarP(&Host, "host", "", Host, "Ingress Host URL Path") return deleteLbCmd } diff --git a/cmd/get/get_loadbalancer.go b/cmd/get/get_loadbalancer.go index 4281e17..173e4a9 100644 --- a/cmd/get/get_loadbalancer.go +++ b/cmd/get/get_loadbalancer.go @@ -177,7 +177,7 @@ func PrintGetLbResult(resp *http.Response, o api.RESTOptions) { for i, eps := range lbrule.Endpoints { if i == 0 { - data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Path, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), + data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Host, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State, eps.Counter}) } else { data = append(data, []string{"", "", "", "", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), eps.State, eps.Counter}) @@ -186,7 +186,7 @@ func PrintGetLbResult(resp *http.Response, o api.RESTOptions) { } else { for i, eps := range lbrule.Endpoints { if i == 0 { - data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Path, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), + data = append(data, []string{lbrule.Service.ExternalIP, secIPs, lbrule.Service.Host, fmt.Sprintf("%d", lbrule.Service.Port), protocolStr, lbrule.Service.Name, fmt.Sprintf("%d", lbrule.Service.Block), NumToSelect(int(lbrule.Service.Sel)), NumToMode(int(lbrule.Service.Mode)), eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-", eps.Counter}) } else { data = append(data, []string{"", "", "", "", "", "", "", "", "", eps.EndpointIP, fmt.Sprintf("%d", eps.TargetPort), fmt.Sprintf("%d", eps.Weight), "-", eps.Counter}) diff --git a/cmd/get/type.go b/cmd/get/type.go index da1a2b1..94b2a12 100644 --- a/cmd/get/type.go +++ b/cmd/get/type.go @@ -18,7 +18,7 @@ package get var ( CONNTRACK_TITLE = []string{"destIP", "srcIP", "dPort", "sPort", "proto", "state", "act", "packets", "bytes"} LOADBALANCER_TITLE = []string{"Ext IP", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "# of Endpoints", "Monitor"} - LOADBALANCER_WIDE_TITLE = []string{"Ext IP", "Sec IPs", "Path", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "Endpoint", "EPort", "Weight", "State", "Counters"} + LOADBALANCER_WIDE_TITLE = []string{"Ext IP", "Sec IPs", "Host", "Port", "Proto", "Name", "Mark", "Sel", "Mode", "Endpoint", "EPort", "Weight", "State", "Counters"} SESSION_TITLE = []string{"ident", "session IP"} SESSION_WIDE_TITLE = []string{"ident", "session IP", "access Network Tunnel", "core Network Tunnel"} PORT_WIDE_TITLE = []string{"index", "portname", "MAC", "link/state", "mtu", "isActive/bpf\nPort type", "Statistics", "L3Info", "L2Info", "Sync"} diff --git a/pkg/api/loadBalancer.go b/pkg/api/loadBalancer.go index 64c0921..c350baf 100644 --- a/pkg/api/loadBalancer.go +++ b/pkg/api/loadBalancer.go @@ -54,7 +54,7 @@ type LoadBalancerService struct { Snat bool `json:"snat,omitempty"` Oper LbOP `json:"oper,omitempty"` Security LbSec `json:"security,omitempty" yaml:"security"` - Path string `json:"path,omitempty" yaml:"path"` + Host string `json:"host,omitempty" yaml:"path"` } type LoadBalancerEndpoint struct {