make BlueprintOrCollection* methods pub

oxidecomputer · Apr 21, 2024 · b7fe215 · b7fe215
1 parent b7919d4
commit b7fe215
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs b/nexus/reconfigurator/planning/src/blueprint_builder/zones.rs
@@ -408,7 +408,7 @@ mod tests {
                 assert_eq!(sled_modified.zones_modified().count(), 1);
                 let modified_zone =
                     sled_modified.zones_modified().next().unwrap();
-                assert_eq!(modified_zone.zone_before.id, existing_zone_id);
+                assert_eq!(modified_zone.zone_before.id(), existing_zone_id);
             } else {
                 assert_eq!(sled_id, control_sled_id);
 

diff --git a/nexus/types/src/deployment.rs b/nexus/types/src/deployment.rs
@@ -1089,7 +1089,7 @@ pub enum BlueprintOrCollectionZonesConfig {
 }
 
 impl BlueprintOrCollectionZonesConfig {
-    fn sort(&mut self) {
+    pub fn sort(&mut self) {
         match self {
             BlueprintOrCollectionZonesConfig::Collection(z) => {
                 z.zones.sort_unstable_by_key(zone_sort_key)
@@ -1098,14 +1098,14 @@ impl BlueprintOrCollectionZonesConfig {
         }
     }
 
-    fn generation(&self) -> Generation {
+    pub fn generation(&self) -> Generation {
         match self {
             BlueprintOrCollectionZonesConfig::Collection(z) => z.generation,
             BlueprintOrCollectionZonesConfig::Blueprint(z) => z.generation,
         }
     }
 
-    fn zones(
+    pub fn zones(
         &self,
     ) -> Box<dyn Iterator<Item = BlueprintOrCollectionZoneConfig> + '_> {
         match self {
@@ -1168,21 +1168,21 @@ impl From<BlueprintZoneConfig> for BlueprintOrCollectionZoneConfig {
 }
 
 impl BlueprintOrCollectionZoneConfig {
-    fn id(&self) -> OmicronZoneUuid {
+    pub fn id(&self) -> OmicronZoneUuid {
         match self {
             BlueprintOrCollectionZoneConfig::Collection(z) => z.id(),
             BlueprintOrCollectionZoneConfig::Blueprint(z) => z.id(),
         }
     }
 
-    fn kind(&self) -> ZoneKind {
+    pub fn kind(&self) -> ZoneKind {
         match self {
             BlueprintOrCollectionZoneConfig::Collection(z) => z.kind(),
             BlueprintOrCollectionZoneConfig::Blueprint(z) => z.kind(),
         }
     }
 
-    fn disposition(&self) -> BlueprintZoneDisposition {
+    pub fn disposition(&self) -> BlueprintZoneDisposition {
         match self {
             // All zones from inventory collection are assumed to be in-service.
             BlueprintOrCollectionZoneConfig::Collection(_) => {
@@ -1192,7 +1192,7 @@ impl BlueprintOrCollectionZoneConfig {
         }
     }
 
-    fn underlay_address(&self) -> Ipv6Addr {
+    pub fn underlay_address(&self) -> Ipv6Addr {
         match self {
             BlueprintOrCollectionZoneConfig::Collection(z) => {
                 z.underlay_address
@@ -1201,7 +1201,7 @@ impl BlueprintOrCollectionZoneConfig {
         }
     }
 
-    fn is_zone_type_equal(&self, other: &BlueprintZoneType) -> bool {
+    pub fn is_zone_type_equal(&self, other: &BlueprintZoneType) -> bool {
         match self {
             BlueprintOrCollectionZoneConfig::Collection(z) => {
                 // BlueprintZoneType contains more information than