Fix auto-egress-IP / EgressNetworkPolicy interaction

Author: danwinship

pkg/network/node/egressip_test.go

@@ -160,7 +160,7 @@ func TestEgressIP(t *testing.T) {
 	err = assertFlowChanges(origFlows, flows,
 		flowChange{
 			kind:  flowAdded,
-			match: []string{"table=100", "reg0=44", "0xac110066->pkt_mark", "output:2"},
+			match: []string{"table=100", "reg0=44", "0xac110066->pkt_mark", "goto_table:101"},
 		},
 	)
 	if err != nil {
@@ -195,7 +195,7 @@ func TestEgressIP(t *testing.T) {
 	err = assertFlowChanges(origFlows, flows,
 		flowChange{
 			kind:  flowAdded,
-			match: []string{"table=100", "reg0=45", "0xac110067->pkt_mark", "output:2"},
+			match: []string{"table=100", "reg0=45", "0xac110067->pkt_mark", "goto_table:101"},
 		},
 	)
 	if err != nil {
@@ -216,7 +216,7 @@ func TestEgressIP(t *testing.T) {
 	err = assertFlowChanges(origFlows, flows,
 		flowChange{
 			kind:  flowRemoved,
-			match: []string{"table=100", "reg0=44", "0xac110066->pkt_mark", "output:2"},
+			match: []string{"table=100", "reg0=44", "0xac110066->pkt_mark", "goto_table:101"},
 		},
 	)
 	if err != nil {
@@ -262,7 +262,7 @@ func TestEgressIP(t *testing.T) {
 	err = assertFlowChanges(origFlows, flows,
 		flowChange{
 			kind:  flowRemoved,
-			match: []string{"table=100", "reg0=45", "0xac110067->pkt_mark", "output:2"},
+			match: []string{"table=100", "reg0=45", "0xac110067->pkt_mark", "goto_table:101"},
 		},
 		flowChange{
 			kind:  flowAdded,

pkg/network/node/ovscontroller.go

@@ -704,7 +704,7 @@ func (oc *ovsController) UpdateNamespaceEgressRules(vnid uint32, nodeIP, egressH
 		otx.AddFlow("table=100, priority=100, reg0=%d, actions=drop", vnid)
 	} else if nodeIP == oc.localIP {
 		// Local Egress IP
-		otx.AddFlow("table=100, priority=100, reg0=%d, ip, actions=set_field:%s->eth_dst,set_field:%s->pkt_mark,output:2", vnid, oc.tunMAC, egressHex)
+		otx.AddFlow("table=100, priority=100, reg0=%d, ip, actions=set_field:%s->eth_dst,set_field:%s->pkt_mark,goto_table:101", vnid, oc.tunMAC, egressHex)
 	} else {
 		// Remote Egress IP; send via VXLAN
 		otx.AddFlow("table=100, priority=100, reg0=%d, ip, actions=move:NXM_NX_REG0[]->NXM_NX_TUN_ID[0..31],set_field:%s->tun_dst,output:1", vnid, nodeIP)