Move smf helper to illumos utils

karencfv · Jul 26, 2024 · de675fe · de675fe
1 parent ae4cf1c
commit de675fe
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/illumos-utils/src/lib.rs b/illumos-utils/src/lib.rs
@@ -23,6 +23,7 @@ pub mod opte;
 pub mod route;
 pub mod running_zone;
 pub mod scf;
+pub mod smf_helper;
 pub mod svc;
 pub mod svcadm;
 pub mod vmm_reservoir;

diff --git a/sled-agent/src/smf_helper.rs → illumos-utils/src/smf_helper.rs b/sled-agent/src/smf_helper.rs → illumos-utils/src/smf_helper.rs
@@ -2,15 +2,16 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-use illumos_utils::running_zone::RunningZone;
+use crate::running_zone::RunningZone;
+use crate::zone::SVCCFG;
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
     #[error("Failed to do '{intent}' by running command in zone: {err}")]
     ZoneCommand {
         intent: String,
         #[source]
-        err: illumos_utils::running_zone::RunCommandError,
+        err: crate::running_zone::RunCommandError,
     },
 }
 
@@ -44,7 +45,7 @@ impl<'t> SmfHelper<'t> {
     {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.default_smf_name,
                 "setprop",
@@ -70,7 +71,7 @@ impl<'t> SmfHelper<'t> {
     {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.smf_name,
                 "addpropvalue",
@@ -98,7 +99,7 @@ impl<'t> SmfHelper<'t> {
     {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.default_smf_name,
                 "addpropvalue",
@@ -124,7 +125,7 @@ impl<'t> SmfHelper<'t> {
     {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.smf_name,
                 "addpg",
@@ -148,7 +149,7 @@ impl<'t> SmfHelper<'t> {
     {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.smf_name,
                 "delpg",
@@ -176,7 +177,7 @@ impl<'t> SmfHelper<'t> {
         match self
             .running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.default_smf_name,
                 "delpropvalue",
@@ -203,7 +204,7 @@ impl<'t> SmfHelper<'t> {
     pub fn refresh(&self) -> Result<(), Error> {
         self.running_zone
             .run_cmd(&[
-                illumos_utils::zone::SVCCFG,
+                SVCCFG,
                 "-s",
                 &self.default_smf_name,
                 "refresh",

diff --git a/sled-agent/src/lib.rs b/sled-agent/src/lib.rs
@@ -34,7 +34,6 @@ pub mod rack_setup;
 pub mod server;
 pub mod services;
 mod sled_agent;
-mod smf_helper;
 mod storage_monitor;
 mod swap_device;
 mod updates;

diff --git a/sled-agent/src/params.rs b/sled-agent/src/params.rs
@@ -333,15 +333,6 @@ impl OmicronZoneTypeExt for OmicronZoneConfig {
     }
 }
 
-impl crate::smf_helper::Service for OmicronZoneType {
-    fn service_name(&self) -> String {
-        self.kind().service_prefix().to_owned()
-    }
-    fn smf_name(&self) -> String {
-        format!("svc:/oxide/{}", self.service_name())
-    }
-}
-
 #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema, PartialEq)]
 pub struct TimeSync {
     /// The synchronization state of the sled, true when the system clock

diff --git a/sled-agent/src/services.rs b/sled-agent/src/services.rs
@@ -35,7 +35,7 @@ use crate::params::{
     ZoneBundleCause, ZoneBundleMetadata,
 };
 use crate::profile::*;
-use crate::smf_helper::SmfHelper;
+use illumos_utils::smf_helper::SmfHelper;
 use crate::zone_bundle::BundleError;
 use crate::zone_bundle::ZoneBundler;
 use anyhow::anyhow;
@@ -157,7 +157,7 @@ pub enum Error {
     SledLocalZone(anyhow::Error),
 
     #[error("Failed to issue SMF command: {0}")]
-    SmfCommand(#[from] crate::smf_helper::Error),
+    SmfCommand(#[from] illumos_utils::smf_helper::Error),
 
     #[error("{}", display_zone_init_errors(.0))]
     ZoneInitialize(Vec<(String, Box<Error>)>),
@@ -498,7 +498,7 @@ enum SwitchService {
     SpSim,
 }
 
-impl crate::smf_helper::Service for SwitchService {
+impl illumos_utils::smf_helper::Service for SwitchService {
     fn service_name(&self) -> String {
         match self {
             SwitchService::ManagementGatewayService => "mgs",