From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id A6C9A1FF183 for ; Wed, 27 Aug 2025 16:49:06 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40CB61D734; Wed, 27 Aug 2025 16:49:08 +0200 (CEST) Message-ID: <0332d9c1-a1a3-4e9e-bb3f-5e15f3d31f26@proxmox.com> Date: Wed, 27 Aug 2025 16:48:28 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Beta To: Proxmox Datacenter Manager development discussion , Stefan Hanreich References: <20250827113427.199253-1-s.hanreich@proxmox.com> <20250827113427.199253-27-s.hanreich@proxmox.com> Content-Language: en-US From: Dominik Csapak In-Reply-To: <20250827113427.199253-27-s.hanreich@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1756306103121 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.022 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pdm-devel] [PATCH proxmox-datacenter-manager 10/16] ui: sdn: add remote tree component X-BeenThere: pdm-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Datacenter Manager development discussion Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" some comments inline On 8/27/25 1:34 PM, Stefan Hanreich wrote: > This component shows the current state of all EVPN zones across all > remotes. It shows which zones are configured on a remote and which > VNets it contains. It also shows which remote VNets get imported via > the 'Import Route Target' setting in the EVPN zone. While the ZoneTree > component shows the contents of an IP-VRF merged across all remotes, > the RemoteTree shows the contents of a specific zone on a specific > remote, including all imported VNets. > > Similar to the ZoneTree component, this component operates under the > assumption that ASNs are not reused across different remotes, unless > those zones are actually interconnected. For example: One zone imports > a specific ASN:VNI route target. If two zones with the same ASN:VNI > combination exist, but only one of them is connected to the zone, it > will still show the VNets of *both* zones as imported, since it merges > based on ASN:VNI. > > Signed-off-by: Stefan Hanreich > --- > ui/src/sdn/evpn/mod.rs | 3 + > ui/src/sdn/evpn/remote_tree.rs | 486 +++++++++++++++++++++++++++++++++ > 2 files changed, 489 insertions(+) > create mode 100644 ui/src/sdn/evpn/remote_tree.rs > > diff --git a/ui/src/sdn/evpn/mod.rs b/ui/src/sdn/evpn/mod.rs > index 2515354..c2958f0 100644 > --- a/ui/src/sdn/evpn/mod.rs > +++ b/ui/src/sdn/evpn/mod.rs > @@ -1,3 +1,6 @@ > +mod remote_tree; > +pub use remote_tree::RemoteTree; > + > #[derive(Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)] > pub struct EvpnRouteTarget { > asn: u32, > diff --git a/ui/src/sdn/evpn/remote_tree.rs b/ui/src/sdn/evpn/remote_tree.rs > new file mode 100644 > index 0000000..25dbbac > --- /dev/null > +++ b/ui/src/sdn/evpn/remote_tree.rs > @@ -0,0 +1,486 @@ > +use std::cmp::Ordering; > +use std::collections::HashSet; > +use std::rc::Rc; > +use std::str::FromStr; > + > +use anyhow::{format_err, Error}; > +use pwt::widget::{error_message, Column}; > +use yew::virtual_dom::{Key, VNode}; > +use yew::{Component, Context, Html, Properties}; > + > +use pdm_client::types::{ListController, ListVnet, ListZone, SdnObjectState}; > +use pwt::css; > +use pwt::props::{ContainerBuilder, ExtractPrimaryKey, WidgetBuilder}; > +use pwt::state::{Selection, SlabTree, TreeStore}; > +use pwt::tr; > +use pwt::widget::data_table::{ > + DataTable, DataTableColumn, DataTableHeader, DataTableRowRenderArgs, > +}; > +use pwt::widget::{Fa, Row}; > +use pwt_macros::widget; > + > +use crate::sdn::evpn::EvpnRouteTarget; > + > +#[widget(comp=RemoteTreeComponent)] > +#[derive(Clone, PartialEq, Properties, Default)] > +pub struct RemoteTree { > + zones: Rc>, > + vnets: Rc>, > + controllers: Rc>, > +} > + > +impl RemoteTree { > + pub fn new( > + zones: Rc>, > + vnets: Rc>, > + controllers: Rc>, > + ) -> Self { > + yew::props!(Self { > + zones, > + vnets, > + controllers, > + }) > + } > +} > + > +pub enum RemoteTreeMsg { > + SelectionChange, > +} > + > +#[derive(Clone, PartialEq, Debug)] > +struct RemoteData { > + id: String, > + asn: u32, > +} > + > +#[derive(Clone, PartialEq, Debug)] > +struct ZoneData { > + id: String, > + remote: String, > + route_target: EvpnRouteTarget, > + import_targets: HashSet, > + state: Option, > + controller_id: String, > +} > + > +#[derive(Clone, PartialEq, Debug)] > +struct VnetData { > + parent_remote: String, > + parent_zone: String, > + id: String, > + zone: String, > + remote: String, > + route_target: EvpnRouteTarget, > + imported: bool, > + external: bool, > + state: Option, > +} > + > +#[derive(Clone, PartialEq, Debug)] > +enum RemoteTreeEntry { > + Root, > + Remote(RemoteData), > + Zone(ZoneData), > + Vnet(VnetData), > +} > + > +impl ExtractPrimaryKey for RemoteTreeEntry { > + fn extract_key(&self) -> Key { > + match self { > + Self::Root => Key::from("root"), > + Self::Remote(remote) => Key::from(remote.id.clone()), > + Self::Zone(zone) => Key::from(format!("{}/{}", zone.remote, zone.id)), > + Self::Vnet(vnet) => Key::from(format!( > + "{}/{}/{}/{}/{}", > + vnet.remote, vnet.parent_remote, vnet.parent_zone, vnet.zone, vnet.id > + )), > + } > + } > +} > + > +impl RemoteTreeEntry { > + fn name(&self) -> Option { > + match self { > + RemoteTreeEntry::Root => None, > + RemoteTreeEntry::Remote(remote) => { > + Some(format!("{} (ASN: {})", &remote.id, remote.asn)) > + } > + RemoteTreeEntry::Zone(zone) => Some(zone.id.to_string()), > + RemoteTreeEntry::Vnet(vnet) => Some(vnet.id.to_string()), > + } > + } > + > + fn remote(&self) -> Option<&str> { > + match self { > + RemoteTreeEntry::Root => None, > + RemoteTreeEntry::Remote(remote) => Some(&remote.id), > + RemoteTreeEntry::Zone(zone) => Some(&zone.remote), > + RemoteTreeEntry::Vnet(vnet) => Some(&vnet.remote), > + } > + } > + > + fn l2vni(&self) -> Option { > + match self { > + RemoteTreeEntry::Vnet(vnet) => Some(vnet.route_target.vni), > + _ => None, > + } > + } > + > + fn l3vni(&self) -> Option { > + match self { > + RemoteTreeEntry::Zone(zone) => Some(zone.route_target.vni), > + _ => None, > + } > + } > + > + fn imported(&self) -> Option { > + match self { > + RemoteTreeEntry::Vnet(vnet) => Some(vnet.imported), > + _ => None, > + } > + } > +} > + > +fn zones_to_remote_view( > + controllers: &[ListController], > + zones: &[ListZone], > + vnets: &[ListVnet], > +) -> Result, Error> { > + let mut tree = SlabTree::new(); > + > + let mut root = tree.set_root(RemoteTreeEntry::Root); > + root.set_expanded(true); > + > + for zone in zones { > + let zone_data = &zone.zone; > + > + let zone_controller_id = zone_data.controller.as_ref().ok_or_else(|| { > + format_err!("EVPN zone {} has no controller defined!", zone_data.zone) > + })?; > + > + let controller = controllers > + .iter() > + .find(|controller| { > + controller.remote == zone.remote > + && zone_controller_id == &controller.controller.controller > + }) > + .ok_or_else(|| { > + format_err!("Could not find Controller for EVPN zone {}", zone_data.zone) > + })?; > + > + let route_target = EvpnRouteTarget { > + asn: controller.controller.asn.ok_or_else(|| { > + format_err!( > + "EVPN controller {} has no ASN defined!", > + controller.controller.controller > + ) > + })?, > + vni: zone.zone.vrf_vxlan.ok_or_else(|| { > + format_err!("EVPN Zone {} has no VXLAN ID defined!", zone_data.zone) > + })?, > + }; > + > + let import_targets = zone_data > + .rt_import > + .iter() > + .flat_map(|rt_import| rt_import.split(',').map(EvpnRouteTarget::from_str)) > + .collect::>()?; > + > + let remote_entry = root.children_mut().find(|remote_entry| { > + if let RemoteTreeEntry::Remote(remote) = remote_entry.record() { > + return remote.id == zone.remote; > + } > + > + false > + }); > + > + let zone_entry = RemoteTreeEntry::Zone(ZoneData { > + id: zone_data.zone.clone(), > + remote: zone.remote.clone(), > + route_target, > + import_targets, > + state: zone_data.state, > + controller_id: controller.controller.controller.clone(), > + }); > + > + if let Some(mut remote_entry) = remote_entry { > + remote_entry.append(zone_entry); > + } else { > + let mut new_remote_entry = root.append(RemoteTreeEntry::Remote(RemoteData { > + id: zone.remote.clone(), > + asn: route_target.asn, > + })); > + > + new_remote_entry.set_expanded(true); > + new_remote_entry.append(zone_entry); > + }; > + } > + > + for vnet in vnets { > + let vnet_data = &vnet.vnet; > + > + let vnet_zone_id = vnet_data > + .zone > + .as_ref() > + .ok_or_else(|| format_err!("VNet {} has no zone defined!", vnet_data.vnet))?; > + > + let Some(zone) = zones > + .iter() > + .find(|zone| { > + zone.remote == vnet.remote > + && vnet_zone_id == &zone.zone.zone > + }) else { > + // this VNet is not part of an EVPN zone, skip it > + continue; > + }; > + > + let zone_controller_id = zone.zone.controller.as_ref().ok_or_else(|| { > + format_err!("EVPN zone {} has no controller defined!", &zone.zone.zone) > + })?; > + > + let controller = controllers > + .iter() > + .find(|controller| { > + controller.remote == zone.remote > + && zone_controller_id == &controller.controller.controller > + }) > + .ok_or_else(|| { > + format_err!("Controller of EVPN zone {} does not exist", zone.zone.zone) > + })?; > + > + let controller_asn = controller.controller.asn.ok_or_else(|| { > + format_err!( > + "EVPN controller {} has no ASN defined!", > + controller.controller.controller > + ) > + })?; > + > + let zone_target = EvpnRouteTarget { > + asn: controller_asn, > + vni: zone > + .zone > + .vrf_vxlan > + .ok_or_else(|| format_err!("EVPN Zone {} has no VRF VNI", zone.zone.zone))?, > + }; > + > + let vnet_target = EvpnRouteTarget { > + asn: controller_asn, > + vni: vnet_data > + .tag > + .ok_or_else(|| format_err!("VNet {} has no VNI", vnet_data.vnet))?, > + }; > + > + for mut remote_entry in root.children_mut() { > + for mut zone_entry in remote_entry.children_mut() { > + if let RemoteTreeEntry::Zone(zone) = zone_entry.record() { > + let imported = if zone.route_target == zone_target { > + false > + } else if zone.import_targets.contains(&zone_target) > + || zone.import_targets.contains(&vnet_target) > + { > + true > + } else { > + continue; > + }; > + > + zone_entry.append(RemoteTreeEntry::Vnet(VnetData { > + id: vnet.vnet.vnet.clone(), > + remote: vnet.remote.clone(), > + zone: vnet.vnet.zone.clone().unwrap(), > + route_target: vnet_target, > + imported, > + external: zone.remote != vnet.remote, > + parent_remote: zone.remote.clone(), > + parent_zone: zone.id.clone(), > + state: vnet.vnet.state, > + })); > + } > + } > + } > + } > + > + Ok(tree) > +} > +pub struct RemoteTreeComponent { > + store: TreeStore, > + selection: Selection, > + error_msg: Option, > +} > + > +fn name_remote_sorter(a: &RemoteTreeEntry, b: &RemoteTreeEntry) -> Ordering { > + (a.name(), a.remote()).cmp(&(b.name(), b.remote())) > +} > + > +fn default_sorter(a: &RemoteTreeEntry, b: &RemoteTreeEntry) -> Ordering { > + (a.imported(), a.name(), a.remote(), a.l3vni(), a.l2vni()).cmp(&( > + b.imported(), > + b.name(), > + b.remote(), > + b.l3vni(), > + b.l2vni(), > + )) > +} > + > +impl RemoteTreeComponent { > + fn columns(store: TreeStore) -> Rc>> { > + Rc::new(vec![ > + DataTableColumn::new(tr!("Name")) > + .tree_column(store) > + .sorter(name_remote_sorter) > + .render(|item: &RemoteTreeEntry| { > + let name = item.name(); > + > + name.map(|name| { > + let mut row = Row::new().class(css::AlignItems::Baseline).gap(2); > + > + row = match item { > + RemoteTreeEntry::Remote(_) => row.with_child(Fa::new("server")), > + RemoteTreeEntry::Zone(_) => row.with_child(Fa::new("th")), > + _ => row, > + }; > + > + row = row.with_child(name); > + > + Html::from(row) > + }) > + .unwrap_or_default() > + }) > + .flex(2) > + .into(), > + DataTableColumn::new(tr!("Remote")) > + .get_property(|item: &RemoteTreeEntry| match item { > + RemoteTreeEntry::Zone(zone) => zone.remote.as_str(), > + RemoteTreeEntry::Vnet(vnet) => vnet.remote.as_str(), > + _ => "", > + }) > + .flex(1) > + .into(), > + DataTableColumn::new(tr!("L3VNI")) > + .render(|item: &RemoteTreeEntry| item.l3vni().map(VNode::from).unwrap_or_default()) > + .sorter(|a: &RemoteTreeEntry, b: &RemoteTreeEntry| a.l3vni().cmp(&b.l3vni())) > + .flex(1) > + .into(), > + DataTableColumn::new(tr!("L2VNI")) > + .render(|item: &RemoteTreeEntry| item.l2vni().map(VNode::from).unwrap_or_default()) > + .sorter(|a: &RemoteTreeEntry, b: &RemoteTreeEntry| a.l2vni().cmp(&b.l2vni())) > + .flex(1) > + .into(), > + DataTableColumn::new(tr!("External")) > + .get_property_owned(|item: &RemoteTreeEntry| match item { > + RemoteTreeEntry::Vnet(vnet) if vnet.external => tr!("Yes"), > + RemoteTreeEntry::Vnet(vnet) if !vnet.external => tr!("No"), > + _ => String::new(), > + }) > + .flex(1) > + .into(), > + DataTableColumn::new(tr!("Imported")) > + .get_property_owned(|item: &RemoteTreeEntry| match item { > + RemoteTreeEntry::Vnet(vnet) if vnet.imported => tr!("Yes"), > + RemoteTreeEntry::Vnet(vnet) if !vnet.imported => tr!("No"), > + _ => String::new(), > + }) > + .flex(1) > + .into(), > + ]) > + } > +} > + > +impl Component for RemoteTreeComponent { > + type Properties = RemoteTree; > + type Message = RemoteTreeMsg; > + > + fn create(ctx: &Context) -> Self { > + let store = TreeStore::new().view_root(false); > + > + let selection = > + Selection::new().on_select(ctx.link().callback(|_| Self::Message::SelectionChange)); i don't see any `update` method here, so the message does not do anything besides redrawing. is this maybe a leftover ? > + > + let mut error_msg = None; > + > + match zones_to_remote_view( > + &ctx.props().controllers, > + &ctx.props().zones, > + &ctx.props().vnets, > + ) { > + Ok(data) => { > + store.set_data(data); > + store.set_sorter(default_sorter); > + } > + Err(error) => { > + error_msg = Some(error.to_string()); > + } > + } > + > + Self { > + store, > + selection, > + error_msg, > + } > + } > + > + fn view(&self, _ctx: &Context) -> Html { > + let columns = Self::columns(self.store.clone()); usually what we try to do is that we save the columns in the component and only update it when necessary, e.g. when new data comes in it shouldn't matter much here, but it would still be faster to only create the columns once > + > + let table = DataTable::new(columns, self.store.clone()) > + .striped(false) > + .selection(self.selection.clone()) > + .row_render_callback(|args: &mut DataTableRowRenderArgs| { > + match args.record() { > + RemoteTreeEntry::Vnet(vnet) if vnet.external || vnet.imported => { > + args.add_class("pwt-opacity-50"); > + } > + RemoteTreeEntry::Remote(_) => args.add_class("pwt-bg-color-surface"), > + _ => (), > + }; > + }) > + .class(css::FlexFit); > + > + let mut column = Column::new().class(pwt::css::FlexFit).with_child(table); > + > + if let Some(msg) = &self.error_msg { > + column.add_child(error_message(msg.as_ref())); > + } > + > + column.into() > + } > + > + fn changed(&mut self, ctx: &Context, old_props: &Self::Properties) -> bool { > + if !Rc::ptr_eq(&ctx.props().zones, &old_props.zones) > + || !Rc::ptr_eq(&ctx.props().vnets, &old_props.vnets) > + || !Rc::ptr_eq(&ctx.props().controllers, &old_props.controllers) > + { > + match zones_to_remote_view( > + &ctx.props().controllers, > + &ctx.props().zones, > + &ctx.props().vnets, > + ) { > + Ok(data) => { > + let expanded_state = self > + .store > + .read() > + .root() > + .map(|root| root.extract_expanded_state()); > + > + self.store.set_data(data); > + > + if let Some(expanded_state) = expanded_state { > + if let Some(mut root) = self.store.write().root_mut() { > + root.apply_expanded_state(&expanded_state); > + } > + } sorry i may have you sent you on a wrong path with extract_expanded_state et.al. you can simply do: self.store.write().update_root_tree(data); this takes care of getting/setting the expanded state for you already > + > + self.store.set_sorter(name_remote_sorter); > + > + self.error_msg = None; > + } > + Err(error) => { > + self.error_msg = Some(error.to_string()); > + } > + } > + > + return true; > + } > + > + false > + } > +} _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel