Merge pull request #81 from ecbaldwin/capture-actions

Capture actions from the trace output into a slice of strings

Author: ecbaldwin

ovs/proto_trace.go

@@ -30,6 +30,10 @@ var (
 	datapathActionsRegexp = regexp.MustCompile(`Datapath actions: (.*)`)
 	initialFlowRegexp     = regexp.MustCompile(`Flow: (.*)`)
 	finalFlowRegexp       = regexp.MustCompile(`Final flow: (.*)`)
+	megaFlowRegexp        = regexp.MustCompile(`Megaflow: (.*)`)
+	traceStartRegexp      = regexp.MustCompile(`bridge\("(.*)"\)`)
+	traceFlowRegexp       = regexp.MustCompile(` *[[:digit:]]+[.] ([[:alpha:]].*)`)
+	traceActionRegexp     = regexp.MustCompile(` +([[:alpha:]].*)`)
 
 	pushVLANPattern = `push_vlan(vid=[0-9]+,pcp=[0-9]+)`
 )
@@ -113,14 +117,15 @@ type ProtoTrace struct {
 	InputFlow       *DataPathFlows
 	FinalFlow       *DataPathFlows
 	DataPathActions DataPathActions
+	FlowActions     []string
 }
 
 // UnmarshalText unmarshals ProtoTrace text into a ProtoTrace type.
 // Not implemented yet.
 func (pt *ProtoTrace) UnmarshalText(b []byte) error {
 	lines := strings.Split(string(b), "\n")
 	for _, line := range lines {
-		if matches, matched := checkForDataPathActions(line); matched {
+		if matches, matched := checkMatch(datapathActionsRegexp, line); matched {
 			// first index is always the left most match, following
 			// are the actual matches
 			pt.DataPathActions = &dataPathActions{
@@ -130,7 +135,7 @@ func (pt *ProtoTrace) UnmarshalText(b []byte) error {
 			continue
 		}
 
-		if matches, matched := checkForInputFlow(line); matched {
+		if matches, matched := checkMatch(initialFlowRegexp, line); matched {
 			flow := &DataPathFlows{}
 			err := flow.UnmarshalText([]byte(matches[1]))
 			if err != nil {
@@ -141,7 +146,7 @@ func (pt *ProtoTrace) UnmarshalText(b []byte) error {
 			continue
 		}
 
-		if matches, matched := checkForFinalFlow(line); matched {
+		if matches, matched := checkMatch(finalFlowRegexp, line); matched {
 			flow := &DataPathFlows{}
 			err := flow.UnmarshalText([]byte(matches[1]))
 			if err != nil {
@@ -151,31 +156,30 @@ func (pt *ProtoTrace) UnmarshalText(b []byte) error {
 			pt.FinalFlow = flow
 			continue
 		}
-	}
 
-	return nil
-}
+		if _, matched := checkMatch(megaFlowRegexp, line); matched {
+			continue
+		}
 
-func checkForDataPathActions(s string) ([]string, bool) {
-	matches := datapathActionsRegexp.FindStringSubmatch(s)
-	if len(matches) == 0 {
-		return matches, false
-	}
+		if _, matched := checkMatch(traceStartRegexp, line); matched {
+			continue
+		}
 
-	return matches, true
-}
+		if _, matched := checkMatch(traceFlowRegexp, line); matched {
+			continue
+		}
 
-func checkForInputFlow(s string) ([]string, bool) {
-	matches := initialFlowRegexp.FindStringSubmatch(s)
-	if len(matches) == 0 {
-		return matches, false
+		if matches, matched := checkMatch(traceActionRegexp, line); matched {
+			pt.FlowActions = append(pt.FlowActions, matches[1])
+			continue
+		}
 	}
 
-	return matches, true
+	return nil
 }
 
-func checkForFinalFlow(s string) ([]string, bool) {
-	matches := finalFlowRegexp.FindStringSubmatch(s)
+func checkMatch(re *regexp.Regexp, s string) ([]string, bool) {
+	matches := re.FindStringSubmatch(s)
 	if len(matches) == 0 {
 		return matches, false
 	}

ovs/proto_trace_test.go

@@ -21,9 +21,10 @@ import (
 
 func Test_UnmarshalText(t *testing.T) {
 	testcases := []struct {
-		name    string
-		output  string
-		actions DataPathActions
+		name            string
+		output          string
+		datapathActions DataPathActions
+		flowActions     []string
 	}{
 		{
 			name: "action output port",
@@ -39,7 +40,11 @@ bridge("br0")
 Final flow: unchanged
 Megaflow: recirc_id=0,tcp,in_port=3,nw_src=192.0.2.0/24,nw_frag=no,tp_dst=22
 Datapath actions: 1`,
-			actions: NewDataPathActions("1"),
+			datapathActions: NewDataPathActions("1"),
+			flowActions: []string{
+				"resubmit(,2)",
+				"output:1",
+			},
 		},
 		{
 			name: "in_port is LOCAL",
@@ -55,7 +60,11 @@ bridge("br0")
 Final flow: unchanged
 Megaflow: recirc_id=0,tcp,in_port=LOCAL,nw_src=192.0.2.0/24,nw_frag=no,tp_dst=22
 Datapath actions: 1`,
-			actions: NewDataPathActions("1"),
+			datapathActions: NewDataPathActions("1"),
+			flowActions: []string{
+				"resubmit(,2)",
+				"output:1",
+			},
 		},
 		{
 			name: "popvlan and output port",
@@ -71,7 +80,11 @@ bridge("br0")
 Final flow: unchanged
 Megaflow: recirc_id=0,tcp,in_port=3,nw_src=192.0.2.0/24,nw_frag=no,tp_dst=22
 Datapath actions: popvlan,1`,
-			actions: NewDataPathActions("popvlan,1"),
+			datapathActions: NewDataPathActions("popvlan,1"),
+			flowActions: []string{
+				"resubmit(,2)",
+				"output:1",
+			},
 		},
 		{
 			name: "pushvlan and output port",
@@ -87,7 +100,11 @@ bridge("br0")
 Final flow: unchanged
 Megaflow: recirc_id=0,tcp,in_port=3,nw_src=192.0.2.0/24,nw_frag=no,tp_dst=22
 Datapath actions: push_vlan(vid=20,pcp=0),4`,
-			actions: NewDataPathActions("push_vlan(vid=20,pcp=0),4"),
+			datapathActions: NewDataPathActions("push_vlan(vid=20,pcp=0),4"),
+			flowActions: []string{
+				"resubmit(,2)",
+				"output:1",
+			},
 		},
 		{
 			name: "drop",
@@ -103,7 +120,11 @@ bridge("br0")
 Final flow: unchanged
 Megaflow: recirc_id=0,tcp,in_port=3,nw_src=192.0.2.0/24,nw_frag=no,tp_dst=22
 Datapath actions: drop`,
-			actions: NewDataPathActions("drop"),
+			datapathActions: NewDataPathActions("drop"),
+			flowActions: []string{
+				"resubmit(,2)",
+				"output:1",
+			},
 		},
 	}
 
@@ -115,11 +136,17 @@ Datapath actions: drop`,
 				t.Errorf("error unmarshalling tests: %q", err)
 			}
 
-			if !reflect.DeepEqual(testcase.actions, pt.DataPathActions) {
-				t.Logf("expected: %v", testcase.actions)
+			if !reflect.DeepEqual(testcase.datapathActions, pt.DataPathActions) {
+				t.Logf("expected: %v", testcase.datapathActions)
 				t.Logf("actual: %v", pt.DataPathActions)
 				t.Error("unexpected datapath actions")
 			}
+
+			if !reflect.DeepEqual(testcase.flowActions, pt.FlowActions) {
+				t.Logf("expected: %v", testcase.flowActions)
+				t.Logf("actual: %v", pt.FlowActions)
+				t.Error("unexpected trace actions")
+			}
 		})
 	}
 }