[review] Address feedback

Author: zeeshanlakhani

dpd-api/src/lib.rs

@@ -1736,9 +1736,9 @@ pub trait DpdApi {
     }]
     async fn multicast_group_create_underlay_v1(
         rqctx: RequestContext<Self::Context>,
-        group: TypedBody<v5::MulticastGroupCreateUnderlayEntry>,
+        group: TypedBody<v1::MulticastGroupCreateUnderlayEntry>,
     ) -> Result<
-        HttpResponseCreated<v5::MulticastGroupUnderlayResponse>,
+        HttpResponseCreated<v1::MulticastGroupUnderlayResponse>,
         HttpError,
     > {
         let v4_body = group
@@ -1871,8 +1871,8 @@ pub trait DpdApi {
     }]
     async fn multicast_group_get_underlay_v1(
         rqctx: RequestContext<Self::Context>,
-        path: Path<v5::MulticastUnderlayGroupIpParam>,
-    ) -> Result<HttpResponseOk<v5::MulticastGroupUnderlayResponse>, HttpError>
+        path: Path<v1::MulticastUnderlayGroupIpParam>,
+    ) -> Result<HttpResponseOk<v1::MulticastGroupUnderlayResponse>, HttpError>
     {
         let v4_path = path.try_map(|p| {
             mcast::UnderlayMulticastIpv6::try_from(p.group_ip)
@@ -1920,9 +1920,9 @@ pub trait DpdApi {
     }]
     async fn multicast_group_update_underlay_v1(
         rqctx: RequestContext<Self::Context>,
-        path: Path<v5::MulticastUnderlayGroupIpParam>,
-        group: TypedBody<v5::MulticastGroupUpdateUnderlayEntry>,
-    ) -> Result<HttpResponseOk<v5::MulticastGroupUnderlayResponse>, HttpError>;
+        path: Path<v1::MulticastUnderlayGroupIpParam>,
+        group: TypedBody<v1::MulticastGroupUpdateUnderlayEntry>,
+    ) -> Result<HttpResponseOk<v1::MulticastGroupUnderlayResponse>, HttpError>;
 
     /**
      * Update an external-only multicast group configuration for a given group IP address.

dpd-api/src/v5.rs

@@ -20,13 +20,6 @@ use dpd_types::mcast::{
     ExternalForwarding, InternalForwarding, IpSrc, MulticastGroupId,
 };
 
-// Re-export underlay types from v1 (unchanged in v5)
-pub use crate::v1::AdminScopedIpv6;
-pub use crate::v1::MulticastGroupCreateUnderlayEntry;
-pub use crate::v1::MulticastGroupUnderlayResponse;
-pub use crate::v1::MulticastGroupUpdateUnderlayEntry;
-pub use crate::v1::MulticastUnderlayGroupIpParam;
-
 // External multicast types changed in v5 (use new IpSrc with Any variant)
 
 /// Response structure for external multicast group operations.

dpd-client/tests/integration_tests/common.rs

@@ -36,6 +36,9 @@ use types::PortId;
 const SHOW_VERBOSE: u8 = 0x01;
 const SHOW_HEX: u8 = 0x02;
 
+/// Admin-local IPv6 multicast prefix (ff04::/16, scope 4).
+pub const ADMIN_LOCAL_MULTICAST_PREFIX: u16 = 0xFF04;
+
 // Timeout set on `Pcap` objects.
 //
 // This is used as the "buffer timeout", which is the duration libpcap buffers
@@ -1425,6 +1428,7 @@ pub fn gen_arp_reply(src: Endpoint, tgt: Endpoint) -> Packet {
 }
 
 pub mod prelude {
+    pub use super::ADMIN_LOCAL_MULTICAST_PREFIX;
     pub use super::NO_PORT;
     pub use super::PhysPort;
     pub use super::SERVICE_PORT;