Skip to content

Commit a253044

Browse files
[post-merge] update to correct tag type, align with main
1 parent 4dc9de9 commit a253044

7 files changed

Lines changed: 79 additions & 99 deletions

File tree

dpd-api/src/lib.rs

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,12 +1592,7 @@ pub trait DpdApi {
15921592

15931593
/**
15941594
* Delete a multicast group configuration by IP address (API versions 1-3).
1595-
*
1596-
* Does not include tag validation.
15971595
*/
1598-
// We cannot provide a default implementation that delegates to
1599-
// `multicast_group_delete` because Dropshot's `Query` extractor is opaque
1600-
// and cannot be constructed outside the framework.
16011596
#[endpoint {
16021597
method = DELETE,
16031598
path = "/multicast/groups/{group_ip}",
@@ -1720,11 +1715,8 @@ pub trait DpdApi {
17201715
/**
17211716
* Update an underlay (internal) multicast group configuration (API v1-v3).
17221717
*
1723-
* Tags are optional. If a tag is not provided, the existing tag is preserved.
1718+
* Tags are optional for backward compatibility.
17241719
*/
1725-
// We cannot provide a default implementation that delegates to
1726-
// `multicast_group_update_underlay` because the implementor must look up
1727-
// the existing tag if not provided in the request.
17281720
#[endpoint {
17291721
method = PUT,
17301722
path = "/multicast/underlay-groups/{group_ip}",
@@ -1759,12 +1751,8 @@ pub trait DpdApi {
17591751
/**
17601752
* Update an external-only multicast group configuration (API v3).
17611753
*
1762-
* Tags are optional. If a tag is not provided, the existing tag is preserved.
1763-
* Returns 201 Created (API v4+ returns 200 OK).
1754+
* Tags are optional for backward compatibility.
17641755
*/
1765-
// We cannot provide a default implementation that delegates to
1766-
// `multicast_group_update_external` because the implementor must look up
1767-
// the existing tag if not provided in the request.
17681756
#[endpoint {
17691757
method = PUT,
17701758
path = "/multicast/external-groups/{group_ip}",
@@ -1782,12 +1770,8 @@ pub trait DpdApi {
17821770
/**
17831771
* Update an external-only multicast group configuration (API v1/v2).
17841772
*
1785-
* Tags are optional. If a tag is not provided, the existing tag is preserved.
1786-
* Returns 201 Created (API v4+ returns 200 OK).
1773+
* Tags are optional for backward compatibility.
17871774
*/
1788-
// We cannot provide a default implementation that delegates to
1789-
// `multicast_group_update_external` because the implementor must look up
1790-
// the existing tag if not provided in the request.
17911775
#[endpoint {
17921776
method = PUT,
17931777
path = "/multicast/external-groups/{group_ip}",
@@ -2681,7 +2665,6 @@ pub struct MulticastGroupIpParam {
26812665
#[derive(
26822666
Clone, Debug, PartialEq, Eq, Hash, Deserialize, Serialize, JsonSchema,
26832667
)]
2684-
#[schemars(transparent)]
26852668
pub struct MulticastTag(
26862669
#[schemars(
26872670
length(min = 1, max = 80),

0 commit comments

Comments
 (0)