Merge pull request #95 from digitalocean/nbouliane/learn_options

add hard_timeout and limit options to the learn action

Author: nicboul

ovs/action_test.go

@@ -682,7 +682,19 @@ 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,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,limit=0,delete_learned,output:in_port,load:2->tp_dst)`,
+		},
+		{
+			desc: "learn ok",
+			a: Learn(&LearnedFlow{
+				DeleteLearned:  true,
+				FinHardTimeout: 10,
+				HardTimeout:    30,
+				Limit:          10,
+				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=30,limit=10,delete_learned,output:in_port,load:2->tp_dst)`,
 		},
 		{
 			desc: "prohibited learned action, mod_tp_dst",
@@ -806,10 +818,12 @@ func TestActionGoString(t *testing.T) {
 			a: Learn(&LearnedFlow{
 				DeleteLearned:  true,
 				FinHardTimeout: 10,
+				HardTimeout:    30,
+				Limit:          10,
 				Matches:        []Match{DataLinkType(0x800)},
 				Actions:        []Action{OutputField("in_port")},
 			}),
-			s: `ovs.Learn(&ovs.LearnedFlow{Priority:0, InPort:0, Matches:[]ovs.Match{ovs.DataLinkType(0x0800)}, Table:0, IdleTimeout:0, Cookie:0x0, Actions:[]ovs.Action{ovs.OutputField("in_port")}, DeleteLearned:true, FinHardTimeout:10})`,
+			s: `ovs.Learn(&ovs.LearnedFlow{Priority:0, InPort:0, Matches:[]ovs.Match{ovs.DataLinkType(0x0800)}, Table:0, IdleTimeout:0, Cookie:0x0, Actions:[]ovs.Action{ovs.OutputField("in_port")}, DeleteLearned:true, FinHardTimeout:10, HardTimeout:30, Limit:10})`,
 		},
 	}
 

ovs/flow.go

@@ -79,6 +79,8 @@ type LearnedFlow struct {
 
 	DeleteLearned  bool
 	FinHardTimeout int
+	HardTimeout    int
+	Limit          int
 }
 
 var _ error = &FlowError{}
@@ -123,6 +125,8 @@ const (
 	// Variables used in LearnedFlows only.
 	deleteLearned  = "delete_learned"
 	finHardTimeout = "fin_hard_timeout"
+	hardTimeout    = "hard_timeout"
+	limit          = "limit"
 
 	portLOCAL = "LOCAL"
 )
@@ -262,6 +266,11 @@ func (f *LearnedFlow) MarshalText() ([]byte, error) {
 	b = append(b, ","+finHardTimeout+"="...)
 	b = strconv.AppendInt(b, int64(f.FinHardTimeout), 10)
 
+	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.DeleteLearned {
 		b = append(b, ","+deleteLearned...)
 	}

ovs/flow_test.go

@@ -352,7 +352,50 @@ 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,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,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`,
+		},
+		{
+			desc: "Flow with LearnedFlow in Learn action with hard_timeout and limit options",
+			f: &Flow{
+				Priority: 5000,
+				Protocol: "tcp",
+				InPort:   3,
+				Matches: []Match{
+					NetworkDestination("169.254.169.254"),
+					TransportDestinationPort(80),
+				},
+				Actions: []Action{
+					Learn(
+						&LearnedFlow{
+							DeleteLearned:  true,
+							FinHardTimeout: 1,
+							HardTimeout:    30,
+							Limit:          10,
+							Table:          0,
+							IdleTimeout:    60,
+							Priority:       5000,
+							InPort:         4,
+							Matches: []Match{
+								DataLinkType(0x800),
+								NetworkProtocol(6),
+								FieldMatch("NXM_OF_IP_SRC[]", "NXM_OF_IP_DST[]"),
+								FieldMatch("NXM_OF_TCP_SRC[]", "NXM_OF_TCP_DST[]"),
+								NetworkDestination("1.2.3.4"),
+								TransportDestinationPort(567),
+							},
+							Actions: []Action{
+								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[]"),
+								OutputField("NXM_OF_IN_PORT[]"),
+							},
+						}),
+					ModNetworkSource(net.IPv4(1, 2, 3, 4)),
+					ModTransportSourcePort(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=30,limit=10,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`,
 		},
 	}