teach propolis-server to understand configurable boot order

bin/propolis-server/src/lib/initializer.rs

@@ -1036,22 +1036,8 @@ impl<'a> MachineInitializer<'a> {
         for boot_entry in boot_names.iter() {
             // Theoretically we could support booting from network devices by
             // matching them here and adding their PCI paths, but exactly what
-            // would happen is ill-understood and device names are not plumbed
-            // in a way that supports it. So, only check disks here.
-            if let Some(spec) = self
-                .spec
-                .disks
-                .iter()
-                .find(|(_name, spec)| match &spec.device_spec {
-                    StorageDevice::Nvme(disk) => {
-                        disk.backend_name.as_str() == boot_entry.name.as_str()
-                    }
-                    StorageDevice::Virtio(disk) => {
-                        disk.backend_name.as_str() == boot_entry.name.as_str()
-                    }
-                })
-                .map(|(_name, spec)| spec)
-            {
+            // would happen is ill-understood. So, only check disks here.
+            if let Some(spec) = self.spec.disks.get(boot_entry.name.as_str()) {
                 match &spec.device_spec {
                     StorageDevice::Virtio(disk) => {
                         let bdf = parse_bdf(&disk.pci_path)?;

bin/propolis-server/src/lib/spec/builder.rs

@@ -118,25 +118,12 @@ impl SpecBuilder {
         &mut self,
         item: &BootOrderEntry,
     ) -> Result<(), SpecBuilderError> {
-        let boot_order = self.spec.boot_order.get_or_insert(Vec::new());
-
-        use crate::spec::StorageDevice;
-        use crate::spec::{NvmeDisk, VirtioDisk};
-
-        let is_disk =
-            self.spec.disks.values().any(|disk| match &disk.device_spec {
-                StorageDevice::Virtio(VirtioDisk { backend_name, .. }) => {
-                    backend_name == item.name.as_str()
-                }
-                StorageDevice::Nvme(NvmeDisk { backend_name, .. }) => {
-                    backend_name == item.name.as_str()
-                }
-            });
-
-        if !is_disk {
+        if !self.spec.disks.contains_key(item.name.as_str()) {
             return Err(SpecBuilderError::BootOptionMissing(item.name.clone()));
         }
 
+        let boot_order = self.spec.boot_order.get_or_insert(Vec::new());
+
         boot_order
             .push(crate::spec::BootOrderEntry { name: item.name.clone() });
 

phd-tests/framework/src/test_vm/config.rs

@@ -257,10 +257,14 @@ impl<'dr> VmConfig<'dr> {
         // in the correct order: boot disk first, then in the data disks'
         // iteration order.
         let all_disks = self.disks.iter().zip(disk_handles.iter());
-        for (idx, (req, hdl)) in all_disks.enumerate() {
-            let device_name = format!("disk-device{}", idx);
+        for (req, hdl) in all_disks {
             let pci_path = PciPath::new(0, req.pci_device_num, 0).unwrap();
-            let (backend_name, backend_spec) = hdl.backend_spec();
+            let (device_name, backend_spec) = hdl.backend_spec();
+            // propolis-server uses a disk's name from the API as its device
+            // name. It then derives a backend name from the disk name. Match
+            // that name derivation here so PHD tests match the API as used by
+            // Nexus.
+            let backend_name = format!("{}-backend", device_name);
             let device_spec = match req.interface {
                 DiskInterface::Virtio => {
                     StorageDeviceV0::VirtioDisk(VirtioDisk {