Merge pull request #96 from digitalocean/nbouliane/learn_options

ovs: use the limit= option only when the value is > 0

Author: nicboul

ovs/action_test.go

@@ -682,7 +682,7 @@ func TestLearn(t *testing.T) {
 				Matches:        []Match{DataLinkType(0x800)},
 				Actions:        []Action{OutputField("in_port"), Load("2", "tp_dst")},
 			}),
-			action: `learn(priority=0,dl_type=0x0800,table=0,idle_timeout=0,fin_hard_timeout=10,hard_timeout=0,limit=0,delete_learned,output:in_port,load:2->tp_dst)`,
+			action: `learn(priority=0,dl_type=0x0800,table=0,idle_timeout=0,fin_hard_timeout=10,hard_timeout=0,delete_learned,output:in_port,load:2->tp_dst)`,
 		},
 		{
 			desc: "learn ok",

ovs/flow.go

@@ -269,8 +269,13 @@ func (f *LearnedFlow) MarshalText() ([]byte, error) {
 	b = append(b, ","+hardTimeout+"="...)
 	b = strconv.AppendInt(b, int64(f.HardTimeout), 10)
 
-	b = append(b, ","+limit+"="...)
-	b = strconv.AppendInt(b, int64(f.Limit), 10)
+	if f.Limit > 0 {
+		// On older version of OpenVSwitch, the limit option doesn't exist.
+		// Make sure we don't use it if the value is not set.
+		b = append(b, ","+limit+"="...)
+		b = strconv.AppendInt(b, int64(f.Limit), 10)
+	}
+
 	if f.DeleteLearned {
 		b = append(b, ","+deleteLearned...)
 	}

ovs/flow_test.go

@@ -352,7 +352,7 @@ func TestFlowMarshalText(t *testing.T) {
 					Output(4),
 				},
 			},
-			s: `priority=5000,tcp,in_port=3,nw_dst=169.254.169.254,tp_dst=80,table=0,idle_timeout=0,actions=learn(priority=5000,in_port=4,dl_type=0x0800,nw_proto=6,NXM_OF_IP_SRC[]=NXM_OF_IP_DST[],NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[],nw_dst=1.2.3.4,tp_dst=567,table=0,idle_timeout=60,fin_hard_timeout=1,hard_timeout=0,limit=0,delete_learned,load:NXM_OF_ETH_SRC[]->NXM_OF_ETH_DST[],load:NXM_OF_IP_SRC[]->NXM_OF_IP_DST[],load:NXM_OF_TCP_SRC[]->NXM_OF_TCP_DST[],output:NXM_OF_IN_PORT[]),mod_nw_src:1.2.3.4,mod_tp_src:567,output:4`,
+			s: `priority=5000,tcp,in_port=3,nw_dst=169.254.169.254,tp_dst=80,table=0,idle_timeout=0,actions=learn(priority=5000,in_port=4,dl_type=0x0800,nw_proto=6,NXM_OF_IP_SRC[]=NXM_OF_IP_DST[],NXM_OF_TCP_SRC[]=NXM_OF_TCP_DST[],nw_dst=1.2.3.4,tp_dst=567,table=0,idle_timeout=60,fin_hard_timeout=1,hard_timeout=0,delete_learned,load:NXM_OF_ETH_SRC[]->NXM_OF_ETH_DST[],load:NXM_OF_IP_SRC[]->NXM_OF_IP_DST[],load:NXM_OF_TCP_SRC[]->NXM_OF_TCP_DST[],output:NXM_OF_IN_PORT[]),mod_nw_src:1.2.3.4,mod_tp_src:567,output:4`,
 		},
 		{
 			desc: "Flow with LearnedFlow in Learn action with hard_timeout and limit options",