fixes for system timeseries endpoints and optional FEC link

Author: david-crespo

cli/src/cli_builder.rs

@@ -577,8 +577,8 @@ fn xxx<'a>(command: CliCommand) -> Option<&'a str> {
         CliCommand::ProbeView => Some("experimental probe view"),
 
         // Metrics-related subcommands
-        CliCommand::TimeseriesQuery => Some("experimental timeseries query"),
-        CliCommand::TimeseriesSchemaList => Some("experimental timeseries schema list"),
+        CliCommand::SystemTimeseriesQuery => Some("experimental timeseries query"),
+        CliCommand::SystemTimeseriesSchemaList => Some("experimental timeseries schema list"),
 
         // Commands not yet implemented
         CliCommand::DeviceAccessToken

cli/src/cmd_net.rs

@@ -95,7 +95,7 @@ pub struct CmdLinkAdd {
 
     /// The forward error correction mode of the link.
     #[arg(long, value_enum)]
-    pub fec: CliLinkFec,
+    pub fec: Option<CliLinkFec>,
 
     /// Maximum transmission unit for the link.
     #[arg(long, default_value_t = 1500u16)]
@@ -126,7 +126,7 @@ impl AuthenticatedCmd for CmdLinkAdd {
             });
         let link = LinkConfigCreate {
             autoneg: self.autoneg,
-            fec: self.fec.into(),
+            fec: self.fec.map(|fec| fec.into()),
             mtu: self.mtu,
             speed: self.speed.into(),
             lldp: LldpLinkConfigCreate {

cli/src/cmd_timeseries/dashboard.rs

@@ -12,7 +12,7 @@ use crossterm::event::{Event, EventStream, KeyCode, KeyEvent, KeyEventKind, KeyM
 use futures::{FutureExt, StreamExt};
 use oxide::{
     types::{MetricType, Table as OxqlTable, Timeseries, TimeseriesQuery, ValueArray},
-    Client, ClientMetricsExt,
+    Client, ClientSystemMetricsExt,
 };
 use ratatui::{
     prelude::{Alignment, Constraint, Direction, Layout},
@@ -218,7 +218,7 @@ async fn client_query_loop(
             _ = &mut done => break,
             _ = interval.tick() => {
                 let request = client
-                    .timeseries_query()
+                    .system_timeseries_query()
                     .body(TimeseriesQuery { query: query.clone() });
                 match request.send().await {
                     Ok(response) => {

cli/tests/test_net.rs

@@ -9,10 +9,9 @@ use chrono::prelude::*;
 use httpmock::MockServer;
 use oxide::types::{
     AddressLot, AddressLotBlock, AddressLotBlockResultsPage, AddressLotKind, AddressLotResultsPage,
-    BgpConfig, BgpConfigResultsPage, BgpPeer, ImportExportPolicy, LinkFec, LinkSpeed, NameOrId,
-    SwitchPort, SwitchPortAddressConfig, SwitchPortConfig, SwitchPortGeometry2,
-    SwitchPortLinkConfig, SwitchPortResultsPage, SwitchPortRouteConfig, SwitchPortSettings,
-    SwitchPortSettingsView,
+    BgpConfig, BgpConfigResultsPage, BgpPeer, ImportExportPolicy, LinkSpeed, NameOrId, SwitchPort,
+    SwitchPortAddressConfig, SwitchPortConfig, SwitchPortGeometry2, SwitchPortLinkConfig,
+    SwitchPortResultsPage, SwitchPortRouteConfig, SwitchPortSettings, SwitchPortSettingsView,
 };
 use oxide_httpmock::MockServerExt;
 use uuid::Uuid;
@@ -165,7 +164,7 @@ fn test_port_config() {
         link_lldp: Vec::new(),
         links: vec![SwitchPortLinkConfig {
             autoneg: false,
-            fec: LinkFec::None,
+            fec: None,
             link_name: String::from("phy0"),
             lldp_link_config_id: None,
             mtu: 1500,
@@ -259,7 +258,7 @@ fn test_port_config() {
         link_lldp: Vec::new(),
         links: vec![SwitchPortLinkConfig {
             autoneg: false,
-            fec: LinkFec::None,
+            fec: None,
             link_name: String::from("phy0"),
             lldp_link_config_id: None,
             mtu: 1500,