Rpws for all networking

common/src/nexus_config.rs

@@ -340,6 +340,8 @@ pub struct BackgroundTaskConfig {
     pub sync_service_zone_nat: SyncServiceZoneNatConfig,
     /// configuration for the bfd manager task
     pub bfd_manager: BfdManagerConfig,
+    /// configuration for the switch port settings manager task
+    pub switch_port_settings_manager: SwitchPortSettingsManagerConfig,
     /// configuration for region replacement task
     pub region_replacement: RegionReplacementConfig,
 }
@@ -400,6 +402,13 @@ pub struct SyncServiceZoneNatConfig {
     pub period_secs: Duration,
 }
 
+#[serde_as]
+#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
+pub struct SwitchPortSettingsManagerConfig {
+    /// period (in seconds) for periodic activations of this background task
+    #[serde_as(as = "DurationSeconds<u64>")]
+    pub period_secs: Duration,
+}
 #[serde_as]
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct InventoryConfig {
@@ -563,7 +572,10 @@ mod test {
     };
     use crate::address::{Ipv6Subnet, RACK_PREFIX};
     use crate::api::internal::shared::SwitchLocation;
-    use crate::nexus_config::{BfdManagerConfig, SyncServiceZoneNatConfig};
+    use crate::nexus_config::{
+        BfdManagerConfig, SwitchPortSettingsManagerConfig,
+        SyncServiceZoneNatConfig,
+    };
     use camino::{Utf8Path, Utf8PathBuf};
     use dropshot::ConfigDropshot;
     use dropshot::ConfigLogging;
@@ -716,6 +728,7 @@ mod test {
             blueprints.period_secs_load = 10
             blueprints.period_secs_execute = 60
             sync_service_zone_nat.period_secs = 30
+            switch_port_settings_manager.period_secs = 30
             region_replacement.period_secs = 30
             [default_region_allocation_strategy]
             type = "random"
@@ -831,6 +844,10 @@ mod test {
                         sync_service_zone_nat: SyncServiceZoneNatConfig {
                             period_secs: Duration::from_secs(30)
                         },
+                        switch_port_settings_manager:
+                            SwitchPortSettingsManagerConfig {
+                                period_secs: Duration::from_secs(30),
+                            },
                         region_replacement: RegionReplacementConfig {
                             period_secs: Duration::from_secs(30),
                         },
@@ -896,6 +913,7 @@ mod test {
             blueprints.period_secs_load = 10
             blueprints.period_secs_execute = 60
             sync_service_zone_nat.period_secs = 30
+            switch_port_settings_manager.period_secs = 30
             region_replacement.period_secs = 30
             [default_region_allocation_strategy]
             type = "random"

dev-tools/omdb/tests/env.out

@@ -91,6 +91,10 @@ task: "service_zone_nat_tracker"
     ensures service zone nat records are recorded in NAT RPW table
 
 
+task: "switch_port_config_manager"
+    manages switch port settings for rack switches
+
+
 ---------------------------------------------
 stderr:
 note: using Nexus URL http://127.0.0.1:REDACTED_PORT
@@ -181,6 +185,10 @@ task: "service_zone_nat_tracker"
     ensures service zone nat records are recorded in NAT RPW table
 
 
+task: "switch_port_config_manager"
+    manages switch port settings for rack switches
+
+
 ---------------------------------------------
 stderr:
 note: Nexus URL not specified.  Will pick one from DNS.
@@ -258,6 +266,10 @@ task: "service_zone_nat_tracker"
     ensures service zone nat records are recorded in NAT RPW table
 
 
+task: "switch_port_config_manager"
+    manages switch port settings for rack switches
+
+
 ---------------------------------------------
 stderr:
 note: Nexus URL not specified.  Will pick one from DNS.

dev-tools/omdb/tests/successes.out

@@ -285,6 +285,10 @@ task: "service_zone_nat_tracker"
     ensures service zone nat records are recorded in NAT RPW table
 
 
+task: "switch_port_config_manager"
+    manages switch port settings for rack switches
+
+
 ---------------------------------------------
 stderr:
 note: using Nexus URL http://127.0.0.1:REDACTED_PORT/
@@ -426,6 +430,13 @@ task: "service_zone_nat_tracker"
     started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
     last completion reported error: inventory collection is None
 
+task: "switch_port_config_manager"
+  configured period: every 30s
+  currently executing: no
+  last completed activation: iter 2, triggered by an explicit signal
+    started at <REDACTED     TIMESTAMP> (<REDACTED DURATION>s ago) and ran for <REDACTED DURATION>ms
+    last completion reported error: Could not determine if task is enabled via db: Invalid Request: no matching records
+
 ---------------------------------------------
 stderr:
 note: using Nexus URL http://127.0.0.1:REDACTED_PORT/

nexus/db-model/src/background_task_toggles.rs

@@ -0,0 +1,29 @@
+use chrono::{DateTime, Utc};
+use serde::Deserialize;
+use serde::Serialize;
+use uuid::Uuid;
+
+use crate::schema::background_task_toggles;
+
+/// Values used to create a background task toggle
+#[derive(Insertable, Debug, Clone, Eq, PartialEq)]
+#[diesel(table_name = background_task_toggles)]
+pub struct BackgroundTaskToggleValues {
+    pub name: String,
+    pub enabled: bool,
+}
+
+/// Database representation of a background task toggle
+#[derive(Queryable, Debug, Clone, Selectable, Serialize, Deserialize)]
+#[diesel(table_name = background_task_toggles)]
+pub struct BackgroundTaskToggle {
+    pub id: Uuid,
+    pub name: String,
+    pub enabled: bool,
+    pub time_created: DateTime<Utc>,
+    pub time_modified: DateTime<Utc>,
+    pub time_deleted: Option<DateTime<Utc>>,
+}
+
+// TODO convert to enum?
+pub const SYNC_SWITCH_PORT_SETTINGS: &str = "sync_switch_port_settings";

nexus/db-model/src/lib.rs

@@ -10,6 +10,7 @@ extern crate diesel;
 extern crate newtype_derive;
 
 mod address_lot;
+pub mod background_task_toggles;
 mod bfd;
 mod bgp;
 mod block_size;

nexus/db-model/src/schema.rs

@@ -13,7 +13,7 @@ use omicron_common::api::external::SemverVersion;
 ///
 /// This should be updated whenever the schema is changed. For more details,
 /// refer to: schema/crdb/README.adoc
-pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(33, 0, 1);
+pub const SCHEMA_VERSION: SemverVersion = SemverVersion::new(34, 0, 0);
 
 table! {
     disk (id) {
@@ -1515,6 +1515,17 @@ table! {
     }
 }
 
+table! {
+    background_task_toggles (id) {
+        id -> Uuid,
+        name -> Text,
+        enabled -> Bool,
+        time_created -> Timestamptz,
+        time_modified -> Timestamptz,
+        time_deleted -> Nullable<Timestamptz>,
+    }
+}
+
 table! {
     db_metadata (singleton) {
         singleton -> Bool,

nexus/db-queries/src/db/datastore/background_task_toggle.rs

@@ -0,0 +1,94 @@
+use crate::db::error::{public_error_from_diesel, ErrorHandler};
+use crate::{
+    context::OpContext,
+    db::model::background_task_toggles::{
+        BackgroundTaskToggle, BackgroundTaskToggleValues,
+    },
+};
+use async_bb8_diesel::AsyncRunQueryDsl;
+use diesel::{prelude::*, ExpressionMethods, SelectableHelper};
+use omicron_common::api::external::{CreateResult, Error, LookupResult};
+
+use super::DataStore;
+
+impl DataStore {
+    pub async fn set_background_task_toggle(
+        &self,
+        opctx: &OpContext,
+        values: BackgroundTaskToggleValues,
+    ) -> CreateResult<()> {
+        use crate::db::schema::background_task_toggles::dsl;
+
+        diesel::insert_into(dsl::background_task_toggles)
+            .values(values.clone())
+            .on_conflict(dsl::name)
+            .do_update()
+            .set(dsl::enabled.eq(values.enabled))
+            .execute_async(&*self.pool_connection_authorized(opctx).await?)
+            .await
+            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
+        Ok(())
+    }
+
+    pub async fn get_background_task_toggle(
+        &self,
+        opctx: &OpContext,
+        name: String,
+    ) -> LookupResult<BackgroundTaskToggle> {
+        use crate::db::schema::background_task_toggles::dsl;
+
+        let result = dsl::background_task_toggles
+            .filter(dsl::name.eq(name))
+            .select(BackgroundTaskToggle::as_select())
+            .limit(1)
+            .load_async(&*self.pool_connection_authorized(opctx).await?)
+            .await
+            .map_err(|e| public_error_from_diesel(e, ErrorHandler::Server))?;
+
+        if let Some(nat_entry) = result.first() {
+            Ok(nat_entry.clone())
+        } else {
+            Err(Error::invalid_request("no matching records"))
+        }
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use crate::db::datastore::datastore_test;
+    use nexus_test_utils::db::test_setup_database;
+    use omicron_test_utils::dev;
+
+    // Test our ability to track additions and deletions since a given version number
+    #[tokio::test]
+    async fn set_and_get_toggles() {
+        let logctx = dev::test_setup_log("test_set_and_get_toggles");
+        let mut db = test_setup_database(&logctx.log).await;
+        let (opctx, datastore) = datastore_test(&logctx, &db).await;
+
+        // no toggle should be set for "my_task"
+        assert!(datastore
+            .get_background_task_toggle(&opctx, "my_task".into())
+            .await
+            .is_err());
+
+        assert!(datastore
+            .set_background_task_toggle(
+                &opctx,
+                super::BackgroundTaskToggleValues {
+                    name: "my_task".into(),
+                    enabled: true
+                }
+            )
+            .await
+            .is_ok());
+
+        assert!(datastore
+            .get_background_task_toggle(&opctx, "my_task".into())
+            .await
+            .is_ok());
+
+        db.cleanup().await.unwrap();
+        logctx.cleanup_successful();
+    }
+}

nexus/db-queries/src/db/datastore/mod.rs

@@ -48,6 +48,7 @@ use std::sync::Arc;
 use uuid::Uuid;
 
 mod address_lot;
+mod background_task_toggle;
 mod bfd;
 mod bgp;
 mod bootstore;

nexus/examples/config.toml

@@ -5,7 +5,7 @@
 [console]
 # Directory for static assets. Absolute path or relative to CWD.
 static_dir = "out/console-assets"
-session_idle_timeout_minutes = 480 # 6 hours
+session_idle_timeout_minutes = 480      # 6 hours
 session_absolute_timeout_minutes = 1440 # 24 hours
 
 # List of authentication schemes to support.
@@ -35,7 +35,7 @@ rack_id = "c19a698f-c6f9-4a17-ae30-20d711b8f7dc"
 
 # Nexus may need to resolve external hosts (e.g. to grab IdP metadata).
 # These are the DNS servers it should use.
-external_dns_servers = [ "1.1.1.1", "9.9.9.9" ]
+external_dns_servers = ["1.1.1.1", "9.9.9.9"]
 
 [deployment.dropshot_external]
 # IP Address and TCP port on which to listen for the external API
@@ -109,6 +109,7 @@ phantom_disks.period_secs = 30
 blueprints.period_secs_load = 10
 blueprints.period_secs_execute = 60
 sync_service_zone_nat.period_secs = 30
+switch_port_settings_manager.period_secs = 30
 region_replacement.period_secs = 30
 
 [default_region_allocation_strategy]

nexus/src/app/background/init.rs

@@ -17,6 +17,7 @@ use super::nat_cleanup;
 use super::phantom_disks;
 use super::region_replacement;
 use super::sync_service_zone_nat::ServiceZoneNatTracker;
+use super::sync_switch_port_settings::SwitchPortSettingsManager;
 use crate::app::sagas::SagaRequest;
 use nexus_db_model::DnsGroup;
 use nexus_db_queries::context::OpContext;
@@ -76,6 +77,9 @@ pub struct BackgroundTasks {
     /// task handle for the service zone nat tracker
     pub task_service_zone_nat_tracker: common::TaskHandle,
 
+    /// task handle for the switch port settings manager
+    pub task_switch_port_settings_manager: common::TaskHandle,
+
     /// task handle for the task that detects if regions need replacement and
     /// begins the process
     pub task_region_replacement: common::TaskHandle,
@@ -134,7 +138,7 @@ impl BackgroundTasks {
             (task, watcher_channel)
         };
 
-        let dpd_clients: Vec<_> = dpd_clients.values().cloned().collect();
+        let dpd_client_list: Vec<_> = dpd_clients.values().cloned().collect();
 
         let nat_cleanup = {
             driver.register(
@@ -146,7 +150,7 @@ impl BackgroundTasks {
                 config.nat_cleanup.period_secs,
                 Box::new(nat_cleanup::Ipv4NatGarbageCollector::new(
                     datastore.clone(),
-                    dpd_clients.clone(),
+                    dpd_client_list.clone(),
                 )),
                 opctx.child(BTreeMap::new()),
                 vec![],
@@ -174,7 +178,7 @@ impl BackgroundTasks {
         let task_inventory_collection = {
             let collector = inventory_collection::InventoryCollector::new(
                 datastore.clone(),
-                resolver,
+                resolver.clone(),
                 &nexus_id.to_string(),
                 config.inventory.nkeep,
                 config.inventory.disable,
@@ -247,7 +251,21 @@ impl BackgroundTasks {
                 config.sync_service_zone_nat.period_secs,
                 Box::new(ServiceZoneNatTracker::new(
                     datastore.clone(),
-                    dpd_clients.clone(),
+                    dpd_client_list.clone(),
+                )),
+                opctx.child(BTreeMap::new()),
+                vec![],
+            )
+        };
+
+        let task_switch_port_settings_manager = {
+            driver.register(
+                "switch_port_config_manager".to_string(),
+                String::from("manages switch port settings for rack switches"),
+                config.switch_port_settings_manager.period_secs,
+                Box::new(SwitchPortSettingsManager::new(
+                    datastore.clone(),
+                    resolver.clone(),
                 )),
                 opctx.child(BTreeMap::new()),
                 vec![],
@@ -289,6 +307,7 @@ impl BackgroundTasks {
             task_blueprint_loader,
             task_blueprint_executor,
             task_service_zone_nat_tracker,
+            task_switch_port_settings_manager,
             task_region_replacement,
         }
     }