Add NodeList Page

Author: archeoss

CHANGELOG.md

@@ -14,4 +14,6 @@ Bob Management GUI changelog
 - Login Page, backend (#16)
 - Login Page, frontend (#17)
 - Home page, backend (#18)
+- Node list page, backend (#19)
 - Home page, frontend (#22)
+- Node list page, frontend (#23)

api/openapi.yaml

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 openapi: 3.0.3
 info:
   title: bob-management
@@ -838,3 +839,6 @@ components:
 tags:
   - name: bob
     description: BOB management API
+=======
+
+>>>>>>> 3a6bfd4 (Add NodeList Page)

backend/src/connector/dto.rs

@@ -409,6 +409,8 @@ impl Ord for MetricsEntryModel {
 impl Eq for MetricsEntryModel {}
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), derive(ToSchema))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), schema(as = dto::Node))]
 pub struct Node {
     #[serde(rename = "name")]
     pub name: String,
@@ -418,6 +420,7 @@ pub struct Node {
 
     #[serde(rename = "vdisks")]
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[cfg_attr(all(feature = "swagger", debug_assertions), schema(value_type = Option<Vec<dto::VDisk>>))]
     pub vdisks: Option<Vec<VDisk>>,
 }
 
@@ -697,6 +700,8 @@ impl std::str::FromStr for Partition {
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), derive(ToSchema))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), schema(as = dto::Replica))]
 pub struct Replica {
     #[serde(rename = "node")]
     pub node: String,
@@ -896,12 +901,15 @@ impl std::str::FromStr for StatusExt {
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
 #[cfg_attr(feature = "conversion", derive(frunk::LabelledGeneric))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), derive(ToSchema))]
+#[cfg_attr(all(feature = "swagger", debug_assertions), schema(as = dto::VDisk))]
 pub struct VDisk {
     #[serde(rename = "id")]
     pub id: i32,
 
     #[serde(rename = "replicas")]
     #[serde(skip_serializing_if = "Option::is_none")]
+    #[cfg_attr(all(feature = "swagger", debug_assertions), schema(value_type = Option<Vec<dto::Replica>>))]
     pub replicas: Option<Vec<Replica>>,
 }
 

backend/src/connector/mod.rs

@@ -10,8 +10,9 @@ mod prelude {
         headers::{authorization::Credentials, Authorization, HeaderMapExt},
         http::{HeaderName, HeaderValue},
     };
-    pub use futures::StreamExt;
-    pub use hyper::{service::Service, Response, Uri};
+    pub use futures::{Stream, StreamExt};
+    pub use hyper::{body::Bytes, service::Service, Response, Uri};
+    pub use std::collections::BTreeMap;
     pub use std::{
         str::FromStr,
         sync::Arc,
@@ -105,7 +106,7 @@ pub struct BobClient<Context: Send + Sync, Client: ApiNoContext<Context> + Send
     main: Arc<Client>,
 
     /// Clients for all known nodes
-    cluster: HashMap<NodeName, Arc<Client>>,
+    cluster: BTreeMap<NodeName, Arc<Client>>,
 
     context_marker: PhantomData<fn(Context)>,
 }
@@ -168,7 +169,7 @@ impl<Context: Send + Sync, ApiInterface: ApiNoContext<Context> + Send + Sync>
                 .attach_printable(format!("Hostname: {}", hostname.to_string()))?
         };
 
-        let cluster: HashMap<NodeName, Arc<_>> = nodes
+        let cluster: BTreeMap<NodeName, Arc<_>> = nodes
             .iter()
             .filter_map(|node| HttpClient::from_node(node, &bob_data.hostname, context.clone()))
             .collect();
@@ -177,6 +178,7 @@ impl<Context: Send + Sync, ApiInterface: ApiNoContext<Context> + Send + Sync>
             id: Uuid::new_v4(),
             hostname: bob_data.hostname,
             main: Arc::new(client.with_context(context)),
+            // main: Arc::new(client),
             cluster,
             context_marker: PhantomData,
         })
@@ -275,7 +277,7 @@ impl<Context: Send + Sync, ApiInterface: ApiNoContext<Context> + Send + Sync>
     }
 
     #[must_use]
-    pub const fn cluster_with_addr(&self) -> &HashMap<NodeName, Arc<ApiInterface>> {
+    pub const fn cluster_with_addr(&self) -> &BTreeMap<NodeName, Arc<ApiInterface>> {
         &self.cluster
     }
 

backend/src/lib.rs

@@ -41,25 +41,36 @@ impl Modify for SecurityAddon {
         services::api::get_nodes_count,
         services::api::get_rps,
         services::api::get_space,
+        services::api::raw_metrics_by_node,
+        services::api::raw_configuration_by_node,
+        services::api::get_node_info,
+        services::api::get_nodes_list,
     ),
     components(
         schemas(models::shared::Credentials, models::shared::Hostname, models::shared::BobConnectionData,
+            models::api::Disk,
             models::api::DiskProblem,
             models::api::DiskStatus,
             models::api::DiskStatusName,
             models::api::DiskCount,
+            models::api::NodeInfo,
             models::api::NodeProblem,
             models::api::NodeStatus,
             models::api::NodeStatusName,
             models::api::NodeCount,
+            models::api::Replica,
             models::api::ReplicaProblem,
             models::api::ReplicaStatus,
             models::api::SpaceInfo,
+            models::api::VDisk,
             models::api::VDiskStatus,
             models::api::Operation,
             models::api::RPS,
             models::api::RawMetricEntry,
             models::api::TypedMetrics,
+            connector::dto::Node,
+            connector::dto::VDisk,
+            connector::dto::Replica,
             connector::dto::MetricsEntryModel,
             connector::dto::MetricsSnapshotModel,
             connector::dto::NodeConfiguration