fix: Add missing models to ConfigData (#1625)

Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
(cherry picked from commit 455fbc2)

plugins/configurator/configurator.go

@@ -101,9 +101,9 @@ func (svc *configuratorServer) Delete(ctx context.Context, req *rpc.DeleteReques
 	defer trackOperation("Delete")()
 
 	protos := util.ExtractProtos(
-		req.Delete.VppConfig,
-		req.Delete.LinuxConfig,
-		req.Delete.NetallocConfig,
+		req.GetDelete().GetVppConfig(),
+		req.GetDelete().GetLinuxConfig(),
+		req.GetDelete().GetNetallocConfig(),
 	)
 
 	var kvPairs []orchestrator.KeyVal

proto/ligato/linux/linux_types.go

@@ -16,6 +16,7 @@ package linux
 
 import (
 	linux_interfaces "go.ligato.io/vpp-agent/v3/proto/ligato/linux/interfaces"
+	linux_iptables "go.ligato.io/vpp-agent/v3/proto/ligato/linux/iptables"
 	linux_l3 "go.ligato.io/vpp-agent/v3/proto/ligato/linux/l3"
 )
 
@@ -26,4 +27,7 @@ type (
 	// L3
 	Route    = linux_l3.Route
 	ARPEntry = linux_l3.ARPEntry
+
+	// IP tables
+	IPTablesRuleChain = linux_iptables.RuleChain
 )

proto/ligato/vpp/vpp.proto

@@ -15,6 +15,7 @@ import "ligato/vpp/l2/fib.proto";
 import "ligato/vpp/l2/xconnect.proto";
 import "ligato/vpp/l3/arp.proto";
 import "ligato/vpp/l3/l3.proto";
+import "ligato/vpp/l3/l3xc.proto";
 import "ligato/vpp/l3/route.proto";
 import "ligato/vpp/l3/vrf.proto";
 import "ligato/vpp/nat/nat.proto";
@@ -37,6 +38,8 @@ message ConfigData {
     l3.ProxyARP proxy_arp = 42;
     l3.IPScanNeighbor ipscan_neighbor = 43;
     repeated l3.VrfTable vrfs = 44;
+    repeated l3.L3XConnect l3xconnects = 45;
+    repeated l3.DHCPProxy dhcp_proxies = 46;
 
     nat.Nat44Global nat44_global = 50;
     repeated nat.DNat44 dnat44s = 51;
@@ -50,11 +53,10 @@ message ConfigData {
     repeated punt.ToHost punt_tohosts = 71;
     repeated punt.Exception punt_exceptions = 72;
 
+    srv6.SRv6Global srv6_global = 83;
     repeated srv6.LocalSID srv6_localsids = 80;
     repeated srv6.Policy srv6_policies = 81;
     repeated srv6.Steering srv6_steerings = 82;
-
-    srv6.SRv6Global srv6_global = 83;
 }
 
 message Notification {

proto/ligato/vpp/vpp_types.go

@@ -23,17 +23,18 @@ import (
 	vpp_l3 "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/l3"
 	vpp_nat "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/nat"
 	vpp_punt "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/punt"
-	vpp_stn "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/stn"
+	vpp_srv6 "go.ligato.io/vpp-agent/v3/proto/ligato/vpp/srv6"
 )
 
 type (
-	// ACL
+	// Interface
+	Interface = vpp_interfaces.Interface
+	Span = vpp_interfaces.Span
+
+	// ACL & ABF
 	ACL = vpp_acl.ACL
 	ABF = vpp_abf.ABF
 
-	// Interfaces
-	Interface = vpp_interfaces.Interface
-
 	// L2
 	BridgeDomain = vpp_l2.BridgeDomain
 	L2FIB        = vpp_l2.FIBEntry
@@ -42,21 +43,30 @@ type (
 	// L3
 	Route       = vpp_l3.Route
 	ARPEntry    = vpp_l3.ARPEntry
-	IPScanNeigh = vpp_l3.IPScanNeighbor
 	ProxyARP    = vpp_l3.ProxyARP
-
-	// IPSec
-	IPSecSPD = vpp_ipsec.SecurityPolicyDatabase
-	IPSecSA  = vpp_ipsec.SecurityAssociation
+	IPScanNeigh = vpp_l3.IPScanNeighbor
+	VRFTable    = vpp_l3.VrfTable
+	L3XConnect    = vpp_l3.L3XConnect
+	DHCPProxy    = vpp_l3.DHCPProxy
 
 	// NAT
 	NAT44Global = vpp_nat.Nat44Global
 	DNAT44      = vpp_nat.DNat44
+	Nat44AddressPool      = vpp_nat.Nat44AddressPool
+	Nat44Interface      = vpp_nat.Nat44Interface
 
-	// STN
-	STNRule = vpp_stn.Rule
+	// IPSec
+	IPSecSPD = vpp_ipsec.SecurityPolicyDatabase
+	IPSecSA  = vpp_ipsec.SecurityAssociation
 
 	// Punt
 	PuntIPRedirect = vpp_punt.IPRedirect
 	PuntToHost     = vpp_punt.ToHost
+	PuntException     = vpp_punt.Exception
+
+	// SRv6
+	SRv6Global = vpp_srv6.SRv6Global
+	SRv6LocalSID = vpp_srv6.LocalSID
+	SRv6Policy = vpp_srv6.Policy
+	SRv6Steering = vpp_srv6.Steering
 )