feat: Extend protobuf messages

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gateway_config"
-version = "0.2.1"
+version = "0.2.2"
 edition = "2024"
 license = "Apache-2.0"
 

build.rs

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 fn main() {
-    #[cfg(feature = "regenerate")] {
+    #[cfg(feature = "regenerate")]
+    {
         // We will use self-contained protoc binary, have to hack env param to force it to use
         unsafe {
             std::env::set_var("PROTOC", protoc_bin_vendored::protoc_bin_path().unwrap());
@@ -30,5 +31,4 @@ fn main() {
     {
         // Do nothing
     }
-
 }

proto/dataplane.proto

@@ -72,7 +72,7 @@ message OspfConfig {
 /* Defines a logical interface. May correlate with physical representation */
 message Interface {
   string name = 1;
-  string ipaddr = 2;
+  repeated string ipaddrs = 2;
   IfType type = 3;
   IfRole role = 4;
   optional uint32 vlan = 5; /* only if VLAN role is defined */
@@ -189,6 +189,7 @@ message BgpNeighbor {
   string remote_asn = 2;
   repeated BgpAF af_activate = 3;
   BgpNeighborUpdateSource update_source = 4;
+  repeated string networks = 5;
 }
 
 /* IP Prefix filtering route map description */

src/generated/config.rs

@@ -56,8 +56,8 @@ pub struct OspfConfig {
 pub struct Interface {
     #[prost(string, tag = "1")]
     pub name: ::prost::alloc::string::String,
-    #[prost(string, tag = "2")]
-    pub ipaddr: ::prost::alloc::string::String,
+    #[prost(string, repeated, tag = "2")]
+    pub ipaddrs: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
     #[prost(enumeration = "IfType", tag = "3")]
     pub r#type: i32,
     #[prost(enumeration = "IfRole", tag = "4")]
@@ -219,6 +219,8 @@ pub struct BgpNeighbor {
     pub af_activate: ::prost::alloc::vec::Vec<i32>,
     #[prost(message, optional, tag = "4")]
     pub update_source: ::core::option::Option<BgpNeighborUpdateSource>,
+    #[prost(string, repeated, tag = "5")]
+    pub networks: ::prost::alloc::vec::Vec<::prost::alloc::string::String>,
 }
 /// IP Prefix filtering route map description
 #[derive(::serde::Deserialize, ::serde::Serialize)]

src/lib.rs

@@ -6,34 +6,54 @@ pub mod config {
 }
 
 pub use config::{
-    // Service definitions
-    config_service_server::{ConfigService, ConfigServiceServer},
-    config_service_client::ConfigServiceClient,
-
-    // Request/Response types
-    GetConfigRequest,
+    BgpAddressFamilyIPv4,
+    BgpAddressFamilyIPv6,
+    BgpAddressFamilyL2vpnEvpn,
+    BgpAf,
+    BgpNeighbor,
+    // Device related types
+    Device,
+    Eal,
+    // Common types
+    Error,
+
+    Expose,
     GatewayConfig,
     GetConfigGenerationRequest,
     GetConfigGenerationResponse,
-    UpdateConfigRequest,
-    UpdateConfigResponse,
-
-    // Common types
-    Error,
-
-    // Device related types
-    Device, Ports, Eal, LogLevel, PacketDriver,
-
+    // Request/Response types
+    GetConfigRequest,
+    IfRole,
+    IfType,
     // Interface related types
-    Interface, IfType, IfRole, OspfConfig, OspfInterface,
-
-    // Underlay related types
-    Underlay, Vrf, RouterConfig, BgpNeighbor, BgpAf, 
-    BgpAddressFamilyIPv4, BgpAddressFamilyIPv6, BgpAddressFamilyL2vpnEvpn,
-    RouteMap,
-
+    Interface,
+    LogLevel,
+    OspfConfig,
+    OspfInterface,
+
     // Overlay related types
-    Overlay, Vpc, VpcPeering, PeeringEntryFor, Expose, PeeringIPs, PeeringAs,
+    Overlay,
+    PacketDriver,
+
+    PeeringAs,
+    PeeringEntryFor,
+    PeeringIPs,
+    Ports,
+    RouteMap,
+
+    RouterConfig,
+    // Underlay related types
+    Underlay,
+    UpdateConfigRequest,
+    UpdateConfigResponse,
+
+    Vpc,
+    VpcPeering,
+    Vrf,
+    config_service_client::ConfigServiceClient,
+
+    // Service definitions
+    config_service_server::{ConfigService, ConfigServiceServer},
 };
 
 pub fn get_proto_path() -> std::path::PathBuf {

tests/simple_test.rs

@@ -5,8 +5,8 @@ use std::net::SocketAddr;
 use tonic::{Request, Response, Status};
 
 use gateway_config::{
-    ConfigService, ConfigServiceServer, ConfigServiceClient,
-    GetConfigGenerationRequest, GetConfigGenerationResponse,
+    ConfigService, ConfigServiceClient, ConfigServiceServer, GetConfigGenerationRequest,
+    GetConfigGenerationResponse,
 };
 
 struct SimpleConfigService {
@@ -35,14 +35,18 @@ impl ConfigService for SimpleConfigService {
         &self,
         _request: Request<gateway_config::GetConfigRequest>,
     ) -> Result<Response<gateway_config::GatewayConfig>, Status> {
-        Err(Status::unimplemented("get_config not implemented in this test"))
+        Err(Status::unimplemented(
+            "get_config not implemented in this test",
+        ))
     }
 
     async fn update_config(
         &self,
         _request: Request<gateway_config::UpdateConfigRequest>,
     ) -> Result<Response<gateway_config::UpdateConfigResponse>, Status> {
-        Err(Status::unimplemented("update_config not implemented in this test"))
+        Err(Status::unimplemented(
+            "update_config not implemented in this test",
+        ))
     }
 }