feat(climc): update port_mappings of server network (#20518)

yunionio · Jun 13, 2024 · 0b85e31 · 0b85e31
1 parent 15cc91c
commit 0b85e31
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 7 deletions.
diff --git a/cmd/climc/shell/compute/servernetworks.go b/cmd/climc/shell/compute/servernetworks.go
@@ -19,6 +19,7 @@ import (
 	"strconv"
 
 	"yunion.io/x/jsonutils"
+	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/printutils"
 	"yunion.io/x/pkg/util/regutils"
 
@@ -88,13 +89,14 @@ func init() {
 	})
 
 	type ServerNetworkUpdateOptions struct {
-		SERVER  string `help:"ID or Name of Server"`
-		NETWORK string `help:"ID or Name of Wire"`
-		Mac     string `help:"Mac of NIC"`
-		Driver  string `help:"Driver model of vNIC" choices:"virtio|e1000|vmxnet3|rtl8139"`
-		Index   int64  `help:"Index of NIC" default:"-1"`
-		Ifname  string `help:"Interface name of vNIC on host"`
-		Default bool   `help:"is default nic?"`
+		SERVER      string   `help:"ID or Name of Server"`
+		NETWORK     string   `help:"ID or Name of Wire"`
+		Mac         string   `help:"Mac of NIC"`
+		Driver      string   `help:"Driver model of vNIC" choices:"virtio|e1000|vmxnet3|rtl8139"`
+		Index       int64    `help:"Index of NIC" default:"-1"`
+		Ifname      string   `help:"Interface name of vNIC on host"`
+		Default     bool     `help:"is default nic?"`
+		PortMapping []string `help:"Network port mapping, e.g. 'port=80,host_port=8080,protocol=<tcp|udp>,host_port_range=<int>-<int>,remote_ips=x.x.x.x|y.y.y.y'" short-token:"p"`
 	}
 	R(&ServerNetworkUpdateOptions{}, "server-network-update", "Update server network settings", func(s *mcclient.ClientSession, args *ServerNetworkUpdateOptions) error {
 		params := jsonutils.NewDict()
@@ -110,6 +112,14 @@ func init() {
 		if args.Default {
 			params.Add(jsonutils.JSONTrue, "is_default")
 		}
+		if len(args.PortMapping) > 0 {
+			psm, err := cmdline.ParseNetworkConfigPortMappings(args.PortMapping)
+			if err != nil {
+				return errors.Wrap(err, "parse port mapping")
+			}
+			ps := psm[0]
+			params.Add(jsonutils.Marshal(ps), "port_mappings")
+		}
 		if params.Size() == 0 {
 			return InvalidUpdateError()
 		}

diff --git a/pkg/cloudcommon/cmdline/parser.go b/pkg/cloudcommon/cmdline/parser.go
@@ -417,6 +417,9 @@ func parseNetworkConfigPortMapping(desc string) (int, *compute.GuestPortMapping,
 				Start: start,
 				End:   end,
 			}
+		case "remote_ips", "remote_ip":
+			ips := strings.Split(val, "|")
+			pm.RemoteIps = ips
 		}
 	}
 	if pm.Port == 0 {