Merge pull request #99 from digitalocean/nshrader/GATEWAYS-1588/add-move-actionparser

ovs: add action parser for move

Author: icosahedral

ovs/actionparser.go

@@ -160,6 +160,10 @@ var (
 	// with its parameters.
 	loadRe = regexp.MustCompile(`load:(\S+)->(\S+)`)
 
+	// moveRe is the regex used to match the move action
+	// with its parameters.
+	moveRe = regexp.MustCompile(`move:(\S+)->(\S+)`)
+
 	// setFieldRe is the regex used to match the set_field action
 	// with its parameters.
 	setFieldRe = regexp.MustCompile(`set_field:(\S+)->(\S+)`)
@@ -369,6 +373,14 @@ func parseAction(s string) (Action, error) {
 		return Load(ss[0][1], ss[0][2]), nil
 	}
 
+	if ss := moveRe.FindAllStringSubmatch(s, 2); len(ss) > 0 && len(ss[0]) == 3 {
+		// Results are:
+		//  - full string
+		//  - value
+		//  - field
+		return Move(ss[0][1], ss[0][2]), nil
+	}
+
 	if ss := setFieldRe.FindAllStringSubmatch(s, 2); len(ss) > 0 && len(ss[0]) == 3 {
 		// Results are:
 		//  - full string

ovs/actionparser_test.go

@@ -269,6 +269,18 @@ func Test_parseAction(t *testing.T) {
 			s: "load:0x2->NXM_OF_ARP_OP[]",
 			a: Load("0x2", "NXM_OF_ARP_OP[]"),
 		},
+		{
+			s:       "move:->NXM_OF_ARP_OP[]",
+			invalid: true,
+		},
+		{
+			s:       "move:NXM_OF_ARP_SPA[]->",
+			invalid: true,
+		},
+		{
+			s: "move:NXM_OF_ARP_SPA[]->NXM_OF_ARP_TPA[]",
+			a: Move("move:NXM_OF_ARP_SPA[]", "NXM_OF_ARP_TPA[]"),
+		},
 		{
 			s:       "set_field:->arp_spa",
 			invalid: true,