fix(k8s-intf): Protocol IP is a IP/mask not plain IP

spec.gateway.protocol_ip is a UnicastIPv4Addr/mask
not a plain IPv4 addr.  Fix generator and parser to
reflect this.

Author: mvachhar

config/Cargo.toml

@@ -16,6 +16,7 @@ k8s-intf = { workspace = true }
 
 # external
 derive_builder = { workspace = true, default-features = false, features = ["default"] }
+ipnet = { workspace = true }
 linkme = { workspace = true }
 multi_index_map = { workspace = true, features = ["serde"] }
 ordermap = { workspace = true, features = ["std"] }

config/src/converters/k8s/underlay.rs

@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // Copyright Open Network Fabric Authors
 
-use std::net::{IpAddr, Ipv4Addr};
+use std::net::IpAddr;
 
+use ipnet::Ipv4Net;
 use k8s_intf::gateway_agent_crd::GatewayAgentGateway;
 use lpm::prefix::{Prefix, PrefixString};
 use net::eth::mac::SourceMac;
@@ -97,9 +98,14 @@ fn add_bgp_config(
             "Gateway protocol IP not specified".to_string(),
         ))?;
 
-    let router_id = protocol_ip.parse::<Ipv4Addr>().map_err(|e| {
-        FromK8sConversionError::ParseError(format!("Invalid protocol IP {protocol_ip}: {e}"))
-    })?;
+    let router_id = protocol_ip
+        .parse::<Ipv4Net>()
+        .map_err(|e| {
+            FromK8sConversionError::ParseError(format!(
+                "Invalid IPv4 protocol IP {protocol_ip}: {e}"
+            ))
+        })?
+        .addr();
 
     let vtep_ip_raw = gateway
         .vtep_ip
@@ -190,7 +196,10 @@ mod test {
                 // Check BGP configuration
                 assert_eq!(gateway.asn, Some(bgp_config.asn));
                 assert_eq!(
-                    gateway.protocol_ip,
+                    gateway
+                        .protocol_ip
+                        .as_ref()
+                        .map(|v| v.split('/').next().unwrap().to_string()),
                     bgp_config.router_id.map(|v| v.to_string())
                 );
                 let Some(af_ipv4unicast) = bgp_config.af_ipv4unicast else {

k8s-intf/src/bolero/gateway.rs

@@ -40,7 +40,11 @@ impl TypeGenerator for LegalValue<GatewayAgentGateway> {
             interfaces: Some(interfaces).filter(|i| !i.is_empty()),
             neighbors: Some(neighbors).filter(|n| !n.is_empty()),
             profiling: None, // FIXME(manishv) Add a proper implementation
-            protocol_ip: Some(d.produce::<UnicastIpv4Addr>()?.to_string()),
+            protocol_ip: Some(format!(
+                "{}/{}",
+                d.produce::<UnicastIpv4Addr>()?,
+                d.gen_u8(Bound::Included(&0), Bound::Included(&32))?
+            )),
             vtep_ip: Some(format!(
                 "{}/{}",
                 d.produce::<UnicastIpv4Addr>()?,