[wicketd] Update bootstrap peer addrs after RSS config is uploaded (#3444)

When the user calls `GET /rack-setup/config`, we were filling in the
bootstrap addresses of the _inventory_ (i.e., all available sleds), but
we were not filling them in of the chosen sleds if the user had already
uploaded a config. We now fill in both.

Fixes #3440.

Author: jgallagher

wicketd/src/http_entrypoints.rs

@@ -212,7 +212,7 @@ async fn get_rss_config(
     let inventory = inventory_or_unavail(&ctx.mgs_handle).await?;
 
     let mut config = ctx.rss_config.lock().unwrap();
-    config.populate_available_bootstrap_sleds_from_inventory(
+    config.update_with_inventory_and_bootstrap_peers(
         &inventory,
         &ctx.bootstrap_peers,
     );
@@ -239,7 +239,7 @@ async fn put_rss_config(
     let inventory = inventory_or_unavail(&ctx.mgs_handle).await?;
 
     let mut config = ctx.rss_config.lock().unwrap();
-    config.populate_available_bootstrap_sleds_from_inventory(
+    config.update_with_inventory_and_bootstrap_peers(
         &inventory,
         &ctx.bootstrap_peers,
     );

wicketd/src/rss_config.rs

@@ -27,6 +27,7 @@ use omicron_common::address::Ipv4Range;
 use omicron_common::api::internal::shared::RackNetworkConfig;
 use sled_hardware::Baseboard;
 use std::collections::BTreeSet;
+use std::mem;
 use std::net::Ipv6Addr;
 use wicket_common::rack_setup::PutRssUserConfigInsensitive;
 
@@ -68,7 +69,7 @@ pub(crate) struct CurrentRssConfig {
 }
 
 impl CurrentRssConfig {
-    pub(crate) fn populate_available_bootstrap_sleds_from_inventory(
+    pub(crate) fn update_with_inventory_and_bootstrap_peers(
         &mut self,
         inventory: &RackV1Inventory,
         bootstrap_peers: &BootstrapPeers,
@@ -96,6 +97,18 @@ impl CurrentRssConfig {
                 })
             })
             .collect();
+
+        // If the user has already uploaded a config specifying bootstrap_sleds,
+        // also update our knowledge of those sleds' bootstrap addresses.
+        let our_bootstrap_sleds = mem::take(&mut self.bootstrap_sleds);
+        self.bootstrap_sleds = our_bootstrap_sleds
+            .into_iter()
+            .map(|mut sled_desc| {
+                sled_desc.bootstrap_ip =
+                    bootstrap_sleds.get(&sled_desc.baseboard).copied();
+                sled_desc
+            })
+            .collect();
     }
 
     pub(crate) fn start_rss_request(