regen openapi + fix up PHD

Author: gjcolombo

lib/propolis-client/src/instance_spec.rs

@@ -4,22 +4,19 @@
 
 //! A client for the Propolis hypervisor frontend's server API.
 
-#[cfg(not(feature = "falcon"))]
 progenitor::generate_api!(
     spec = "../../openapi/propolis-server.json",
     interface = Builder,
     tags = Separate,
     patch = {
         // Add `Default` to types related to instance specs
         InstanceSpecV0 = { derives = [Default] },
-        BackendSpecV0 = { derives = [Default] },
-        DeviceSpecV0 = { derives = [Default] },
         Board = { derives = [Default] },
 
         // Some Crucible-related bits are re-exported through simulated
         // sled-agent and thus require JsonSchema
         BootOrderEntry = { derives = [schemars::JsonSchema] },
-        BootSettings = { derives = [schemars::JsonSchema] },
+        BootSettings = { derives = [Default, schemars::JsonSchema] },
         DiskRequest = { derives = [schemars::JsonSchema] },
         VolumeConstructionRequest = { derives = [schemars::JsonSchema] },
         CrucibleOpts = { derives = [schemars::JsonSchema] },
@@ -33,32 +30,4 @@ progenitor::generate_api!(
     }
 );
 
-#[cfg(feature = "falcon")]
-progenitor::generate_api!(
-    spec = "../../openapi/propolis-server-falcon.json",
-    interface = Builder,
-    tags = Separate,
-    patch = {
-        // Add `Default` to types related to instance specs
-        InstanceSpecV0 = { derives = [Default] },
-        BackendSpecV0 = { derives = [Default] },
-        DeviceSpecV0 = { derives = [Default] },
-        Board = { derives = [Default] },
-
-        // Some Crucible-related bits are re-exported through simulated
-        // sled-agent and thus require JsonSchema
-        DiskRequest = { derives = [schemars::JsonSchema] },
-        VolumeConstructionRequest = { derives = [schemars::JsonSchema] },
-        CrucibleOpts = { derives = [schemars::JsonSchema] },
-        Slot = { derives = [schemars::JsonSchema] },
-
-        PciPath = { derives = [
-            Copy, Ord, Eq, PartialEq, PartialOrd
-        ] },
-
-        InstanceMetadata = { derives = [ PartialEq ] },
-    }
-);
-
-pub mod instance_spec;
 pub mod support;

lib/propolis-client/src/lib.rs

@@ -18,9 +18,7 @@ use tokio_tungstenite::tungstenite::{Error as WSError, Message as WSMessage};
 // re-export as an escape hatch for crate-version-matching problems
 pub use tokio_tungstenite::{tungstenite, WebSocketStream};
 
-use crate::types::{
-    Chipset, I440Fx, NetworkDeviceV0, PciPath, StorageDeviceV0,
-};
+use crate::types::{Chipset, I440Fx, PciPath};
 use crate::Client as PropolisClient;
 
 const PCI_DEV_PER_BUS: u8 = 32;
@@ -48,22 +46,6 @@ impl Default for Chipset {
     }
 }
 
-impl NetworkDeviceV0 {
-    pub fn pci_path(&self) -> PciPath {
-        match self {
-            NetworkDeviceV0::VirtioNic(dev) => dev.pci_path,
-        }
-    }
-}
-impl StorageDeviceV0 {
-    pub fn pci_path(&self) -> PciPath {
-        match self {
-            StorageDeviceV0::VirtioDisk(dev) => dev.pci_path,
-            StorageDeviceV0::NvmeDisk(dev) => dev.pci_path,
-        }
-    }
-}
-
 /// Clone of `InstanceSerialConsoleControlMessage` type defined in
 /// `propolis_api_types`, with which this must be kept in sync.
 ///