Skip to content

Commit 3dafdc6

Browse files
committed
Fix versioning discrepancy between sled-agent API and types crate
As it evolved, #9570 made various changes to both the sled-agent types crate and the sled-agent API. As it landed, though, it made one versioning bump to sled-agent API (v20 - BGP) and two to the types crate (v20 - lockstep API, v21 - BGP). This squishes the latter two down to just one (v20 - BGP) for consistency with the API's versioning.
1 parent 62d1b38 commit 3dafdc6

File tree

5 files changed

+4
-13
lines changed

5 files changed

+4
-13
lines changed

sled-agent/types/versions/src/bgp_v6/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@
55
//! Version `BGP_v6` of the Sled Agent API.
66
77
pub mod early_networking;
8+
pub mod rack_init;

sled-agent/types/versions/src/lockstep_rack_init/rack_init.rs renamed to sled-agent/types/versions/src/bgp_v6/rack_init.rs

File renamed without changes.

sled-agent/types/versions/src/latest.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ pub mod disk {
5353
}
5454

5555
pub mod early_networking {
56-
pub use crate::v21::early_networking::EarlyNetworkConfig;
57-
pub use crate::v21::early_networking::EarlyNetworkConfigBody;
56+
pub use crate::v20::early_networking::EarlyNetworkConfig;
57+
pub use crate::v20::early_networking::EarlyNetworkConfigBody;
5858
}
5959

6060
pub mod firewall_rules {

sled-agent/types/versions/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,8 @@ pub mod v17;
5555
pub mod v18;
5656
#[path = "add_rot_attestation/mod.rs"]
5757
pub mod v19;
58-
#[path = "lockstep_rack_init/mod.rs"]
59-
pub mod v20;
6058
#[path = "bgp_v6/mod.rs"]
61-
pub mod v21;
59+
pub mod v20;
6260
#[path = "add_switch_zone_operator_policy/mod.rs"]
6361
pub mod v3;
6462
#[path = "add_nexus_lockstep_port_to_inventory/mod.rs"]

sled-agent/types/versions/src/lockstep_rack_init/mod.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)