Skip to content

Commit 704327f

Browse files
andrewjstoneandrewjstone
committed
doc comments, test fixes, etc...
1 parent 2f873e2 commit 704327f

File tree

8 files changed

+41
-35
lines changed

8 files changed

+41
-35
lines changed

‎nexus/external-api/src/lib.rs‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4373,11 +4373,13 @@ pub trait NexusExternalApi {
43734373
async fn rack_membership_add_sleds(
43744374
rqctx: RequestContext<Self::Context>,
43754375
path_params: Path<params::RackPath>,
4376-
req: TypedBody<params::AddSledsRequest>,
4376+
req: TypedBody<params::RackMembershipAddSledsRequest>,
43774377
) -> Result<HttpResponseOk<RackMembershipStatus>, HttpError>;
43784378

4379-
/// Retrieve the rack cluster membership change for the given version or the
4380-
/// latest version if no version is given
4379+
/// Retrieve the rack cluster membership status
4380+
///
4381+
/// Returns the status for the most recent change, or a specific version if
4382+
/// one is specified.
43814383
#[endpoint {
43824384
method = GET,
43834385
path = "/v1/system/hardware/racks/{rack_id}/membership",

‎nexus/src/external_api/http_entrypoints.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6202,7 +6202,7 @@ impl NexusExternalApi for NexusExternalApiImpl {
62026202
async fn rack_membership_add_sleds(
62036203
rqctx: RequestContext<Self::Context>,
62046204
path_params: Path<params::RackPath>,
6205-
req: TypedBody<params::AddSledsRequest>,
6205+
req: TypedBody<params::RackMembershipAddSledsRequest>,
62066206
) -> Result<HttpResponseOk<RackMembershipStatus>, HttpError> {
62076207
let apictx = rqctx.context();
62086208
let nexus = &apictx.context.nexus;

‎nexus/tests/output/uncovered-authz-endpoints.txt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ support_bundle_download_file (get "/experimental/v1/system/suppor
88
support_bundle_index (get "/experimental/v1/system/support-bundles/{bundle_id}/index")
99
ping (get "/v1/ping")
1010
networking_switch_port_lldp_neighbors (get "/v1/system/hardware/rack-switch-port/{rack_id}/{switch_location}/{port}/lldp/neighbors")
11-
rack_membership_config_latest (get "/v1/system/hardware/racks/{rack_id}/sleds")
12-
rack_membership_config (get "/v1/system/hardware/racks/{rack_id}/sleds/{epoch}")
11+
rack_membership_status (get "/v1/system/hardware/racks/{rack_id}/membership")
1312
networking_switch_port_lldp_config_view (get "/v1/system/hardware/switch-port/{port}/lldp/config")
1413
networking_switch_port_status (get "/v1/system/hardware/switch-port/{port}/status")
1514
support_bundle_head (head "/experimental/v1/system/support-bundles/{bundle_id}/download")
@@ -22,5 +21,5 @@ login_saml (post "/login/{silo_name}/saml/{provi
2221
alert_delivery_resend (post "/v1/alerts/{alert_id}/resend")
2322
login_local (post "/v1/login/{silo_name}/local")
2423
logout (post "/v1/logout")
25-
rack_membership_add_sleds (post "/v1/system/hardware/racks/{rack_id}/sleds")
24+
rack_membership_add_sleds (post "/v1/system/hardware/racks/{rack_id}/membership/add")
2625
networking_switch_port_lldp_config_update (post "/v1/system/hardware/switch-port/{port}/lldp/config")

‎nexus/types/src/external_api/params.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl From<UninitializedSledId> for BaseboardId {
106106
PartialEq,
107107
Eq,
108108
)]
109-
pub struct AddSledsRequest {
109+
pub struct RackMembershipAddSledsRequest {
110110
pub sled_ids: BTreeSet<BaseboardId>,
111111
}
112112

‎nexus/types/src/external_api/views.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,12 +691,13 @@ pub enum RackMembershipChangeState {
691691
#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
692692
pub struct RackMembershipStatus {
693693
pub rack_id: Uuid,
694+
/// Version that uniquely identifies the rack membership at a given point
695+
/// in time
694696
pub version: RackMembershipVersion,
695697
pub state: RackMembershipChangeState,
696-
/// All members of the rack for this epoch
698+
/// All members of the rack for this version
697699
pub members: BTreeSet<BaseboardId>,
698-
/// All members that have not yet responded to learning about this
699-
/// membership version
700+
/// All members that have not yet confirmed this membership version
700701
pub unacknowledged_members: BTreeSet<BaseboardId>,
701702
pub time_created: DateTime<Utc>,
702703
pub time_committed: Option<DateTime<Utc>>,

openapi/nexus/nexus-2026012100.0.0-0aad96.json renamed to openapi/nexus/nexus-2026012100.0.0-10fd58.json

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7832,8 +7832,8 @@
78327832
"tags": [
78337833
"experimental"
78347834
],
7835-
"summary": "Retrieve the rack cluster membership change for the given version or the",
7836-
"description": "latest version if no version is given",
7835+
"summary": "Retrieve the rack cluster membership status",
7836+
"description": "Returns the status for the most recent change, or a specific version if one is specified.",
78377837
"operationId": "rack_membership_status",
78387838
"parameters": [
78397839
{
@@ -7896,7 +7896,7 @@
78967896
"content": {
78977897
"application/json": {
78987898
"schema": {
7899-
"$ref": "#/components/schemas/AddSledsRequest"
7899+
"$ref": "#/components/schemas/RackMembershipAddSledsRequest"
79007900
}
79017901
}
79027902
},
@@ -15073,21 +15073,6 @@
1507315073
},
1507415074
"components": {
1507515075
"schemas": {
15076-
"AddSledsRequest": {
15077-
"type": "object",
15078-
"properties": {
15079-
"sled_ids": {
15080-
"type": "array",
15081-
"items": {
15082-
"$ref": "#/components/schemas/BaseboardId"
15083-
},
15084-
"uniqueItems": true
15085-
}
15086-
},
15087-
"required": [
15088-
"sled_ids"
15089-
]
15090-
},
1509115076
"Address": {
1509215077
"description": "An address tied to an address lot.",
1509315078
"type": "object",
@@ -25834,6 +25819,21 @@
2583425819
"time_modified"
2583525820
]
2583625821
},
25822+
"RackMembershipAddSledsRequest": {
25823+
"type": "object",
25824+
"properties": {
25825+
"sled_ids": {
25826+
"type": "array",
25827+
"items": {
25828+
"$ref": "#/components/schemas/BaseboardId"
25829+
},
25830+
"uniqueItems": true
25831+
}
25832+
},
25833+
"required": [
25834+
"sled_ids"
25835+
]
25836+
},
2583725837
"RackMembershipChangeState": {
2583825838
"type": "string",
2583925839
"enum": [
@@ -25847,7 +25847,7 @@
2584725847
"type": "object",
2584825848
"properties": {
2584925849
"members": {
25850-
"description": "All members of the rack for this epoch",
25850+
"description": "All members of the rack for this version",
2585125851
"type": "array",
2585225852
"items": {
2585325853
"$ref": "#/components/schemas/BaseboardId"
@@ -25876,15 +25876,20 @@
2587625876
"format": "date-time"
2587725877
},
2587825878
"unacknowledged_members": {
25879-
"description": "All members that have not yet responded to learning about this membership version",
25879+
"description": "All members that have not yet confirmed this membership version",
2588025880
"type": "array",
2588125881
"items": {
2588225882
"$ref": "#/components/schemas/BaseboardId"
2588325883
},
2588425884
"uniqueItems": true
2588525885
},
2588625886
"version": {
25887-
"$ref": "#/components/schemas/RackMembershipVersion"
25887+
"description": "Version that uniquely identifies the rack membership at a given point in time",
25888+
"allOf": [
25889+
{
25890+
"$ref": "#/components/schemas/RackMembershipVersion"
25891+
}
25892+
]
2588825893
}
2588925894
},
2589025895
"required": [

‎openapi/nexus/nexus-latest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nexus-2026012100.0.0-0aad96.json
1+
nexus-2026012100.0.0-10fd58.json

‎sled-agent/src/bootstrap/trust_quorum_setup.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ const TRUST_QUORUM_NETWORK_CONFIG_FILE: &str =
2424
/// and because it's hard to manage features with full a4x2 and racklette
2525
/// deployments. The flag can be changed for local a4x2 builds during iniitial
2626
/// testing.
27-
//pub const TRUST_QUORUM_INTEGRATION_ENABLED: bool = false;
28-
pub const TRUST_QUORUM_INTEGRATION_ENABLED: bool = true;
27+
pub const TRUST_QUORUM_INTEGRATION_ENABLED: bool = false;
2928

3029
pub fn new_trust_quorum_config(
3130
cluster_dataset_paths: &[Utf8PathBuf],

0 commit comments

Comments
 (0)