6750 Add support for post-install LLDP configuration

Cargo.toml

@@ -439,6 +439,8 @@ libfalcon = { git = "https://github.com/oxidecomputer/falcon", branch = "main" }
 libnvme = { git = "https://github.com/oxidecomputer/libnvme", rev = "dd5bb221d327a1bc9287961718c3c10d6bd37da0" }
 linear-map = "1.2.0"
 live-tests-macros = { path = "live-tests/macros" }
+# XXX: switch back to main branch before integration
+lldpd-client = { git = "https://github.com/oxidecomputer/lldp", branch = "paginate" }
 macaddr = { version = "1.0.1", features = ["serde_std"] }
 maplit = "1.0.2"
 mockall = "0.13"

common/src/api/external/http_pagination.rs

@@ -59,6 +59,7 @@ use std::num::NonZeroU32;
 use uuid::Uuid;
 
 use super::SimpleIdentity;
+use super::SimpleIdentityOrName;
 
 // General pagination infrastructure
 
@@ -140,16 +141,16 @@ pub fn marker_for_name<S, T: ObjectIdentity>(_: &S, t: &T) -> Name {
 ///
 /// This is intended for use with [`ScanById::results_page`] with objects that
 /// impl [`ObjectIdentity`].
-pub fn marker_for_id<S, T: ObjectIdentity>(_: &S, t: &T) -> Uuid {
-    t.identity().id
+pub fn marker_for_id<S, T: SimpleIdentity>(_: &S, t: &T) -> Uuid {
+    t.id()
 }
 
 /// Marker function that extracts the "name" or "id" from an object, depending
 /// on the scan in use
 ///
 /// This is intended for use with [`ScanByNameOrId::results_page`] with objects
 /// that impl [`ObjectIdentity`].
-pub fn marker_for_name_or_id<T: SimpleIdentity, Selector>(
+pub fn marker_for_name_or_id<T: SimpleIdentityOrName, Selector>(
     scan: &ScanByNameOrId<Selector>,
     item: &T,
 ) -> NameOrId {

common/src/api/external/mod.rs

@@ -76,16 +76,28 @@ pub trait ObjectIdentity {
 }
 
 /// Exists for types that don't properly implement `ObjectIdentity` but
-/// still need to be paginated by name or id.
+/// still need to be paginated by id.
 pub trait SimpleIdentity {
     fn id(&self) -> Uuid;
-    fn name(&self) -> &Name;
 }
 
 impl<T: ObjectIdentity> SimpleIdentity for T {
     fn id(&self) -> Uuid {
         self.identity().id
     }
+}
+
+/// Exists for types that don't properly implement `ObjectIdentity` but
+/// still need to be paginated by name or id.
+pub trait SimpleIdentityOrName {
+    fn id(&self) -> Uuid;
+    fn name(&self) -> &Name;
+}
+
+impl<T: ObjectIdentity> SimpleIdentityOrName for T {
+    fn id(&self) -> Uuid {
+        self.identity().id
+    }
 
     fn name(&self) -> &Name {
         &self.identity().name
@@ -1010,6 +1022,7 @@ pub enum ResourceType {
     FloatingIp,
     Probe,
     ProbeNetworkInterface,
+    LldpLinkConfig,
 }
 
 // IDENTITY METADATA
@@ -2555,6 +2568,50 @@ pub struct LldpLinkConfig {
     pub management_ip: Option<oxnet::IpNet>,
 }
 
+/// Information about LLDP advertisements from other network entities directly
+/// connected to a switch port.  This structure contains both metadata about
+/// when and where the neighbor was seen, as well as the specific information
+/// the neighbor was advertising.
+#[derive(Clone, Debug, Deserialize, JsonSchema, Serialize, PartialEq)]
+pub struct LldpNeighbor {
+    // Unique ID assigned to this neighbor - only used for pagination
+    #[serde(skip)]
+    pub id: Uuid,
+
+    /// The port on which the neighbor was seen
+    pub local_port: String,
+
+    /// Initial sighting of this LldpNeighbor
+    pub first_seen: DateTime<Utc>,
+
+    /// Most recent sighting of this LldpNeighbor
+    pub last_seen: DateTime<Utc>,
+
+    /// The LLDP link name advertised by the neighbor
+    pub link_name: String,
+
+    /// The LLDP link description advertised by the neighbor
+    pub link_description: Option<String>,
+
+    /// The LLDP chassis identifier advertised by the neighbor
+    pub chassis_id: String,
+
+    /// The LLDP system name advertised by the neighbor
+    pub system_name: Option<String>,
+
+    /// The LLDP system description advertised by the neighbor
+    pub system_description: Option<String>,
+
+    /// The LLDP management IP(s) advertised by the neighbor
+    pub management_ip: Vec<oxnet::IpNet>,
+}
+
+impl SimpleIdentity for LldpNeighbor {
+    fn id(&self) -> Uuid {
+        self.id
+    }
+}
+
 /// Per-port tx-eq overrides.  This can be used to fine-tune the transceiver
 /// equalization settings to improve signal integrity.
 #[derive(Clone, Debug, Deserialize, JsonSchema, Serialize, PartialEq)]

dev-tools/ls-apis/api-manifest.toml

@@ -21,7 +21,6 @@
 # Progenitor clients or APIs, so they're left out to avoid needing to create and
 # process clones of these repos:
 #
-# - lldp
 # - pumpkind
 # - thundermuffin
 #
@@ -74,6 +73,7 @@ packages = [
     # switch zone
     "ddmd",
     "dpd",
+    "lldpd",
     "mgd",
     "omicron-gateway",
     "tfportd",
@@ -231,6 +231,12 @@ and exists as a client library within omicron. This is because the Dendrite \
 repo is not currently open source.
 """
 
+[[apis]]
+client_package_name = "lldpd-client"
+label = "LLDP daemon"
+server_package_name = "lldpd"
+notes = "The LLDP daemon runs in the switch zone and is deployed next to dpd."
+
 [[apis]]
 client_package_name = "gateway-client"
 label = "Management Gateway Service"

dev-tools/ls-apis/src/workspaces.rs

@@ -77,6 +77,7 @@ impl Workspaces {
                 )])),
             ),
             ("maghemite", "mg-admin-client", None),
+            ("lldp", "lldpd-client", None),
         ]
         .into_iter()
         .map(|(repo, omicron_pkg, extra_features)| {

dev-tools/ls-apis/tests/api_dependencies.out

@@ -51,6 +51,9 @@ Management Gateway Service (client: gateway-client)
 Wicketd Installinator (client: installinator-client)
     consumed by: installinator (omicron/installinator) via 1 path
 
+LLDP daemon (client: lldpd-client)
+    consumed by: omicron-nexus (omicron/nexus) via 1 path
+
 Maghemite MG Admin (client: mg-admin-client)
     consumed by: omicron-nexus (omicron/nexus) via 1 path
     consumed by: omicron-sled-agent (omicron/sled-agent) via 1 path

nexus/Cargo.toml

@@ -47,6 +47,7 @@ internal-dns-resolver.workspace = true
 internal-dns-types.workspace = true
 ipnetwork.workspace = true
 itertools.workspace = true
+lldpd-client.workspace = true
 macaddr.workspace = true
 # Not under "dev-dependencies"; these also need to be implemented for
 # integration tests.