fix #3 Follow docker <host>:<vm> in port forward

Author: mhewedy

vms/port.go

@@ -11,13 +11,12 @@ const rangeSep = "-"
 
 // mapPorts build string as param to ssh for port forward
 //
-// sample input: 3000 4040:40040 8080-8088:9080-9088
+// sample input: 3000 40040:4040 9080-9088:8080-8088
 //
-// where <vm port>[:<local port>]
+// Where [<local port>:]<vm port>
 //
-// output format: ["-L", "0.0.0.0:3000:localhost:3000"]
+// output format: ["-L", "0.0.0.0:<local port>:localhost:<vm port>"]
 //
-// remember, vm port comes first
 func getPortForwardArgs(ports string) ([]string, error) {
 	a, err := mapPorts(ports)
 	if err != nil {
@@ -45,12 +44,12 @@ func mapPorts(ports string) ([]string, error) {
 
 	for _, arg := range args {
 		mapping := strings.Split(arg, ":")
-		vmPort := mapping[0]
-		var localPort string
+		localPort := mapping[0]
+		var vmPort string
 		if len(mapping) == 1 {
-			localPort = vmPort
+			vmPort = localPort
 		} else {
-			localPort = mapping[1]
+			vmPort = mapping[1]
 		}
 
 		portMap, err := getPortMapping(vmPort, localPort)

vms/port_test.go

@@ -19,16 +19,16 @@ func TestGetPortForwardArgs(t *testing.T) {
 			args:    struct{ ports string }{ports: "3000"},
 			want:    []string{"0.0.0.0:3000:localhost:3000"},
 			wantErr: false},
-		{name: "<vm port>:<local port>",
-			args:    struct{ ports string }{ports: "3000:4000"},
+		{name: "<local port>:<vm port>",
+			args:    struct{ ports string }{ports: "4000:3000"},
 			want:    []string{"0.0.0.0:4000:localhost:3000"},
 			wantErr: false},
-		{name: "<vm port>:<local port> <vmport>",
-			args:    struct{ ports string }{ports: "3000:4000 8080"},
+		{name: "<local port>:<vm port> <vmport>",
+			args:    struct{ ports string }{ports: "4000:3000 8080"},
 			want:    []string{"0.0.0.0:4000:localhost:3000", "0.0.0.0:8080:localhost:8080"},
 			wantErr: false},
-		{name: "<vmport> <vm port>:<local port>",
-			args:    struct{ ports string }{ports: "8080 3000:4000"},
+		{name: "<vmport> <local port>:<vm port>",
+			args:    struct{ ports string }{ports: "8080 4000:3000"},
 			want:    []string{"0.0.0.0:8080:localhost:8080", "0.0.0.0:4000:localhost:3000"},
 			wantErr: false},
 		{name: "<vmport> <vm port> <vm port>",
@@ -39,16 +39,16 @@ func TestGetPortForwardArgs(t *testing.T) {
 			args:    struct{ ports string }{ports: "3000 4000-4001"},
 			want:    []string{"0.0.0.0:3000:localhost:3000", "0.0.0.0:4000:localhost:4000", "0.0.0.0:4001:localhost:4001"},
 			wantErr: false},
-		{name: "<vm port1>-<vm port2>:<local port1>-<local port2>",
-			args:    struct{ ports string }{ports: "4000-4001:8080-8081"},
+		{name: "<local port1>-<local port2>:<vm port1>-<vm port2>",
+			args:    struct{ ports string }{ports: "8080-8081:4000-4001"},
 			want:    []string{"0.0.0.0:8080:localhost:4000", "0.0.0.0:8081:localhost:4001"},
 			wantErr: false},
-		{name: "<vm port1>-<vm port2>:<local port1>-<local port2> <vmport>",
-			args:    struct{ ports string }{ports: "4000-4001:8080-8081 9000"},
+		{name: "<local port1>-<local port2>:<vm port1>-<vm port2> <vmport>",
+			args:    struct{ ports string }{ports: "8080-8081:4000-4001 9000"},
 			want:    []string{"0.0.0.0:8080:localhost:4000", "0.0.0.0:8081:localhost:4001", "0.0.0.0:9000:localhost:9000"},
 			wantErr: false},
-		{name: "invalid <vm port1>-<vm port2>:<local port1>-<local port2>",
-			args:    struct{ ports string }{ports: "4000-4001:8080-8082"},
+		{name: "invalid <local port1>-<local port2>:<vm port1>-<vm port2>",
+			args:    struct{ ports string }{ports: "8080-8082:4000-4001"},
 			want:    nil,
 			wantErr: true},
 	}