merge upstream branch

Author: zeeshanlakhani

tests/src/ddm.rs

@@ -4,7 +4,7 @@
 
 use anyhow::{Result, anyhow};
 use ddm_admin_client::Client;
-use ddm_admin_client::types::TunnelOrigin;
+use ddm_admin_client::types::{MulticastOrigin, TunnelOrigin, Vni};
 use slog::{Drain, Logger};
 use std::env;
 use std::net::Ipv6Addr;
@@ -642,6 +642,49 @@ async fn run_trio_tests(
 
     println!("tunnel endpoint withdraw passed");
 
+    // Multicast group advertise/withdraw across the trio. Mirrors how
+    // mg-lower in the switch zone publishes overlay→underlay multicast
+    // bindings: the transit router originates an advertisement, and the
+    // server routers learn it via DDM exchange.
+    wait_for_eq!(multicast_originated_count(&t1).await?, 0);
+
+    let mcast_origin = MulticastOrigin {
+        overlay_group: "233.252.0.1".parse().unwrap(),
+        underlay_group: "ff04::100".parse().unwrap(),
+        vni: Vni(77),
+        source: None,
+        metric: 0,
+    };
+
+    t1.advertise_multicast_groups(&vec![mcast_origin.clone()])
+        .await?;
+
+    wait_for_eq!(multicast_originated_count(&t1).await?, 1);
+    wait_for_eq!(multicast_group_count(&t1).await?, 0);
+    wait_for_eq!(multicast_group_count(&s1).await?, 1);
+    wait_for_eq!(multicast_group_count(&s2).await?, 1);
+
+    println!("multicast group advertise passed");
+
+    // Server router restart: s1's view of the multicast group must
+    // converge again after ddmd restarts. wait_for_eq tolerates the
+    // restart window via unwrap_or sentinel.
+    zs1.stop_router()?;
+    zs1.start_router(false)?;
+    let s1 = Client::new("http://10.0.0.1:8000", log.clone());
+    wait_for_eq!(multicast_group_count(&s1).await.unwrap_or(99), 1);
+
+    println!("multicast router restart passed");
+
+    t1.withdraw_multicast_groups(&vec![mcast_origin]).await?;
+
+    wait_for_eq!(multicast_originated_count(&t1).await?, 0);
+    wait_for_eq!(multicast_group_count(&t1).await?, 0);
+    wait_for_eq!(multicast_group_count(&s1).await?, 0);
+    wait_for_eq!(multicast_group_count(&s2).await?, 0);
+
+    println!("multicast group withdraw passed");
+
     Ok(())
 }
 
@@ -812,6 +855,14 @@ async fn tunnel_originated_endpoint_count(c: &Client) -> Result<usize> {
     Ok(c.get_originated_tunnel_endpoints().await?.len())
 }
 
+async fn multicast_group_count(c: &Client) -> Result<usize> {
+    Ok(c.get_multicast_groups().await?.len())
+}
+
+async fn multicast_originated_count(c: &Client) -> Result<usize> {
+    Ok(c.get_originated_multicast_groups().await?.len())
+}
+
 fn init_logger() -> Logger {
     let decorator = slog_term::TermDecorator::new().build();
     let drain = slog_term::FullFormat::new(decorator).build().fuse();