[sled-agent] Self assembling switch zone

illumos-utils/src/lib.rs

@@ -36,8 +36,8 @@ pub const PFEXEC: &str = "/usr/bin/pfexec";
 pub struct CommandFailureInfo {
     command: String,
     status: std::process::ExitStatus,
-    stdout: String,
-    stderr: String,
+    pub stdout: String,
+    pub stderr: String,
 }
 
 impl std::fmt::Display for CommandFailureInfo {

illumos-utils/src/route.rs

@@ -107,4 +107,23 @@ impl Route {
         };
         Ok(())
     }
+
+    pub fn add_bootstrap_route(
+        bootstrap_prefix: u16,
+        gz_bootstrap_addr: Ipv6Addr,
+        zone_vnic_name: &str,
+    ) -> Result<(), ExecutionError> {
+        let mut cmd = std::process::Command::new(PFEXEC);
+        let cmd = cmd.args(&[
+            ROUTE,
+            "add",
+            "-inet6",
+            &format!("{bootstrap_prefix:x}::/16"),
+            &gz_bootstrap_addr.to_string(),
+            "-ifp",
+            zone_vnic_name,
+        ]);
+        execute(cmd)?;
+        Ok(())
+    }
 }

illumos-utils/src/running_zone.rs

@@ -45,7 +45,7 @@ pub enum ServiceError {
 pub struct RunCommandError {
     zone: String,
     #[source]
-    err: crate::ExecutionError,
+    pub err: crate::ExecutionError,
 }
 
 /// Errors returned from [`RunningZone::boot`].
@@ -510,7 +510,7 @@ impl RunningZone {
     /// Note that the zone must already be configured to be booted.
     pub async fn boot(zone: InstalledZone) -> Result<Self, BootError> {
         // Boot the zone.
-        info!(zone.log, "Zone booting");
+        info!(zone.log, "Booting {} zone", zone.name);
 
         Zones::boot(&zone.name).await?;
 
@@ -528,6 +528,9 @@ impl RunningZone {
                 zone: zone.name.to_string(),
             })?;
 
+        // TODO https://github.com/oxidecomputer/omicron/issues/1898:
+        // Remove all non-self assembling code
+
         // If the zone is self-assembling, then SMF service(s) inside the zone
         // will be creating the listen address for the zone's service(s),
         // setting the appropriate ifprop MTU, and so on. The idea behind
@@ -623,7 +626,6 @@ impl RunningZone {
         &self,
         address: Ipv6Addr,
     ) -> Result<(), EnsureAddressError> {
-        info!(self.inner.log, "Adding bootstrap address");
         let vnic = self.inner.bootstrap_vnic.as_ref().ok_or_else(|| {
             EnsureAddressError::MissingBootstrapVnic {
                 address: address.to_string(),
@@ -785,15 +787,16 @@ impl RunningZone {
         gz_bootstrap_addr: Ipv6Addr,
         zone_vnic_name: &str,
     ) -> Result<(), RunCommandError> {
-        self.run_cmd([
+        let args = [
             "/usr/sbin/route",
             "add",
             "-inet6",
             &format!("{bootstrap_prefix:x}::/16"),
             &gz_bootstrap_addr.to_string(),
             "-ifp",
             zone_vnic_name,
-        ])?;
+        ];
+        self.run_cmd(args)?;
         Ok(())
     }
 
@@ -914,7 +917,7 @@ impl RunningZone {
 
     /// Return a reference to the links for this zone.
     pub fn links(&self) -> &Vec<Link> {
-        &self.inner.links
+        &self.inner.links()
     }
 
     /// Return a mutable reference to the links for this zone.
@@ -1149,6 +1152,11 @@ impl InstalledZone {
     pub fn root(&self) -> Utf8PathBuf {
         self.zonepath.join(Self::ROOT_FS_PATH)
     }
+
+    /// Return a reference to the links for this zone.
+    pub fn links(&self) -> &Vec<Link> {
+        &self.links
+    }
 }
 
 #[derive(Clone)]

illumos-utils/src/zone.rs

@@ -640,7 +640,7 @@ impl Zones {
     //
     // Does NOT check if the address already exists.
     #[allow(clippy::needless_lifetimes)]
-    fn create_address_internal<'a>(
+    pub fn create_address_internal<'a>(
         zone: Option<&'a str>,
         addrobj: &AddrObject,
         addrtype: AddressRequest,

package-manifest.toml

@@ -439,7 +439,6 @@ service_name = "switch_zone_setup"
 source.type = "local"
 source.paths = [
   { from = "smf/switch_zone_setup/manifest.xml", to = "/var/svc/manifest/site/switch_zone_setup/manifest.xml" },
-  { from = "smf/switch_zone_setup/switch_zone_setup", to = "/opt/oxide/bin/switch_zone_setup" },
   { from = "smf/switch_zone_setup/support_authorized_keys", to = "/opt/oxide/support/authorized_keys" },
   { from = "/opt/ooce/pgsql-13/lib/amd64", to = "/opt/ooce/pgsql-13/lib/amd64" },
 ]
@@ -628,8 +627,9 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "6334bf74fa21790c15f1c4e494ea2ec0edd1c83c"
-source.sha256 = "5929f9abf0daf4bbf17d835e5d69fc842b9617b312fb5644fa99daf785203700"
+# TODO: Set to images from main branch. Testing out with images from my PR for now.
+source.commit = "e058ad924378bdd7e27a169dda299867472a0503"
+source.sha256 = "16798a450f33800e004f915442f6b603f547a6bf16312c26faf087853aec6c4a"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -653,8 +653,9 @@ only_for_targets.image = "standard"
 # 2. Copy the output zone image from dendrite/out to omicron/out
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "6334bf74fa21790c15f1c4e494ea2ec0edd1c83c"
-source.sha256 = "0294a1911212c4764d1034b5e0ca00cc9dfc51df482a9f6e5547b191b4481ad8"
+# TODO: Set to images from main branch. Testing out with images from my PR for now.
+source.commit = "e058ad924378bdd7e27a169dda299867472a0503"
+source.sha256 = "8545ddd844653c8ba917ba0eaabf6ec9effc140ea1e16bd1f5f2838c083729d5"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -671,8 +672,9 @@ only_for_targets.image = "standard"
 # 2. Copy dendrite.tar.gz from dendrite/out to omicron/out/dendrite-softnpu.tar.gz
 source.type = "prebuilt"
 source.repo = "dendrite"
-source.commit = "6334bf74fa21790c15f1c4e494ea2ec0edd1c83c"
-source.sha256 = "1a188da01dccf565058145b43573a549a2eb4d71fe8800170152b823af27a010"
+# TODO: Set to images from main branch. Testing out with images from my PR for now.
+source.commit = "e058ad924378bdd7e27a169dda299867472a0503"
+source.sha256 = "d9c1460eb3de99d3303f56b014278eef804cfd3c1bef585cd9b516f6670997f7"
 output.type = "zone"
 output.intermediate_only = true
 
@@ -719,6 +721,8 @@ source.packages = [
   "switch_zone_setup.tar.gz",
   "xcvradm.tar.gz",
   "omicron-omdb.tar.gz",
+  "zone-setup.tar.gz",
+  "zone-network-install.tar.gz"
 ]
 output.type = "zone"
 
@@ -743,6 +747,8 @@ source.packages = [
   "switch_zone_setup.tar.gz",
   "sp-sim-stub.tar.gz",
   "omicron-omdb.tar.gz",
+  "zone-setup.tar.gz",
+  "zone-network-install.tar.gz"
 ]
 output.type = "zone"
 
@@ -767,6 +773,8 @@ source.packages = [
   "switch_zone_setup.tar.gz",
   "sp-sim-softnpu.tar.gz",
   "omicron-omdb.tar.gz",
+  "zone-setup.tar.gz",
+  "zone-network-install.tar.gz"
 ]
 output.type = "zone"
 

sled-agent/src/params.rs

@@ -588,9 +588,6 @@ impl crate::smf_helper::Service for OmicronZoneType {
     fn smf_name(&self) -> String {
         format!("svc:/oxide/{}", self.service_name())
     }
-    fn should_import(&self) -> bool {
-        true
-    }
 }
 
 impl From<OmicronZoneType> for sled_agent_client::types::OmicronZoneType {

sled-agent/src/profile.rs

@@ -163,6 +163,7 @@ impl Display for ServiceInstanceBuilder {
     }
 }
 
+#[derive(Clone)]
 pub struct PropertyGroupBuilder {
     name: String,
     /// names of the properties that were added, in the order they were added
@@ -233,7 +234,7 @@ impl Display for PropertyGroupBuilder {
             if values.len() == 1 {
                 write!(
                     f,
-                    r#"        <propval type="{ty}" name="{name}" value="{value}"/>
+                    r#"        <propval type="{ty}" name="{name}" value='{value}'/>
 "#,
                     name = property_name,
                     value = &values[0],
@@ -302,7 +303,7 @@ mod tests {
 <service_bundle type="profile" name="myprofile">
   <service version="1" type="service" name="myservice">
       <property_group type="application" name="mypg">
-        <propval type="astring" name="myprop" value="myvalue"/>
+        <propval type="astring" name="myprop" value='myvalue'/>
       </property_group>
   </service>
 </service_bundle>"#,
@@ -384,7 +385,7 @@ mod tests {
   <service version="1" type="service" name="myservice">
     <instance enabled="true" name="default">
       <property_group type="application" name="mypg">
-        <propval type="type" name="prop" value="value"/>
+        <propval type="type" name="prop" value='value'/>
       </property_group>
     </instance>
   </service>
@@ -429,11 +430,11 @@ mod tests {
       </property_group>
     <instance enabled="true" name="default">
       <property_group type="application" name="mypg">
-        <propval type="type" name="prop" value="value"/>
-        <propval type="type" name="prop2" value="value2"/>
+        <propval type="type" name="prop" value='value'/>
+        <propval type="type" name="prop2" value='value2'/>
       </property_group>
       <property_group type="application" name="mypg2">
-        <propval type="type" name="prop3" value="value3"/>
+        <propval type="type" name="prop3" value='value3'/>
       </property_group>
     </instance>
   </service>