Merge pull request #42 from digitalocean/nshrader/conjunction-array

ovs: find a failing case for conjuction action

Author: icosahedral

ovs/action.go

@@ -149,7 +149,7 @@ func StripVLAN() Action {
 // printf-style patterns for marshaling and unmarshaling actions.
 const (
 	patConnectionTracking          = "ct(%s)"
-	patConjunction                 = "conjunction(%d, %d/%d)"
+	patConjunction                 = "conjunction(%d,%d/%d)"
 	patModDataLinkDestination      = "mod_dl_dst:%s"
 	patModDataLinkSource           = "mod_dl_src:%s"
 	patModNetworkDestination       = "mod_nw_dst:%s"

ovs/action_test.go

@@ -541,12 +541,12 @@ func TestConjunction(t *testing.T) {
 		{
 			desc:   "set conjunction 1/2",
 			a:      Conjunction(123, 1, 2),
-			action: "conjunction(123, 1/2)",
+			action: "conjunction(123,1/2)",
 		},
 		{
 			desc:   "set conjunction 2/2",
 			a:      Conjunction(123, 2, 2),
-			action: "conjunction(123, 2/2)",
+			action: "conjunction(123,2/2)",
 		},
 		{
 			desc: "set conjunction 3/2",

ovs/actionparser_test.go

@@ -282,19 +282,19 @@ func Test_parseAction(t *testing.T) {
 			a: SetField("192.168.1.1", "arp_spa"),
 		},
 		{
-			s: "conjunction(123, 1/2)",
+			s: "conjunction(123,1/2)",
 			a: Conjunction(123, 1, 2),
 		},
 		{
-			s: "conjunction(123, 2/2)",
+			s: "conjunction(123,2/2)",
 			a: Conjunction(123, 2, 2),
 		},
 		{
-			s:       "conjunction(123, 3/2)",
+			s:       "conjunction(123,3/2)",
 			invalid: true,
 		},
 		{
-			s:       "conjunxxxxx(123, 3/2)",
+			s:       "conjunxxxxx(123,3/2)",
 			invalid: true,
 		},
 	}

ovs/flow_test.go

@@ -263,6 +263,21 @@ func TestFlowMarshalText(t *testing.T) {
 			},
 			s: "priority=4020,tcp,tcp_flags=+syn+ack,nw_dst=192.0.2.1,tp_dst=22,table=45,idle_timeout=0,actions=resubmit(,1)",
 		},
+		{
+			desc: "Conjunction flow",
+			f: &Flow{
+				Priority: 400,
+				Protocol: ProtocolIPv4,
+				Matches: []Match{
+					NetworkDestination("192.0.2.1"),
+				},
+				Table: 45,
+				Actions: []Action{
+					Conjunction(123, 1, 2),
+				},
+			},
+			s: "priority=400,ip,nw_dst=192.0.2.1,table=45,idle_timeout=0,actions=conjunction(123,1/2)",
+		},
 	}
 
 	for _, tt := range tests {