diff --git a/plugins/configurator/configurator.go b/plugins/configurator/configurator.go index a2abb41feb..dcad5699c7 100644 --- a/plugins/configurator/configurator.go +++ b/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 diff --git a/proto/ligato/linux/linux_types.go b/proto/ligato/linux/linux_types.go index 6528bece66..a8ebaa005b 100644 --- a/proto/ligato/linux/linux_types.go +++ b/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 ) diff --git a/proto/ligato/vpp/vpp.pb.go b/proto/ligato/vpp/vpp.pb.go index 7ad8b26c3e..7015eda7f8 100644 --- a/proto/ligato/vpp/vpp.pb.go +++ b/proto/ligato/vpp/vpp.pb.go @@ -42,6 +42,8 @@ type ConfigData struct { ProxyArp *l3.ProxyARP `protobuf:"bytes,42,opt,name=proxy_arp,json=proxyArp,proto3" json:"proxy_arp,omitempty"` IpscanNeighbor *l3.IPScanNeighbor `protobuf:"bytes,43,opt,name=ipscan_neighbor,json=ipscanNeighbor,proto3" json:"ipscan_neighbor,omitempty"` Vrfs []*l3.VrfTable `protobuf:"bytes,44,rep,name=vrfs,proto3" json:"vrfs,omitempty"` + L3Xconnects []*l3.L3XConnect `protobuf:"bytes,45,rep,name=l3xconnects,proto3" json:"l3xconnects,omitempty"` + DhcpProxies []*l3.DHCPProxy `protobuf:"bytes,46,rep,name=dhcp_proxies,json=dhcpProxies,proto3" json:"dhcp_proxies,omitempty"` Nat44Global *nat.Nat44Global `protobuf:"bytes,50,opt,name=nat44_global,json=nat44Global,proto3" json:"nat44_global,omitempty"` Dnat44S []*nat.DNat44 `protobuf:"bytes,51,rep,name=dnat44s,proto3" json:"dnat44s,omitempty"` Nat44Interfaces []*nat.Nat44Interface `protobuf:"bytes,52,rep,name=nat44_interfaces,json=nat44Interfaces,proto3" json:"nat44_interfaces,omitempty"` @@ -51,10 +53,10 @@ type ConfigData struct { PuntIpredirects []*punt.IPRedirect `protobuf:"bytes,70,rep,name=punt_ipredirects,json=puntIpredirects,proto3" json:"punt_ipredirects,omitempty"` PuntTohosts []*punt.ToHost `protobuf:"bytes,71,rep,name=punt_tohosts,json=puntTohosts,proto3" json:"punt_tohosts,omitempty"` PuntExceptions []*punt.Exception `protobuf:"bytes,72,rep,name=punt_exceptions,json=puntExceptions,proto3" json:"punt_exceptions,omitempty"` + Srv6Global *srv6.SRv6Global `protobuf:"bytes,83,opt,name=srv6_global,json=srv6Global,proto3" json:"srv6_global,omitempty"` Srv6Localsids []*srv6.LocalSID `protobuf:"bytes,80,rep,name=srv6_localsids,json=srv6Localsids,proto3" json:"srv6_localsids,omitempty"` Srv6Policies []*srv6.Policy `protobuf:"bytes,81,rep,name=srv6_policies,json=srv6Policies,proto3" json:"srv6_policies,omitempty"` Srv6Steerings []*srv6.Steering `protobuf:"bytes,82,rep,name=srv6_steerings,json=srv6Steerings,proto3" json:"srv6_steerings,omitempty"` - Srv6Global *srv6.SRv6Global `protobuf:"bytes,83,opt,name=srv6_global,json=srv6Global,proto3" json:"srv6_global,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -169,6 +171,20 @@ func (m *ConfigData) GetVrfs() []*l3.VrfTable { return nil } +func (m *ConfigData) GetL3Xconnects() []*l3.L3XConnect { + if m != nil { + return m.L3Xconnects + } + return nil +} + +func (m *ConfigData) GetDhcpProxies() []*l3.DHCPProxy { + if m != nil { + return m.DhcpProxies + } + return nil +} + func (m *ConfigData) GetNat44Global() *nat.Nat44Global { if m != nil { return m.Nat44Global @@ -232,6 +248,13 @@ func (m *ConfigData) GetPuntExceptions() []*punt.Exception { return nil } +func (m *ConfigData) GetSrv6Global() *srv6.SRv6Global { + if m != nil { + return m.Srv6Global + } + return nil +} + func (m *ConfigData) GetSrv6Localsids() []*srv6.LocalSID { if m != nil { return m.Srv6Localsids @@ -253,13 +276,6 @@ func (m *ConfigData) GetSrv6Steerings() []*srv6.Steering { return nil } -func (m *ConfigData) GetSrv6Global() *srv6.SRv6Global { - if m != nil { - return m.Srv6Global - } - return nil -} - type Notification struct { Interface *interfaces.InterfaceNotification `protobuf:"bytes,1,opt,name=interface,proto3" json:"interface,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -347,62 +363,65 @@ func init() { func init() { proto.RegisterFile("ligato/vpp/vpp.proto", fileDescriptor_0138a1608d5d59f2) } var fileDescriptor_0138a1608d5d59f2 = []byte{ - // 902 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x95, 0x6f, 0x6f, 0xdb, 0x36, - 0x10, 0xc6, 0x51, 0xac, 0xed, 0x1a, 0x3a, 0x7f, 0x0a, 0x2e, 0x6b, 0xd9, 0x6c, 0xeb, 0xbc, 0x00, - 0xc1, 0xb2, 0x36, 0xb3, 0x37, 0x3b, 0xeb, 0x8b, 0xa1, 0x1b, 0x6a, 0x27, 0x75, 0xea, 0x21, 0x08, - 0x34, 0x3a, 0x18, 0x86, 0xbe, 0x11, 0x28, 0x99, 0x72, 0x09, 0x68, 0x24, 0xc1, 0x63, 0x8c, 0xe4, - 0xfb, 0xee, 0x83, 0x14, 0x3c, 0x49, 0xb6, 0x1c, 0x2b, 0xc8, 0x0b, 0x19, 0x3a, 0xde, 0xef, 0x79, - 0x8e, 0x26, 0x8f, 0x14, 0xd9, 0xcd, 0xd5, 0x4c, 0x78, 0xd3, 0x9d, 0x5b, 0x1b, 0x9e, 0x8e, 0x75, - 0xc6, 0x1b, 0x4a, 0x8a, 0xd1, 0xce, 0xdc, 0xda, 0x3d, 0x56, 0x23, 0x44, 0x92, 0x85, 0xa7, 0xa0, - 0x56, 0x33, 0x69, 0x1e, 0x9e, 0x32, 0x73, 0x50, 0xcb, 0x28, 0xed, 0xa5, 0xcb, 0x44, 0x2a, 0x61, - 0xf9, 0x5a, 0x62, 0xed, 0x66, 0x0c, 0xac, 0xd0, 0x25, 0xf1, 0xc3, 0x1d, 0x84, 0x17, 0xbe, 0x32, - 0xf9, 0xb6, 0x8e, 0x58, 0x90, 0x69, 0xf1, 0xdb, 0x60, 0x90, 0xf7, 0xba, 0x89, 0x53, 0xd3, 0x99, - 0x8c, 0xa7, 0xe6, 0x3f, 0xa1, 0xaa, 0x1a, 0xcf, 0x57, 0x91, 0x4c, 0x25, 0x0d, 0xce, 0x79, 0xaf, - 0x7b, 0x9d, 0x1a, 0xad, 0x65, 0xea, 0x9b, 0x64, 0xfd, 0xae, 0x70, 0xe5, 0xe2, 0xed, 0x3d, 0x5b, - 0x4d, 0xe4, 0xfd, 0x72, 0xfc, 0xc5, 0xea, 0xb8, 0x33, 0x57, 0x8b, 0xff, 0x70, 0xcb, 0x6b, 0xee, - 0x9a, 0x96, 0x58, 0x0b, 0x1f, 0x9e, 0x32, 0xb3, 0x57, 0xcb, 0xd8, 0x2b, 0xed, 0xf1, 0xa7, 0x21, - 0x07, 0x6e, 0xfe, 0x06, 0x7f, 0x8a, 0xdc, 0xfe, 0xff, 0x2d, 0x42, 0x4e, 0x8c, 0xce, 0xd4, 0xec, - 0x54, 0x78, 0x41, 0xdf, 0x11, 0xb2, 0x5c, 0x57, 0x46, 0xda, 0x5f, 0x1c, 0xb6, 0x7a, 0xed, 0xce, - 0x72, 0xfb, 0x3b, 0xcb, 0x6c, 0x67, 0x5c, 0xbd, 0xf2, 0x9a, 0x86, 0xfe, 0x4a, 0x1e, 0x85, 0x0d, - 0x03, 0xd6, 0x42, 0xf1, 0x37, 0x77, 0x88, 0x27, 0x56, 0x68, 0x5e, 0x90, 0xf4, 0x47, 0xf2, 0x50, - 0xa4, 0x39, 0xb0, 0x5d, 0x54, 0x7c, 0x55, 0x57, 0x84, 0x1e, 0x1a, 0x9c, 0x9c, 0x73, 0x04, 0x10, - 0x4c, 0x32, 0x60, 0x5f, 0x37, 0x80, 0x49, 0xd6, 0x19, 0x0c, 0x47, 0x1c, 0x01, 0x3a, 0x24, 0xdb, - 0x2b, 0x5b, 0x0b, 0xec, 0xe5, 0xfa, 0x6c, 0xf2, 0x5e, 0x67, 0x88, 0xd0, 0x29, 0x32, 0x7c, 0x2b, - 0xa9, 0x45, 0x40, 0x5f, 0x93, 0x87, 0x99, 0x4a, 0x80, 0x7d, 0x8f, 0xca, 0xe7, 0xb7, 0x94, 0xa3, - 0xf1, 0xf0, 0xbd, 0xf6, 0xee, 0x86, 0x23, 0x14, 0x0a, 0x56, 0xfd, 0x10, 0x5b, 0xa1, 0x1c, 0xb0, - 0x76, 0x63, 0xc1, 0x7f, 0x4f, 0x0a, 0x28, 0x12, 0xca, 0xf1, 0xad, 0x4a, 0x12, 0x22, 0xa0, 0x47, - 0xe4, 0x31, 0x36, 0x01, 0xb0, 0x43, 0xd4, 0xee, 0xae, 0x68, 0xfb, 0x1d, 0x1e, 0x92, 0xbc, 0x64, - 0xc2, 0xf4, 0x84, 0xb3, 0xc0, 0x7e, 0x6a, 0x98, 0x5e, 0xbf, 0x33, 0xe0, 0x51, 0x39, 0xbd, 0x00, - 0xd1, 0x63, 0xb2, 0x61, 0x9d, 0xb9, 0xbe, 0x89, 0x85, 0xb3, 0xec, 0x55, 0xfb, 0x41, 0x83, 0x22, - 0x0a, 0xf9, 0x01, 0x8f, 0xf8, 0x13, 0x24, 0x07, 0xce, 0xd2, 0x11, 0xd9, 0x51, 0x16, 0x52, 0xa1, - 0x63, 0x2d, 0xd5, 0xec, 0x53, 0x62, 0x1c, 0x7b, 0x8d, 0xda, 0xef, 0x6e, 0x69, 0xc7, 0xd1, 0x24, - 0x15, 0xfa, 0xa2, 0x84, 0xf8, 0x76, 0xa1, 0xaa, 0xe2, 0x30, 0xd5, 0xb9, 0xcb, 0x80, 0x1d, 0x35, - 0x4e, 0xf5, 0x1f, 0x97, 0x5d, 0x8a, 0x24, 0x97, 0x1c, 0x21, 0xfa, 0x27, 0xd9, 0xd4, 0xc2, 0x1f, - 0x1f, 0xc7, 0xb3, 0xdc, 0x24, 0x22, 0x67, 0x3d, 0xac, 0xb8, 0xb2, 0x8e, 0xa1, 0xeb, 0x2f, 0x02, - 0x73, 0x86, 0x08, 0x6f, 0xe9, 0x65, 0x40, 0x7f, 0x21, 0x5f, 0x4e, 0x31, 0x06, 0xd6, 0xc7, 0x7a, - 0xcf, 0x6e, 0x4b, 0x4f, 0x51, 0xcb, 0x2b, 0x8c, 0x8e, 0xc9, 0xd3, 0xa2, 0x62, 0xad, 0xf3, 0x8f, - 0x51, 0xfa, 0xb2, 0xb1, 0xea, 0xb2, 0xef, 0x77, 0xf4, 0x4a, 0x0c, 0x74, 0x40, 0x8a, 0xb9, 0xc4, - 0xd6, 0x98, 0x1c, 0xd8, 0x6f, 0xeb, 0xe7, 0x67, 0xe1, 0x32, 0x98, 0x4e, 0x9d, 0x04, 0x88, 0x8c, - 0xc9, 0x39, 0x41, 0x51, 0x78, 0x05, 0x7a, 0x46, 0x08, 0x5e, 0x58, 0x31, 0xd8, 0x29, 0xb0, 0xb7, - 0xe8, 0x70, 0xb8, 0x72, 0x88, 0xf0, 0x3a, 0x9b, 0xc8, 0xf4, 0xca, 0x29, 0x7f, 0x13, 0x99, 0x5c, - 0xa5, 0x37, 0xe1, 0xec, 0x26, 0x02, 0x24, 0xdf, 0xc0, 0xec, 0xc4, 0x4e, 0x43, 0x4b, 0x6e, 0x94, - 0x46, 0x02, 0xd8, 0x1f, 0xe8, 0x73, 0x70, 0xb7, 0xcf, 0x00, 0xc0, 0xa4, 0x4a, 0x78, 0x65, 0x34, - 0x7f, 0x52, 0x98, 0x08, 0xa0, 0x23, 0xf2, 0x34, 0xdc, 0x23, 0xb1, 0xb2, 0x4e, 0x4e, 0x95, 0x93, - 0xa9, 0x07, 0x36, 0x5a, 0x6f, 0x6c, 0xbc, 0x6b, 0xc6, 0x11, 0x2f, 0x19, 0xbe, 0x13, 0x06, 0xc6, - 0x4b, 0x0d, 0xfd, 0x9d, 0x6c, 0xa2, 0x8f, 0x37, 0x9f, 0x0c, 0x78, 0x60, 0x67, 0xeb, 0x9d, 0x80, - 0x1e, 0x97, 0xe6, 0x83, 0x01, 0xcf, 0x5b, 0x21, 0xb8, 0x2c, 0x58, 0x7a, 0x42, 0xd0, 0x2e, 0x96, - 0xd7, 0xa9, 0xb4, 0x61, 0x7e, 0xc0, 0x3e, 0xa0, 0x7c, 0x6f, 0x4d, 0xfe, 0xbe, 0x42, 0xf8, 0x76, - 0x88, 0x17, 0x21, 0xd0, 0x77, 0x64, 0x3b, 0x5c, 0x7a, 0x71, 0x6e, 0x52, 0x91, 0x83, 0x9a, 0x02, - 0x8b, 0xd0, 0xe3, 0x45, 0xdd, 0x03, 0xaf, 0xc5, 0xf3, 0x40, 0x4c, 0xc6, 0xa7, 0x7c, 0x2b, 0x84, - 0xe7, 0x15, 0x4f, 0xdf, 0x12, 0x1c, 0x88, 0x6d, 0x58, 0x70, 0x25, 0x81, 0xfd, 0xbd, 0xfe, 0x1f, - 0xd0, 0xa0, 0xd8, 0x11, 0xbe, 0x19, 0x82, 0xa8, 0x84, 0x17, 0xf5, 0xc1, 0x4b, 0xe9, 0x94, 0x9e, - 0x01, 0xe3, 0x77, 0xd4, 0x9f, 0x94, 0x44, 0x51, 0xbf, 0x8a, 0x42, 0xfd, 0x16, 0x3a, 0x94, 0xc7, - 0x62, 0xb2, 0x7e, 0x2c, 0x0a, 0x39, 0x9f, 0xbf, 0x29, 0x8f, 0x05, 0x09, 0x03, 0xc5, 0xfb, 0xfe, - 0x47, 0xb2, 0x79, 0x61, 0xbc, 0xca, 0x54, 0x8a, 0x5b, 0x4c, 0xff, 0x22, 0x1b, 0x8b, 0x6e, 0x67, - 0x0f, 0xd0, 0xeb, 0xe8, 0xbe, 0x6b, 0xbe, 0x6e, 0xc0, 0x97, 0xf2, 0xfd, 0x73, 0xf2, 0x68, 0xe2, - 0x05, 0xee, 0xd4, 0x9a, 0xe9, 0xc1, 0x7d, 0xa6, 0xa8, 0xac, 0xb9, 0x0d, 0x8f, 0x3e, 0xbe, 0x9a, - 0x99, 0x4a, 0xa5, 0xf0, 0xa3, 0xf5, 0xb3, 0x98, 0x49, 0xed, 0xbb, 0xf3, 0x7e, 0x17, 0xbf, 0x59, - 0xdd, 0xe5, 0xe7, 0x2c, 0x79, 0x8c, 0x23, 0xfd, 0xcf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x74, 0x90, - 0x3e, 0x55, 0xb8, 0x08, 0x00, 0x00, + // 954 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x95, 0x6d, 0x6f, 0xdb, 0x36, + 0x10, 0xc7, 0x51, 0xac, 0xed, 0x1a, 0xda, 0x4d, 0x0a, 0x2e, 0x6b, 0xd9, 0x6c, 0xeb, 0xb2, 0x00, + 0xc1, 0xb2, 0x36, 0x95, 0xb7, 0x38, 0xeb, 0x8b, 0x35, 0x1b, 0xea, 0x87, 0x3a, 0xf1, 0x60, 0x04, + 0x1a, 0x1d, 0x0c, 0x43, 0xdf, 0x08, 0xd4, 0x93, 0x43, 0x40, 0x13, 0x09, 0x1e, 0x63, 0x24, 0x5f, + 0x76, 0x9f, 0x65, 0xe0, 0x49, 0xb2, 0x65, 0x5b, 0x41, 0x5f, 0x48, 0xd0, 0xf1, 0x7e, 0xff, 0x3b, + 0x8a, 0xbc, 0x23, 0xc9, 0x6e, 0x26, 0x67, 0xc2, 0xaa, 0xce, 0x5c, 0x6b, 0xf7, 0x78, 0xda, 0x28, + 0xab, 0x28, 0x29, 0x46, 0xbd, 0xb9, 0xd6, 0x7b, 0xac, 0x46, 0x88, 0x30, 0x75, 0x4f, 0x41, 0xad, + 0x7a, 0xa2, 0xcc, 0x3d, 0xa5, 0xe7, 0xb0, 0xe6, 0x91, 0xb9, 0x4d, 0x4c, 0x2a, 0xa2, 0x04, 0x96, + 0x9f, 0x25, 0xb6, 0xdf, 0x8c, 0x81, 0x16, 0x79, 0x49, 0xfc, 0x70, 0x0f, 0x61, 0x85, 0xad, 0x82, + 0x7c, 0x5b, 0x47, 0x34, 0x24, 0x51, 0xf1, 0x6e, 0x08, 0x90, 0x9d, 0x74, 0x42, 0x23, 0xe3, 0x59, + 0x12, 0xc4, 0xea, 0x5f, 0x21, 0xab, 0x1c, 0x2f, 0x56, 0x91, 0x54, 0x86, 0x0d, 0x91, 0xb3, 0x93, + 0xce, 0x6d, 0xa4, 0xf2, 0x3c, 0x89, 0x6c, 0x93, 0xac, 0xdb, 0x11, 0xa6, 0x5c, 0xbc, 0xbd, 0xe7, + 0xab, 0x8e, 0xac, 0xdb, 0xb0, 0x5c, 0x38, 0x7e, 0x5b, 0x4d, 0xf2, 0xe5, 0xaa, 0xc7, 0xa8, 0x9b, + 0xc5, 0xdf, 0xad, 0x65, 0x99, 0x9b, 0xa6, 0xc5, 0xcf, 0x85, 0x75, 0x4f, 0xe9, 0xd9, 0xab, 0x79, + 0xf4, 0x4d, 0x6e, 0xf1, 0xd5, 0xe0, 0x03, 0x33, 0x7f, 0x87, 0xaf, 0xc2, 0x77, 0xf0, 0x5f, 0x9b, + 0x90, 0x81, 0xca, 0x53, 0x39, 0x1b, 0x0a, 0x2b, 0xe8, 0x07, 0x42, 0x96, 0x2b, 0xce, 0xc8, 0xfe, + 0x17, 0x47, 0xad, 0x93, 0x7d, 0x6f, 0x59, 0x18, 0xde, 0xd2, 0xeb, 0x8d, 0xab, 0x4f, 0x5e, 0xd3, + 0xd0, 0x5f, 0xc8, 0x23, 0xb7, 0x95, 0xc0, 0x5a, 0x28, 0xfe, 0xe6, 0x1e, 0xf1, 0x54, 0x8b, 0x9c, + 0x17, 0x24, 0xfd, 0x91, 0x3c, 0x14, 0x51, 0x06, 0x6c, 0x17, 0x15, 0x5f, 0xd5, 0x15, 0xae, 0xba, + 0x7a, 0x83, 0x09, 0x47, 0x00, 0xc1, 0x30, 0x05, 0xf6, 0x75, 0x03, 0x18, 0xa6, 0x5e, 0xaf, 0x3f, + 0xe2, 0x08, 0xd0, 0x3e, 0xd9, 0x5e, 0xd9, 0x74, 0x60, 0xaf, 0x36, 0x67, 0x93, 0x9d, 0x78, 0x7d, + 0x84, 0x86, 0xc8, 0xf0, 0xa7, 0x61, 0xcd, 0x02, 0xfa, 0x86, 0x3c, 0x4c, 0x65, 0x08, 0xec, 0x7b, + 0x54, 0xbe, 0x58, 0x53, 0x8e, 0xc6, 0xfd, 0x8f, 0xb9, 0x35, 0x77, 0x1c, 0x21, 0x97, 0xb0, 0xaa, + 0x94, 0x40, 0x0b, 0x69, 0x80, 0xed, 0x37, 0x26, 0xfc, 0x67, 0x50, 0x40, 0xbe, 0x90, 0x86, 0x3f, + 0xad, 0x24, 0xce, 0x02, 0x7a, 0x4c, 0x1e, 0x63, 0x11, 0x00, 0x3b, 0x42, 0xed, 0xee, 0x8a, 0xb6, + 0xeb, 0x71, 0xe7, 0xe4, 0x25, 0xe3, 0xa6, 0x27, 0x8c, 0x06, 0xf6, 0x53, 0xc3, 0xf4, 0xba, 0x5e, + 0x8f, 0xfb, 0xe5, 0xf4, 0x1c, 0x44, 0x4f, 0xc9, 0x96, 0x36, 0xea, 0xf6, 0x2e, 0x10, 0x46, 0xb3, + 0xd7, 0xfb, 0x0f, 0x1a, 0x14, 0xbe, 0xf3, 0xf7, 0xb8, 0xcf, 0x9f, 0x20, 0xd9, 0x33, 0x9a, 0x8e, + 0xc8, 0x8e, 0xd4, 0x10, 0x89, 0x3c, 0xc8, 0x13, 0x39, 0xbb, 0x0e, 0x95, 0x61, 0x6f, 0x50, 0xfb, + 0xdd, 0x9a, 0x76, 0xec, 0x4f, 0x23, 0x91, 0x5f, 0x96, 0x10, 0xdf, 0x2e, 0x54, 0x95, 0xed, 0xa6, + 0x3a, 0x37, 0x29, 0xb0, 0xe3, 0xc6, 0xa9, 0xfe, 0x6d, 0xd2, 0x2b, 0x11, 0x66, 0x09, 0x47, 0x88, + 0xbe, 0x27, 0x2d, 0xd7, 0x24, 0xc5, 0xc2, 0x00, 0x7b, 0x8b, 0x9a, 0x97, 0x6b, 0x9a, 0x49, 0xb7, + 0x5a, 0x48, 0x5e, 0xa7, 0xe9, 0x7b, 0xd2, 0x8e, 0xaf, 0x23, 0x1d, 0xb8, 0x5f, 0x90, 0x09, 0x30, + 0x0f, 0xd5, 0x6c, 0x4d, 0x3d, 0xbc, 0x18, 0xf8, 0xf8, 0xbb, 0xbc, 0xe5, 0x68, 0xbf, 0x80, 0xe9, + 0x1f, 0xa4, 0x9d, 0x0b, 0x7b, 0x7a, 0x1a, 0xcc, 0x32, 0x15, 0x8a, 0x8c, 0x9d, 0xe0, 0xbf, 0xae, + 0xec, 0xa0, 0xeb, 0xb7, 0x4b, 0xc7, 0x9c, 0x23, 0xc2, 0x5b, 0xf9, 0xd2, 0xa0, 0x3f, 0x93, 0x2f, + 0x63, 0xb4, 0x81, 0x75, 0x31, 0xef, 0xf3, 0x75, 0xe9, 0x10, 0xb5, 0xbc, 0xc2, 0xe8, 0x98, 0x3c, + 0x2b, 0x32, 0xd6, 0x7a, 0xee, 0x14, 0xa5, 0xaf, 0x1a, 0xb3, 0x2e, 0x3b, 0x6e, 0x27, 0x5f, 0xb1, + 0x81, 0xf6, 0x48, 0x31, 0x97, 0x40, 0x2b, 0x95, 0x01, 0xfb, 0x75, 0xb3, 0x73, 0x17, 0x51, 0x7a, + 0x71, 0x6c, 0x12, 0x00, 0x5f, 0xa9, 0x8c, 0x13, 0x14, 0xb9, 0x4f, 0xa0, 0xe7, 0x84, 0xe0, 0x21, + 0x1a, 0x80, 0x8e, 0x81, 0x9d, 0x61, 0x84, 0xa3, 0x95, 0xf6, 0xc5, 0x23, 0x76, 0x9a, 0x44, 0x37, + 0x46, 0xda, 0x3b, 0x5f, 0x65, 0x32, 0xba, 0x73, 0xa7, 0x46, 0x28, 0x20, 0xe1, 0x5b, 0xe8, 0x9d, + 0xea, 0xd8, 0x35, 0xc3, 0x56, 0x19, 0x48, 0x00, 0xfb, 0x1d, 0xe3, 0x1c, 0xde, 0x1f, 0xa7, 0x07, + 0xa0, 0x22, 0x29, 0xac, 0x54, 0x39, 0x7f, 0x52, 0x04, 0x11, 0x40, 0x47, 0xe4, 0x99, 0x3b, 0xc1, + 0x02, 0xa9, 0x4d, 0x12, 0x4b, 0x83, 0xb5, 0x30, 0xda, 0x6c, 0x29, 0x3c, 0xe5, 0xc6, 0x3e, 0x2f, + 0x19, 0xbe, 0xe3, 0x06, 0xc6, 0x4b, 0x0d, 0xfd, 0x8d, 0xb4, 0x31, 0x8e, 0x55, 0xd7, 0x0a, 0x2c, + 0xb0, 0xf3, 0xcd, 0x1a, 0xc4, 0x18, 0x57, 0xea, 0x42, 0x81, 0xe5, 0x2d, 0x67, 0x5c, 0x15, 0x2c, + 0x1d, 0x10, 0x0c, 0x17, 0x24, 0xb7, 0x51, 0xa2, 0xdd, 0xfc, 0x80, 0x5d, 0xa0, 0x7c, 0x6f, 0x43, + 0xfe, 0xb1, 0x42, 0xf8, 0xb6, 0xb3, 0x17, 0x26, 0xd0, 0x33, 0xd2, 0x72, 0xc7, 0x6d, 0x55, 0x54, + 0xd3, 0xcd, 0xa2, 0xc2, 0xd3, 0x78, 0xca, 0xe7, 0xef, 0xca, 0xa2, 0x22, 0x6e, 0xa0, 0xac, 0xa9, + 0x0f, 0x64, 0x1b, 0xd5, 0x99, 0x8a, 0x44, 0x06, 0x32, 0x06, 0xe6, 0x6f, 0x36, 0x04, 0x06, 0x98, + 0x38, 0x62, 0x3a, 0x1e, 0xf2, 0xa7, 0xce, 0x9c, 0x54, 0x3c, 0x3d, 0x23, 0x38, 0x10, 0x68, 0xb7, + 0x5d, 0xae, 0x27, 0xfe, 0xda, 0x5c, 0x01, 0x0c, 0x50, 0xec, 0x27, 0x6f, 0x3b, 0xc3, 0x2f, 0xe1, + 0x45, 0x7e, 0xb0, 0x49, 0x62, 0x64, 0x3e, 0x03, 0xc6, 0xef, 0xc9, 0x3f, 0x2d, 0x89, 0x22, 0x7f, + 0x65, 0xc1, 0xc1, 0x27, 0xd2, 0xbe, 0x54, 0x56, 0xa6, 0x32, 0xc2, 0x2d, 0xa6, 0x7f, 0x92, 0xad, + 0x45, 0xb5, 0xb3, 0x07, 0xb8, 0x1a, 0xc7, 0x9f, 0xbb, 0x60, 0xea, 0x01, 0xf8, 0x52, 0x7e, 0x30, + 0x21, 0x8f, 0xa6, 0x56, 0xe0, 0x4e, 0x6d, 0x04, 0x3d, 0xfc, 0x5c, 0x50, 0x54, 0xd6, 0xa2, 0xf5, + 0x8f, 0x3f, 0xbd, 0x9e, 0xa9, 0x4a, 0x25, 0xf1, 0xba, 0x7c, 0x2b, 0x66, 0x49, 0x6e, 0x3b, 0xf3, + 0x6e, 0x07, 0x6f, 0xcb, 0xce, 0xf2, 0x22, 0x0d, 0x1f, 0xe3, 0x48, 0xf7, 0xff, 0x00, 0x00, 0x00, + 0xff, 0xff, 0x62, 0x91, 0xea, 0x98, 0x4c, 0x09, 0x00, 0x00, } diff --git a/proto/ligato/vpp/vpp.proto b/proto/ligato/vpp/vpp.proto index 5b1ca1dd24..51e0c38452 100644 --- a/proto/ligato/vpp/vpp.proto +++ b/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 { diff --git a/proto/ligato/vpp/vpp_types.go b/proto/ligato/vpp/vpp_types.go index 26f20e221d..cec4bea898 100644 --- a/proto/ligato/vpp/vpp_types.go +++ b/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 )