Merge branch 'fix-broken-router-info-page-prefixes-query-link' into f…

…ix-incorrect-count-on-router-list-page

.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: ci
+
+on:
+  workflow_dispatch:
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --verbose
+    - name: Run tests
+      run: cargo test --verbose

etc/rotonda.conf

@@ -165,12 +165,12 @@ log_file = "./rotonda.log" # used if log_target is "file"
 #     Setting                Description
 #     ========================================================================
 #     listen                 The "<IP ADDRESS>:<PORT>" to listen on for
-#                            incoming BMP connections from routers.
+#                            incoming BGP connections from BGP speakers.
 #
 #     my_asn                 The positive number of the Autonomous System in
 #                            which this instance of Rotonda is operating and
 #                            which will be sent by this BGP speaker in its
-#                            RFC 4271 BGP OPEN messagein the "My Autonomous
+#                            RFC 4271 BGP OPEN message in the "My Autonomous
 #                            Number" field [3].
 #
 #     my_bgp_id              An array of four positive integer numbers, e.g.

src/targets/mod.rs

@@ -20,9 +20,7 @@ mod bmp_tcp_out;
 #[cfg(feature = "mqtt")]
 mod mqtt;
 mod null;
-// mod rotoro;
 
-// pub use rotoro::{RotoroCoder, RotoroCommand, WireMsg};
 use tokio::sync::mpsc;
 
 //------------ Target --------------------------------------------------------
@@ -46,8 +44,6 @@ pub enum Target {
     #[serde(rename = "mqtt-out")]
     Mqtt(mqtt::target::Mqtt),
 
-    // #[serde(rename = "rotoro-out")]
-    // Rotoro(rotoro::Target),
     #[serde(rename = "null-out")]
     Null(null::Target),
 }
@@ -65,7 +61,6 @@ impl Target {
             Target::BmpTcpOut(target) => target.run(component, cmd, waitpoint).await,
             #[cfg(feature = "mqtt")]
             Target::Mqtt(target) => target.run(component, cmd, waitpoint).await,
-            // Target::Rotoro(target) => target.run(component, cmd).await,
             Target::Null(target) => target.run(component, cmd, waitpoint).await,
         }
     }

src/units/mod.rs

@@ -47,8 +47,6 @@ pub enum Unit {
     #[serde(rename = "filter")]
     Filter(filter::unit::Filter),
 
-    // #[serde(rename = "rotoro-in")]
-    // Rotoro(rotoro::unit::RotoroIn),
     #[serde(rename = "bmp-in")]
     BmpIn(bmp_in::unit::BmpIn),