Upgrade npol patch from patchset 8 to 12

This patch upgrade the npol patch we target from
patchset 8 to 12, removes the unused addressfamily
and simplifies the private patches we apply.

We keep a single ACL+npol binding patch that updates
the ACL code to allow hooking the npol logic, and
leverage it in the public npol plugin in VPP.

Signed-off-by: Nathan Skrzypczak <[email protected]>

Author: sknat

calico-vpp-agent/felix/rule.go

@@ -123,17 +123,6 @@ func fromProtoRule(r *proto.Rule) (rule *Rule, err error) {
 		return nil, fmt.Errorf("unknown rule action: %s", r.Action)
 	}
 
-	switch r.IpVersion {
-	case proto.IPVersion_ANY:
-		rule.AddressFamily = types.FamilyAll
-	case proto.IPVersion_IPV4:
-		rule.AddressFamily = types.FamilyV4
-	case proto.IPVersion_IPV6:
-		rule.AddressFamily = types.FamilyV6
-	default:
-		return nil, fmt.Errorf("unknown rule AF: %d", r.IpVersion)
-	}
-
 	if r.Protocol != nil {
 		if r.NotProtocol != nil {
 			return nil, fmt.Errorf("protocol and NotProtocol specified in Rule")

vpplink/generated/bindings/npol/npol.ba.go

@@ -1,12 +1,11 @@
-VPP Version                 : 25.06.0-26~g4b73463b3
+VPP Version                 : 25.06.0-25~gd73287ef3
 Binapi-generator version    : v0.11.0
 VPP Base commit             : 47505bc21 misc: Initial changes for stable/2506 branch
 ------------------ Cherry picked commits --------------------
-fix npol tests and add acl plugin in npol
 acl: acl-plugin custom policies
 cnat: [WIP] no k8s maglev from pods
 pbl: Port based balancer
-gerrit:43710/8 npol: Network Policies plugin
+gerrit:43710/12 npol: Network Policies plugin
 gerrit:43723/3 session svm: fix session migrate attach data corruption
 gerrit:43139/5 udp: regrab connected session after transport clone
 gerrit:43714/5 session: fix handling of closed during migration

vpplink/generated/generate.log

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nathan Skrzypczak <[email protected]>
 Date: Tue, 27 Jul 2021 09:41:55 +0200
-Subject: [PATCH 1/5] pbl: Port based balancer
+Subject: [PATCH 1/3] pbl: Port based balancer
 
 Type: feature
 
@@ -34,10 +34,10 @@ Signed-off-by: Nathan Skrzypczak <[email protected]>
  create mode 100644 src/plugins/pbl/pbl_node.c
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 1117b6da4..5b5522c86 100644
+index d642c742e..43508f00b 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -700,6 +700,11 @@ I:	svs
+@@ -725,6 +725,11 @@ I:	svs
  M:	Neale Ranns <[email protected]>
  F:	src/plugins/svs/
 
@@ -1357,5 +1357,5 @@ index 000000000..478584019
 + * End:
 + */
 -- 
-2.39.2
+2.43.0
 

vpplink/generated/patches/0001-pbl-Port-based-balancer.patch

@@ -1,7 +1,7 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Nathan Skrzypczak <[email protected]>
 Date: Mon, 8 Mar 2021 19:00:04 +0100
-Subject: [PATCH 2/5] cnat: [WIP] no k8s maglev from pods
+Subject: [PATCH 2/3] cnat: [WIP] no k8s maglev from pods
 
 Type: improvement
 
@@ -12,7 +12,7 @@ Signed-off-by: Nathan Skrzypczak <[email protected]>
  1 file changed, 7 insertions(+), 1 deletion(-)
 
 diff --git a/src/plugins/cnat/cnat_node_feature.c b/src/plugins/cnat/cnat_node_feature.c
-index 76aa89398..fd3b90a1a 100644
+index 9b2c0c2fe..d862a84c0 100644
 --- a/src/plugins/cnat/cnat_node_feature.c
 +++ b/src/plugins/cnat/cnat_node_feature.c
 @@ -43,6 +43,7 @@ cnat_input_feature_fn (vlib_main_t *vm, vlib_node_runtime_t *node,
@@ -45,5 +45,5 @@ index 76aa89398..fd3b90a1a 100644
  	  const dpo_id_t *dpo0;
  	  const load_balance_t *lb1;
 -- 
-2.39.2
+2.43.0