[action] [PR:82] Support protobuf fields.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "crates/sonic-dash-api-proto/sonic-dash-api"]
+	path = crates/sonic-dash-api-proto/sonic-dash-api
+	url = https://github.com/sonic-net/sonic-dash-api.git

Cargo.toml

@@ -14,6 +14,7 @@ members = [
     "crates/swss-common-bridge",
     "crates/container",
     "crates/sonicdb-derive",
+    "crates/sonic-dash-api-proto"
 ]
 exclude = []
 
@@ -68,9 +69,12 @@ contracts = "0.6"
 derivative = "2"
 derive_builder = "0.20"
 getset = "0.1"
+hex = "0.4"
 lazy_static = "1.4"
 owning_ref = "0.4"
+prost-build = "0.13"
 strum = { version = "0.26", features = ["derive"] }
+strum_macros = "0.26"
 regex = "1"
 dashmap = "6"
 itertools = "0.13"
@@ -92,6 +96,8 @@ swbus-config = { version = "0.1.0", path = "crates/swbus-config" }
 swss-serde = { version = "0.1.0", path = "crates/swss-serde" }
 swbus-actor = { version = "0.1.0", path = "crates/swbus-actor" }
 sonicdb-derive = { version = "0.1.0", path = "crates/sonicdb-derive" }
+sonic-dash-api-proto = { version = "0.1.0", path = "crates/sonic-dash-api-proto" }
+swss-common = { git = "https://github.com/sonic-net/sonic-swss-common.git", branch = "master" }
 
 # Dev dependencies
 criterion = "0.5"

azure-pipelines.yml

@@ -22,6 +22,10 @@ stages:
       vmImage: 'ubuntu-22.04'
 
     steps:
+    - checkout: self
+      clean: true
+      submodules: true
+
     - script: |
         set -exuo pipefail
         # dash-ha build deps

crates/hamgrd/Cargo.toml

@@ -30,7 +30,8 @@ clap.workspace = true
 tracing.workspace = true
 chrono.workspace = true
 uuid.workspace = true
+sonic-dash-api-proto.workspace = true
+prost.workspace = true
+hex.workspace = true
 lazy_static.workspace = true
-
-[dev-dependencies]
 serde_json.workspace = true

crates/hamgrd/src/actors.rs

@@ -9,15 +9,14 @@ pub mod vdpu;
 #[cfg(test)]
 pub mod test;
 use anyhow::Result as AnyhowResult;
+use sonic_common::SonicDbTable;
 use std::sync::Arc;
 use swbus_actor::{spawn, Actor, ActorMessage};
 use swbus_edge::swbus_proto::message_id_generator::MessageIdGenerator;
 use swbus_edge::swbus_proto::result::*;
 use swbus_edge::swbus_proto::swbus::{swbus_message::Body, DataRequest, ServicePath, SwbusErrorCode, SwbusMessage};
 use swbus_edge::SwbusEdgeRuntime;
-use swss_common::{
-    KeyOpFieldValues, KeyOperation, SonicDbTable, SubscriberStateTable, ZmqClient, ZmqProducerStateTable,
-};
+use swss_common::{KeyOpFieldValues, KeyOperation, SubscriberStateTable, ZmqClient, ZmqProducerStateTable};
 use swss_common_bridge::{consumer::ConsumerBridge, producer::spawn_producer_bridge};
 use tokio::sync::mpsc::{channel, Receiver};
 use tokio::task::JoinHandle;
@@ -48,7 +47,7 @@ pub trait DbBasedActor: Actor {
         let sst = SubscriberStateTable::new_async(config_db, T::table_name(), None, None).await?;
         let addr = crate::common_bridge_sp::<T>(&edge_runtime);
         let base_addr = edge_runtime.get_base_sp();
-        Ok(vec![ConsumerBridge::spawn(
+        Ok(vec![ConsumerBridge::spawn::<T, _, _, _>(
             edge_runtime.clone(),
             addr,
             sst,
@@ -220,7 +219,7 @@ where
 
     if actor_id.is_some() {
         let sp = edge_runtime.new_sp(actor_name, actor_id.unwrap());
-        Ok(ConsumerBridge::spawn(
+        Ok(ConsumerBridge::spawn::<T, _, _, _>(
             edge_runtime,
             addr,
             sst,
@@ -235,7 +234,7 @@ where
         ))
     } else {
         let base_addr = edge_runtime.get_base_sp();
-        Ok(ConsumerBridge::spawn(
+        Ok(ConsumerBridge::spawn::<T, _, _, _>(
             edge_runtime,
             addr,
             sst,

crates/hamgrd/src/actors/dpu.rs

@@ -5,11 +5,12 @@ use crate::db_structs::{
 use crate::ha_actor_messages::{ActorRegistration, DpuActorState, RegistrationType};
 use crate::ServicePath;
 use anyhow::{anyhow, Result};
+use sonic_common::SonicDbTable;
 use std::collections::HashSet;
 use std::sync::Arc;
 use swbus_actor::{state::incoming::Incoming, state::outgoing::Outgoing, Actor, ActorMessage, Context, State};
 use swbus_edge::SwbusEdgeRuntime;
-use swss_common::{KeyOpFieldValues, KeyOperation, SonicDbTable, SubscriberStateTable};
+use swss_common::{KeyOpFieldValues, KeyOperation, SubscriberStateTable};
 use swss_common_bridge::consumer::ConsumerBridge;
 use tracing::{debug, error, info, instrument};
 
@@ -92,7 +93,7 @@ impl DpuActor {
         let sst = SubscriberStateTable::new_async(config_db, Self::dpu_table_name(), None, None).await?;
         let addr = crate::common_bridge_sp::<Dpu>(&edge_runtime);
         let base_addr = edge_runtime.get_base_sp();
-        bridges.push(ConsumerBridge::spawn(
+        bridges.push(ConsumerBridge::spawn::<Dpu, _, _, _>(
             edge_runtime.clone(),
             addr,
             sst,
@@ -109,7 +110,7 @@ impl DpuActor {
         let sst = SubscriberStateTable::new_async(config_db, Self::remote_dpu_table_name(), None, None).await?;
         let addr = crate::common_bridge_sp::<RemoteDpu>(&edge_runtime);
         let base_addr = edge_runtime.get_base_sp();
-        bridges.push(ConsumerBridge::spawn(
+        bridges.push(ConsumerBridge::spawn::<RemoteDpu, _, _, _>(
             edge_runtime.clone(),
             addr,
             sst,
@@ -474,8 +475,8 @@ mod test {
     use crate::db_structs::{BfdSessionTable, DashBfdProbeState, DashHaGlobalConfig, Dpu, DpuState, RemoteDpu};
 
     use crate::ha_actor_messages::DpuActorState;
+    use sonic_common::SonicDbTable;
     use std::time::Duration;
-    use swss_common::SonicDbTable;
     use swss_common_testing::Redis;
     use swss_serde::to_field_values;