Skip to content

refactor(tui): Forward load_balancer to gen ResourceBehaviour #1978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gtema merged 1 commit into from
Sep 3, 2026
Merged

refactor(tui): Forward load_balancer to gen ResourceBehaviour #1978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 19 additions & 35 deletions openstack_tui/src/components/load_balancer/health_monitors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,33 @@
// SPDX-License-Identifier: Apache-2.0

use crate::action::Action;
use crate::cloud_worker::load_balancer::v2::{
LoadBalancerApiRequest, LoadBalancerHealthmonitorApiRequest, LoadBalancerHealthmonitorList,
};
use crate::cloud_worker::types::ApiRequest;
use crate::cloud_worker::types::{self as cloud_types, ApiRequest};
use crate::components::generic_resource_view::GenericResourceView;
use crate::components::resource_behaviour::ResourceBehaviour;
use crate::components::resource_behaviour::{GeneratedResourceBehaviour, ResourceBehaviour};
use crate::mode::Mode;

const VIEW_CONFIG_KEY: &str = "load-balancer.healthmonitor";

pub struct LoadBalancerHealthMonitorsBehaviour;

impl ResourceBehaviour for LoadBalancerHealthMonitorsBehaviour {
type Filter = LoadBalancerHealthmonitorList;
type Filter = cloud_types::LoadBalancerHealthmonitorList;

fn view_key() -> &'static str {
VIEW_CONFIG_KEY
super::generated::healthmonitor::Generated::view_key()
}
fn title() -> &'static str {
"LB HealthMonitors"
super::generated::healthmonitor::Generated::title()
}
fn mode() -> Mode {
Mode::Resource(Self::view_key())
super::generated::healthmonitor::Generated::mode()
}
fn request_from_filter(filter: &Self::Filter) -> ApiRequest {
ApiRequest::from(LoadBalancerHealthmonitorApiRequest::List(Box::new(
filter.clone(),
)))
super::generated::healthmonitor::Generated::request_from_filter(filter)
}
fn matches_request(request: &ApiRequest) -> bool {
matches!(
request,
ApiRequest::LoadBalancer(LoadBalancerApiRequest::Healthmonitor(boxreq))
if matches!(**boxreq, LoadBalancerHealthmonitorApiRequest::List(_))
)
super::generated::healthmonitor::Generated::matches_request(request)
}
fn handle_set_filter_action(action: &Action) -> Option<Self::Filter> {
if let Action::SetLoadBalancerHealthMonitorListFilters(f) = action {
Some(f.clone())
} else {
None
}
super::generated::healthmonitor::Generated::handle_set_filter_action(action)
}
}

Expand All @@ -74,7 +59,7 @@ mod tests {
);
assert_eq!(
LoadBalancerHealthMonitorsBehaviour::title(),
"LB HealthMonitors"
"Health Monitors"
);
assert_eq!(
LoadBalancerHealthMonitorsBehaviour::mode(),
Expand All @@ -84,18 +69,18 @@ mod tests {

#[test]
fn request_from_filter_creates_list_request() {
let filter = LoadBalancerHealthmonitorList::default();
let filter = cloud_types::LoadBalancerHealthmonitorList::default();
let request = LoadBalancerHealthMonitorsBehaviour::request_from_filter(&filter);
assert!(matches!(
request,
ApiRequest::LoadBalancer(LoadBalancerApiRequest::Healthmonitor(boxreq))
if matches!(*boxreq, LoadBalancerHealthmonitorApiRequest::List(_))
ApiRequest::LoadBalancer(cloud_types::LoadBalancerApiRequest::Healthmonitor(boxreq))
if matches!(*boxreq, cloud_types::LoadBalancerHealthmonitorApiRequest::List(_))
));
}

#[test]
fn matches_request_returns_true_for_list() {
let filter = LoadBalancerHealthmonitorList::default();
let filter = cloud_types::LoadBalancerHealthmonitorList::default();
let request = LoadBalancerHealthMonitorsBehaviour::request_from_filter(&filter);
assert!(LoadBalancerHealthMonitorsBehaviour::matches_request(
&request
Expand All @@ -104,17 +89,16 @@ mod tests {

#[test]
fn matches_request_returns_false_for_unrelated() {
let req = ApiRequest::LoadBalancer(LoadBalancerApiRequest::Listener(Box::new(
crate::cloud_worker::load_balancer::v2::LoadBalancerListenerApiRequest::List(
Box::default(),
),
)));
let req =
ApiRequest::LoadBalancer(cloud_types::LoadBalancerApiRequest::Listener(Box::new(
cloud_types::LoadBalancerListenerApiRequest::List(Box::default()),
)));
assert!(!LoadBalancerHealthMonitorsBehaviour::matches_request(&req));
}

#[test]
fn handle_set_filter_action_returns_filter() {
let filter = LoadBalancerHealthmonitorList::default();
let filter = cloud_types::LoadBalancerHealthmonitorList::default();
let action = Action::SetLoadBalancerHealthMonitorListFilters(filter);
let result = LoadBalancerHealthMonitorsBehaviour::handle_set_filter_action(&action);
assert!(result.is_some());
Expand Down
49 changes: 17 additions & 32 deletions openstack_tui/src/components/load_balancer/listeners.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,48 +13,33 @@
// SPDX-License-Identifier: Apache-2.0

use crate::action::Action;
use crate::cloud_worker::load_balancer::v2::{
LoadBalancerApiRequest, LoadBalancerListenerApiRequest, LoadBalancerListenerList,
};
use crate::cloud_worker::types::ApiRequest;
use crate::cloud_worker::types::{self as cloud_types, ApiRequest};
use crate::components::generic_resource_view::GenericResourceView;
use crate::components::resource_behaviour::ResourceBehaviour;
use crate::components::resource_behaviour::{GeneratedResourceBehaviour, ResourceBehaviour};
use crate::mode::Mode;

const VIEW_CONFIG_KEY: &str = "load-balancer.listener";

pub struct LoadBalancerListenersBehaviour;

impl ResourceBehaviour for LoadBalancerListenersBehaviour {
type Filter = LoadBalancerListenerList;
type Filter = cloud_types::LoadBalancerListenerList;

fn view_key() -> &'static str {
VIEW_CONFIG_KEY
super::generated::listener::Generated::view_key()
}
fn title() -> &'static str {
"LB Listeners"
super::generated::listener::Generated::title()
}
fn mode() -> Mode {
Mode::Resource(Self::view_key())
super::generated::listener::Generated::mode()
}
fn request_from_filter(filter: &Self::Filter) -> ApiRequest {
ApiRequest::from(LoadBalancerListenerApiRequest::List(Box::new(
filter.clone(),
)))
super::generated::listener::Generated::request_from_filter(filter)
}
fn matches_request(request: &ApiRequest) -> bool {
matches!(
request,
ApiRequest::LoadBalancer(LoadBalancerApiRequest::Listener(boxreq))
if matches!(**boxreq, LoadBalancerListenerApiRequest::List(_))
)
super::generated::listener::Generated::matches_request(request)
}
fn handle_set_filter_action(action: &Action) -> Option<Self::Filter> {
if let Action::SetLoadBalancerListenerListFilters(f) = action {
Some(f.clone())
} else {
None
}
super::generated::listener::Generated::handle_set_filter_action(action)
}
}

Expand All @@ -71,7 +56,7 @@ mod tests {
LoadBalancerListenersBehaviour::view_key(),
"load-balancer.listener"
);
assert_eq!(LoadBalancerListenersBehaviour::title(), "LB Listeners");
assert_eq!(LoadBalancerListenersBehaviour::title(), "Listeners");
assert_eq!(
LoadBalancerListenersBehaviour::mode(),
Mode::Resource(crate::mode::LB_LISTENER)
Expand All @@ -80,33 +65,33 @@ mod tests {

#[test]
fn request_from_filter_creates_list_request() {
let filter = LoadBalancerListenerList::default();
let filter = cloud_types::LoadBalancerListenerList::default();
let request = LoadBalancerListenersBehaviour::request_from_filter(&filter);
assert!(matches!(
request,
ApiRequest::LoadBalancer(LoadBalancerApiRequest::Listener(boxreq))
if matches!(*boxreq, LoadBalancerListenerApiRequest::List(_))
ApiRequest::LoadBalancer(cloud_types::LoadBalancerApiRequest::Listener(boxreq))
if matches!(*boxreq, cloud_types::LoadBalancerListenerApiRequest::List(_))
));
}

#[test]
fn matches_request_returns_true_for_list() {
let filter = LoadBalancerListenerList::default();
let filter = cloud_types::LoadBalancerListenerList::default();
let request = LoadBalancerListenersBehaviour::request_from_filter(&filter);
assert!(LoadBalancerListenersBehaviour::matches_request(&request));
}

#[test]
fn matches_request_returns_false_for_unrelated() {
let req = ApiRequest::LoadBalancer(LoadBalancerApiRequest::Pool(Box::new(
crate::cloud_worker::load_balancer::v2::LoadBalancerPoolApiRequest::List(Box::default()),
let req = ApiRequest::LoadBalancer(cloud_types::LoadBalancerApiRequest::Pool(Box::new(
cloud_types::LoadBalancerPoolApiRequest::List(Box::default()),
)));
assert!(!LoadBalancerListenersBehaviour::matches_request(&req));
}

#[test]
fn handle_set_filter_action_returns_filter() {
let filter = LoadBalancerListenerList::default();
let filter = cloud_types::LoadBalancerListenerList::default();
let action = Action::SetLoadBalancerListenerListFilters(filter);
let result = LoadBalancerListenersBehaviour::handle_set_filter_action(&action);
assert!(result.is_some());
Expand Down
Loading