dynamic external ddm peers

.github/buildomat/jobs/test-ddm-sextet.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+#:
+#: name = "test-ddm-sextet"
+#: variety = "basic"
+#: target = "helios-3.0"
+#: rust_toolchain = "stable"
+#: output_rules = [
+#:   "/work/*.log",
+#: ]
+
+source .github/buildomat/test-ddm-common.sh
+
+#
+# sextet tests
+#
+
+banner "sextet"
+pfexec cargo test --release -p mg-tests test_external_peer_sextet -- --nocapture

ddm-admin-client/src/lib.rs

@@ -23,5 +23,6 @@ progenitor::generate_api!(
         PeerInfo = ddm_api_types_versions::latest::db::PeerInfo,
         PeerStatus = ddm_api_types_versions::latest::db::PeerStatus,
         Duration = std::time::Duration,
+        ExternalPeers = ddm_api_types_versions::latest::external_peers::ExternalPeers,
     }
 );

ddm-api-types/src/external_peers.rs

@@ -0,0 +1,5 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
+
+pub use ddm_api_types_versions::latest::external_peers::*;

ddm-api-types/src/lib.rs

@@ -19,4 +19,5 @@
 pub mod admin;
 pub mod db;
 pub mod exchange;
+pub mod external_peers;
 pub mod net;

ddm-api-types/versions/src/external_peers/external_peers.rs

@@ -0,0 +1,12 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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 schemars::JsonSchema;
+use serde::{Deserialize, Serialize};
+use std::collections::BTreeSet;
+
+#[derive(Debug, Clone, Deserialize, Serialize, JsonSchema, PartialEq, Eq)]
+pub struct ExternalPeers {
+    pub address_objects: BTreeSet<String>,
+}

ddm-api-types/versions/src/external_peers/mod.rs

@@ -0,0 +1,5 @@
+// This Source Code Form is subject to the terms of the Mozilla Public
+// 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/.
+
+pub mod external_peers;

ddm-api-types/versions/src/latest.rs

@@ -25,3 +25,7 @@ pub mod exchange {
 pub mod net {
     pub use crate::v1::net::TunnelOrigin;
 }
+
+pub mod external_peers {
+    pub use crate::v3::external_peers::ExternalPeers;
+}

ddm-api-types/versions/src/lib.rs

@@ -34,3 +34,5 @@ pub mod latest;
 pub mod v1;
 #[path = "peer_durations/mod.rs"]
 pub mod v2;
+#[path = "external_peers/mod.rs"]
+pub mod v3;

ddm-api/src/lib.rs

@@ -26,6 +26,7 @@ api_versions!([
     // |  example for the next person.
     // v
     // (next_int, IDENT),
+    (3, EXTERNAL_PEERS),
     (2, PEER_DURATIONS),
     (1, INITIAL),
 ]);
@@ -170,4 +171,23 @@ pub trait DdmAdminApi {
     async fn disable_stats(
         ctx: RequestContext<Self::Context>,
     ) -> Result<HttpResponseUpdatedNoContent, HttpError>;
+
+    #[endpoint {
+        method = PUT,
+        path = "/external_peers",
+        versions = VERSION_EXTERNAL_PEERS..,
+    }]
+    async fn set_external_peers(
+        ctx: RequestContext<Self::Context>,
+        request: TypedBody<latest::external_peers::ExternalPeers>,
+    ) -> Result<HttpResponseUpdatedNoContent, HttpError>;
+
+    #[endpoint {
+        method = GET,
+        path = "/external_peers",
+        versions = VERSION_EXTERNAL_PEERS..,
+    }]
+    async fn get_external_peers(
+        ctx: RequestContext<Self::Context>,
+    ) -> Result<HttpResponseOk<latest::external_peers::ExternalPeers>, HttpError>;
 }

ddm-protocol/src/v3.rs

@@ -117,6 +117,17 @@ impl UnderlayUpdate {
                 .collect(),
         }
     }
+    pub fn break_loops(&self, hostname: &String) -> Self {
+        Self {
+            announce: self
+                .announce
+                .iter()
+                .filter(|x| !x.path.contains(hostname))
+                .cloned()
+                .collect(),
+            withdraw: self.withdraw.clone(),
+        }
+    }
 }
 
 impl From<UnderlayUpdate> for Update {

ddm/Cargo.toml

@@ -36,15 +36,15 @@ oximeter-producer.workspace = true
 oxnet.workspace = true
 uuid.workspace = true
 ddm-api.workspace = true
+dpd-client.workspace = true
 
 # illumos-only deps used by the routing state machine and platform sys layer.
 # Gated by the `backend` feature so stub builds (e.g. Linux test fixtures
 # running `ddmd` with `--api-only`) link cleanly.
 libnet = { workspace = true, optional = true }
-dpd-client = { workspace = true, optional = true }
 opte-ioctl = { workspace = true, optional = true }
 oxide-vpc = { workspace = true, optional = true }
 
 [features]
 default = ["backend"]
-backend = ["dep:libnet", "dep:dpd-client", "dep:opte-ioctl", "dep:oxide-vpc"]
+backend = ["dep:libnet", "dep:opte-ioctl", "dep:oxide-vpc"]