feat: add load balancer score and frontend integration
- Implemented `OKDLoadBalancerScore` and integrated it as a `FrontendScore`. - Added `FrontendScore` trait for TUI displayable scores. - Implemented `Display` for `OKDLoadBalancerScore`. - Updated `ScoreListWidget` to handle `FrontendScore` types. - Included load balancer score in the TUI.
This commit is contained in:
parent
e6384da57e
commit
ab9b7476a4
7
Cargo.lock
generated
7
Cargo.lock
generated
@ -859,13 +859,6 @@ dependencies = [
|
||||
"url",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "example-topology"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"rand",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "example-tui"
|
||||
version = "0.1.0"
|
||||
|
@ -12,6 +12,12 @@ async fn main() {
|
||||
let mut maestro = Maestro::new(inventory, topology);
|
||||
|
||||
maestro.register_all(vec![
|
||||
// ADD scores :
|
||||
// 1. OPNSense setup scores
|
||||
// 2. Bootstrap node setup
|
||||
// 3. Control plane setup
|
||||
// 4. Workers setup
|
||||
// 5. Various tools and apps setup
|
||||
Box::new(SuccessScore {}),
|
||||
Box::new(ErrorScore {}),
|
||||
Box::new(PanicScore {}),
|
||||
|
@ -12,7 +12,7 @@ use harmony::{
|
||||
modules::{
|
||||
dummy::{ErrorScore, PanicScore, SuccessScore},
|
||||
http::HttpScore,
|
||||
okd::{dhcp::OKDDhcpScore, dns::OKDDnsScore},
|
||||
okd::{dhcp::OKDDhcpScore, dns::OKDDnsScore, load_balancer::OKDLoadBalancerScore},
|
||||
opnsense::OPNsenseShellCommandScore,
|
||||
tftp::TftpScore,
|
||||
},
|
||||
@ -78,8 +78,7 @@ async fn main() {
|
||||
|
||||
let dhcp_score = OKDDhcpScore::new(&topology, &inventory);
|
||||
let dns_score = OKDDnsScore::new(&topology);
|
||||
let load_balancer_score =
|
||||
harmony::modules::okd::load_balancer::OKDLoadBalancerScore::new(&topology);
|
||||
let load_balancer_score = OKDLoadBalancerScore::new(&topology);
|
||||
|
||||
let tftp_score = TftpScore::new(Url::LocalFolder("./data/watchguard/tftpboot".to_string()));
|
||||
let http_score = HttpScore::new(Url::LocalFolder(
|
||||
|
@ -19,3 +19,5 @@ where
|
||||
Box::new(self.clone())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait FrontendScore<T: Topology>: Score<T> + std::fmt::Display {}
|
||||
|
@ -334,6 +334,7 @@ impl TftpServer for DummyInfra {
|
||||
#[async_trait]
|
||||
impl HttpServer for DummyInfra {
|
||||
async fn serve_files(&self, _url: &Url) -> Result<(), ExecutorError> {
|
||||
|
||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
||||
}
|
||||
fn get_ip(&self) -> IpAddress {
|
||||
|
@ -5,7 +5,7 @@ use crate::{
|
||||
data::{Id, Version},
|
||||
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
|
||||
inventory::Inventory,
|
||||
score::Score,
|
||||
score::{FrontendScore, Score},
|
||||
topology::{LoadBalancer, LoadBalancerService, Topology},
|
||||
};
|
||||
|
||||
@ -19,6 +19,8 @@ pub struct LoadBalancerScore {
|
||||
// uuid?
|
||||
}
|
||||
|
||||
impl <T: Topology + LoadBalancer> FrontendScore<T> for LoadBalancerScore {}
|
||||
|
||||
impl<T: Topology + LoadBalancer> Score<T> for LoadBalancerScore {
|
||||
fn create_interpret(&self) -> Box<dyn Interpret<T>> {
|
||||
Box::new(LoadBalancerInterpret::new(self.clone()))
|
||||
|
@ -3,12 +3,20 @@ use std::net::SocketAddr;
|
||||
use crate::{
|
||||
interpret::Interpret,
|
||||
modules::load_balancer::LoadBalancerScore,
|
||||
score::Score,
|
||||
score::{FrontendScore, Score},
|
||||
topology::{
|
||||
BackendServer, HAClusterTopology, HealthCheck, HttpMethod, HttpStatusCode, LoadBalancer, LoadBalancerService, Topology
|
||||
},
|
||||
};
|
||||
|
||||
impl std::fmt::Display for OKDLoadBalancerScore {
|
||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||
todo!()
|
||||
}
|
||||
}
|
||||
|
||||
impl <T: Topology + LoadBalancer> FrontendScore<T> for OKDLoadBalancerScore {}
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct OKDLoadBalancerScore {
|
||||
load_balancer_score: LoadBalancerScore,
|
||||
|
@ -1,7 +1,7 @@
|
||||
use std::sync::{Arc, RwLock};
|
||||
|
||||
use crossterm::event::{Event, KeyCode, KeyEventKind};
|
||||
use harmony::{score::Score, topology::Topology};
|
||||
use harmony::{modules::okd::load_balancer::OKDLoadBalancerScore, score::Score, topology::{LoadBalancer, Topology}};
|
||||
use log::{info, warn};
|
||||
use ratatui::{
|
||||
layout::Rect, style::{Style, Stylize}, widgets::{List, ListItem, ListState, StatefulWidget, Widget}, Frame
|
||||
@ -23,10 +23,12 @@ struct Execution<T: Topology> {
|
||||
score: Box<dyn Score<T>>,
|
||||
}
|
||||
|
||||
impl <T: Topology + LoadBalancer> FrontendScore<T> for OKDLoadBalancerScore {}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct ScoreListWidget<T: Topology> {
|
||||
list_state: Arc<RwLock<ListState>>,
|
||||
scores: Vec<Box<dyn Score<T>>>,
|
||||
scores: Vec<Box<dyn FrontendScore<T>>>,
|
||||
execution: Option<Execution<T>>,
|
||||
execution_history: Vec<Execution<T>>,
|
||||
sender: mpsc::Sender<HarmonyTuiEvent<T>>,
|
||||
|
Loading…
Reference in New Issue
Block a user