Merge pull request #35 from digitalocean/nshrader/fix-resubmit

ovs: correctly parse port only resubmit

Author: icosahedral

ovs/action.go

@@ -149,7 +149,8 @@ const (
 	patModTransportSourcePort      = "mod_tp_src:%d"
 	patModVLANVID                  = "mod_vlan_vid:%d"
 	patOutput                      = "output:%d"
-	patResubmit                    = "resubmit(%s,%s)"
+	patResubmitPort                = "resubmit:%s"
+	patResubmitPortTable           = "resubmit(%s,%s)"
 )
 
 // ConnectionTracking sends a packet through the host's connection tracker.
@@ -398,9 +399,10 @@ func (a *resubmitAction) MarshalText() ([]byte, error) {
 	t := ""
 	if a.table != 0 {
 		t = strconv.Itoa(a.table)
+		return bprintf(patResubmitPortTable, p, t), nil
 	}
 
-	return bprintf(patResubmit, p, t), nil
+	return bprintf(patResubmitPort, p), nil
 }
 
 // GoString implements Action.

ovs/action_test.go

@@ -344,7 +344,7 @@ func TestActionResubmit(t *testing.T) {
 		{
 			desc:   "table zero",
 			port:   1,
-			action: "resubmit(1,)",
+			action: "resubmit:1",
 		},
 		{
 			desc:   "both port and table non-zero",

ovs/actionparser.go

@@ -146,7 +146,7 @@ func (s *stack) pop() {
 var (
 	// resubmitRe is the regex used to match the resubmit action
 	// with one or more of its parameters.
-	resubmitRe = regexp.MustCompile(`resubmit\((\d*),(\d*)\)`)
+	resubmitRe = regexp.MustCompile(`resubmit(?::(\d+)|\((\d*),(\d*)\))`)
 
 	// ctRe is the regex used to match the ct action with its
 	// parameter list.
@@ -306,7 +306,7 @@ func parseAction(s string) (Action, error) {
 	}
 
 	// ActionResubmit, with one or both of port number and table number
-	if ss := resubmitRe.FindAllStringSubmatch(s, 2); len(ss) > 0 && len(ss[0]) == 3 {
+	if ss := resubmitRe.FindAllStringSubmatch(s, 1); len(ss) > 0 && len(ss[0]) == 4 {
 		var (
 			port  int
 			table int
@@ -316,16 +316,26 @@ func parseAction(s string) (Action, error) {
 
 		// Results are:
 		//  - full string
-		//  - port
-		//  - table
+		//  - single port
+		//  - port in parenthesis
+		//  - table in parenthesis
+
 		if s := ss[0][1]; s != "" {
 			port, err = strconv.Atoi(s)
 			if err != nil {
 				return nil, err
 			}
+			return Resubmit(port, 0), nil
 		}
+
 		if s := ss[0][2]; s != "" {
-			table, err = strconv.Atoi(ss[0][2])
+			port, err = strconv.Atoi(s)
+			if err != nil {
+				return nil, err
+			}
+		}
+		if s := ss[0][3]; s != "" {
+			table, err = strconv.Atoi(s)
 			if err != nil {
 				return nil, err
 			}

ovs/actionparser_test.go

@@ -93,6 +93,7 @@ func Test_parseAction(t *testing.T) {
 	var tests = []struct {
 		desc    string
 		s       string
+		final   string
 		a       Action
 		invalid bool
 	}{
@@ -237,8 +238,13 @@ func Test_parseAction(t *testing.T) {
 			invalid: true,
 		},
 		{
-			s: "resubmit(1,)",
-			a: Resubmit(1, 0),
+			s: "resubmit:4",
+			a: Resubmit(4, 0),
+		},
+		{
+			s:     "resubmit(1,)",
+			final: "resubmit:1",
+			a:     Resubmit(1, 0),
 		},
 		{
 			s: "resubmit(,2)",
@@ -302,6 +308,10 @@ func Test_parseAction(t *testing.T) {
 				want = strings.ToLower(want)
 			}
 
+			if tt.final != "" {
+				want = tt.final
+			}
+
 			if got := string(s); want != got {
 				t.Fatalf("unexpected action:\n- want: %q\n-  got: %q",
 					want, got)