Track more kinds of datalinks on a sled

illumos-utils/src/dladm.rs

@@ -17,11 +17,6 @@ pub const VNIC_PREFIX: &str = "ox";
 pub const VNIC_PREFIX_CONTROL: &str = "oxControl";
 pub const VNIC_PREFIX_BOOTSTRAP: &str = "oxBootstrap";
 
-/// Prefix used to name VNICs over xde devices / OPTE ports.
-// TODO-correctness: Remove this when `xde` devices can be directly used beneath
-// Viona, and thus plumbed directly to guests.
-pub const VNIC_PREFIX_GUEST: &str = "vopte";
-
 /// Path to the DLADM command.
 pub const DLADM: &str = "/usr/sbin/dladm";
 
@@ -42,6 +37,9 @@ pub const BOOTSTRAP_ETHERSTUB_VNIC_NAME: &str = "bootstrap0";
 /// The prefix for Chelsio link names.
 pub const CHELSIO_LINK_PREFIX: &str = "cxgbe";
 
+/// The prefix for OPTE link names
+pub const OPTE_LINK_PREFIX: &str = "opte";
+
 /// Errors returned from [`Dladm::find_physical`].
 #[derive(thiserror::Error, Debug)]
 pub enum FindPhysicalLinkError {

illumos-utils/src/link.rs

@@ -7,7 +7,7 @@
 use crate::destructor::{Deletable, Destructor};
 use crate::dladm::{
     CreateVnicError, DeleteVnicError, VnicSource, VNIC_PREFIX,
-    VNIC_PREFIX_BOOTSTRAP, VNIC_PREFIX_CONTROL, VNIC_PREFIX_GUEST,
+    VNIC_PREFIX_BOOTSTRAP, VNIC_PREFIX_CONTROL,
 };
 use omicron_common::api::external::MacAddr;
 use std::sync::{
@@ -125,7 +125,6 @@ impl<DL: VnicSource + Clone> VnicAllocator<DL> {
 pub enum LinkKind {
     Physical,
     OxideControlVnic,
-    GuestVnic,
     OxideBootstrapVnic,
 }
 
@@ -135,14 +134,20 @@ impl LinkKind {
     pub fn from_name(name: &str) -> Option<Self> {
         if name.starts_with(VNIC_PREFIX) {
             Some(LinkKind::OxideControlVnic)
-        } else if name.starts_with(VNIC_PREFIX_GUEST) {
-            Some(LinkKind::GuestVnic)
         } else if name.starts_with(VNIC_PREFIX_BOOTSTRAP) {
             Some(LinkKind::OxideBootstrapVnic)
         } else {
             None
         }
     }
+
+    /// Return `true` if this link is a VNIC.
+    pub const fn is_vnic(&self) -> bool {
+        match self {
+            LinkKind::Physical => false,
+            LinkKind::OxideControlVnic | LinkKind::OxideBootstrapVnic => true,
+        }
+    }
 }
 
 #[derive(thiserror::Error, Debug)]
@@ -203,6 +208,11 @@ impl Link {
     pub fn kind(&self) -> LinkKind {
         self.kind
     }
+
+    /// Return true if this is a VNIC.
+    pub fn is_vnic(&self) -> bool {
+        self.kind.is_vnic()
+    }
 }
 
 impl Drop for Link {

illumos-utils/src/opte/port_manager.rs

@@ -4,6 +4,7 @@
 
 //! Manager for all OPTE ports on a Helios system
 
+use crate::dladm::OPTE_LINK_PREFIX;
 use crate::opte::opte_firewall_rules;
 use crate::opte::params::VirtualNetworkInterfaceHost;
 use crate::opte::params::VpcFirewallRule;
@@ -52,9 +53,6 @@ use std::sync::Arc;
 use std::sync::Mutex;
 use uuid::Uuid;
 
-// Prefix used to identify xde data links.
-const XDE_LINK_PREFIX: &str = "opte";
-
 /// Stored routes (and usage count) for a given VPC/subnet.
 #[derive(Debug, Clone)]
 struct RouteSet {
@@ -85,7 +83,7 @@ impl PortManagerInner {
     fn next_port_name(&self) -> String {
         format!(
             "{}{}",
-            XDE_LINK_PREFIX,
+            OPTE_LINK_PREFIX,
             self.next_port_id.fetch_add(1, Ordering::SeqCst)
         )
     }
@@ -265,8 +263,9 @@ impl PortManager {
         // So we:
         //
         // - create the xde device
-        // - create the vnic, cleaning up the xde device if that fails
-        // - add both to the Port
+        // - create the port ticket
+        // - create the port
+        // - add both to the PortManager's map
         //
         // The Port object's drop implementation will clean up both of those, if
         // any of the remaining fallible operations fail.
@@ -289,21 +288,6 @@ impl PortManager {
             )?;
             hdl
         };
-
-        // Initialize firewall rules for the new port.
-        let rules = opte_firewall_rules(firewall_rules, &vni, &mac);
-        debug!(
-            self.inner.log,
-            "Setting firewall rules";
-            "port_name" => &port_name,
-            "rules" => ?&rules,
-        );
-        #[cfg(target_os = "illumos")]
-        hdl.set_fw_rules(&oxide_vpc::api::SetFwRulesReq {
-            port_name: port_name.clone(),
-            rules,
-        })?;
-
         let (port, ticket) = {
             let mut ports = self.inner.ports.lock().unwrap();
             let ticket = PortTicket::new(nic.id, nic.kind, self.inner.clone());
@@ -326,6 +310,20 @@ impl PortManager {
             (port, ticket)
         };
 
+        // Initialize firewall rules for the new port.
+        let rules = opte_firewall_rules(firewall_rules, &vni, &mac);
+        debug!(
+            self.inner.log,
+            "Setting firewall rules";
+            "port_name" => &port_name,
+            "rules" => ?&rules,
+        );
+        #[cfg(target_os = "illumos")]
+        hdl.set_fw_rules(&oxide_vpc::api::SetFwRulesReq {
+            port_name: port_name.clone(),
+            rules,
+        })?;
+
         // Check locally to see whether we have any routes from the
         // control plane for this port already installed. If not,
         // create a record to show that we're interested in receiving

illumos-utils/src/running_zone.rs

@@ -362,6 +362,22 @@ impl RunningZone {
         self.inner.zonepath.pool.as_ref()
     }
 
+    /// Return the name of a bootstrap VNIC in the zone, if any.
+    pub fn bootstrap_vnic_name(&self) -> Option<&str> {
+        self.inner.get_bootstrap_vnic_name()
+    }
+
+    /// Return the name of the control VNIC.
+    pub fn control_vnic_name(&self) -> &str {
+        self.inner.get_control_vnic_name()
+    }
+
+    /// Return the names of any OPTE ports in the zone.
+    pub fn opte_port_names(&self) -> impl Iterator<Item = &str> {
+        self.inner.opte_ports().map(|port| port.name())
+    }
+
+    /// Return the control IP address.
     pub fn control_interface(&self) -> AddrObject {
         AddrObject::new(
             self.inner.get_control_vnic_name(),
@@ -939,10 +955,17 @@ impl InstalledZone {
         zone_name
     }
 
+    /// Get the name of the bootstrap VNIC in the zone, if any.
+    pub fn get_bootstrap_vnic_name(&self) -> Option<&str> {
+        self.bootstrap_vnic.as_ref().map(|link| link.name())
+    }
+
+    /// Get the name of the control VNIC in the zone.
     pub fn get_control_vnic_name(&self) -> &str {
         self.control_vnic.name()
     }
 
+    /// Return the name of the zone itself.
     pub fn name(&self) -> &str {
         &self.name
     }

oximeter/db/schema/replicated/8/timeseries-to-delete.txt

@@ -0,0 +1,6 @@
+physical_data_link:bytes_received
+physical_data_link:bytes_sent
+physical_data_link:errors_received
+physical_data_link:errors_sent
+physical_data_link:packets_received
+physical_data_link:packets_sent

oximeter/db/schema/single-node/8/timeseries-to-delete.txt

@@ -0,0 +1,6 @@
+physical_data_link:bytes_received
+physical_data_link:bytes_sent
+physical_data_link:errors_received
+physical_data_link:errors_sent
+physical_data_link:packets_received
+physical_data_link:packets_sent

oximeter/db/src/model.rs

@@ -45,7 +45,7 @@ use uuid::Uuid;
 /// - [`crate::Client::initialize_db_with_version`]
 /// - [`crate::Client::ensure_schema`]
 /// - The `clickhouse-schema-updater` binary in this crate
-pub const OXIMETER_VERSION: u64 = 7;
+pub const OXIMETER_VERSION: u64 = 8;
 
 // Wrapper type to represent a boolean in the database.
 //