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.

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

feat(network): add support for exposing routes to vswitch connection #504

Merged
merged 2 commits into from
Jun 22, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
10 changes: 7 additions & 3 deletions internal/cmd/network/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ func newCreateCommand(cli *state.State) *cobra.Command {
cmd.Flags().IPNet("ip-range", net.IPNet{}, "Network IP range (required)")
cmd.MarkFlagRequired("ip-range")

cmd.Flags().Bool("expose-routes-to-vswitch", false, "Expose routes from this network to the vSwitch connection. It only takes effect if a vSwitch connection is active.")

cmd.Flags().StringToString("label", nil, "User-defined labels ('key=value') (can be specified multiple times)")

return cmd
Expand All @@ -35,11 +37,13 @@ func runCreate(cli *state.State, cmd *cobra.Command, args []string) error {
name, _ := cmd.Flags().GetString("name")
ipRange, _ := cmd.Flags().GetIPNet("ip-range")
labels, _ := cmd.Flags().GetStringToString("label")
exposeRoutesToVSwitch, _ := cmd.Flags().GetBool("expose-routes-to-vswitch")

opts := hcloud.NetworkCreateOpts{
Name: name,
IPRange: &ipRange,
Labels: labels,
Name: name,
IPRange: &ipRange,
Labels: labels,
ExposeRoutesToVSwitch: exposeRoutesToVSwitch,
}

network, _, err := cli.Client().Network.Create(cli.Context, opts)
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/network/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ var DescribeCmd = base.DescribeCmd{
fmt.Printf("Name:\t\t%s\n", network.Name)
fmt.Printf("Created:\t%s (%s)\n", util.Datetime(network.Created), humanize.Time(network.Created))
fmt.Printf("IP Range:\t%s\n", network.IPRange.String())
fmt.Printf("Expose Routes to vSwitch: %s\n", util.YesNo(network.ExposeRoutesToVSwitch))

fmt.Printf("Subnets:\n")
if len(network.Subnets) == 0 {
Expand Down
59 changes: 59 additions & 0 deletions internal/cmd/network/expose-routes-to-vswitch.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package network

import (
"context"
"fmt"

"github.com/hetznercloud/cli/internal/cmd/base"
"github.com/hetznercloud/cli/internal/cmd/cmpl"
"github.com/hetznercloud/cli/internal/hcapi2"
"github.com/hetznercloud/cli/internal/state"
"github.com/hetznercloud/hcloud-go/hcloud"
"github.com/spf13/cobra"
)

var ExposeRoutesToVSwitchCommand = base.Cmd{
BaseCobraCommand: func(client hcapi2.Client) *cobra.Command {
cmd := &cobra.Command{
Use: "expose-routes-to-vswitch [flags] network",
Short: "Expose routes to connected vSwitch",
Long: "Enabling this will expose routes to the connected vSwitch. Set the --disable flag to remove the exposed routes.",
Args: cobra.ExactArgs(1),
ValidArgsFunction: cmpl.SuggestArgs(cmpl.SuggestCandidatesF(client.Network().Names)),
TraverseChildren: true,
DisableFlagsInUseLine: true,
}

cmd.Flags().Bool("disable", false, "Remove any exposed routes from the connected vSwitch")

return cmd
},
Run: func(ctx context.Context, client hcapi2.Client, waiter state.ActionWaiter, cmd *cobra.Command, args []string) error {
idOrName := args[0]
network, _, err := client.Network().Get(ctx, idOrName)
if err != nil {
return err
}
if network == nil {
return fmt.Errorf("network not found: %s", idOrName)
}

disable, _ := cmd.Flags().GetBool("disable")
opts := hcloud.NetworkUpdateOpts{
ExposeRoutesToVSwitch: hcloud.Ptr(!disable),
}

_, _, err = client.Network().Update(ctx, network, opts)
if err != nil {
return err
}

if disable {
fmt.Printf("Exposing routes to connected vSwitch of network %s disabled\n", network.Name)
} else {
fmt.Printf("Exposing routes to connected vSwitch of network %s enabled\n", network.Name)
}

return nil
},
}
13 changes: 7 additions & 6 deletions internal/cmd/network/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,12 +76,13 @@ var ListCmd = base.ListCmd{
network := resource.(*hcloud.Network)

networkSchema := schema.Network{
ID: network.ID,
Name: network.Name,
IPRange: network.IPRange.String(),
Protection: schema.NetworkProtection{Delete: network.Protection.Delete},
Created: network.Created,
Labels: network.Labels,
ID: network.ID,
Name: network.Name,
IPRange: network.IPRange.String(),
Protection: schema.NetworkProtection{Delete: network.Protection.Delete},
Created: network.Created,
Labels: network.Labels,
ExposeRoutesToVSwitch: network.ExposeRoutesToVSwitch,
}
for _, subnet := range network.Subnets {
networkSchema.Subnets = append(networkSchema.Subnets, schema.NetworkSubnet{
Expand Down
1 change: 1 addition & 0 deletions internal/cmd/network/network.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ func NewCommand(cli *state.State, client hcapi2.Client) *cobra.Command {
labelCmds.RemoveCobraCommand(cli.Context, client, cli),
EnableProtectionCommand.CobraCommand(cli.Context, client, cli, cli),
DisableProtectionCommand.CobraCommand(cli.Context, client, cli, cli),
ExposeRoutesToVSwitchCommand.CobraCommand(cli.Context, client, cli, cli),
)
return cmd
}