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 CEE7D1FF189 for ; Thu, 4 Sep 2025 10:28:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 77D241F74E; Thu, 4 Sep 2025 10:28:19 +0200 (CEST) From: Stefan Hanreich To: pdm-devel@lists.proxmox.com Date: Thu, 4 Sep 2025 10:18:53 +0200 Message-ID: <20250904081900.12655-29-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250904081900.12655-1-s.hanreich@proxmox.com> References: <20250904081900.12655-1-s.hanreich@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.186 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 KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v4 13/15] ui: sdn: add component for creatin evpn zones 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pdm-devel-bounces@lists.proxmox.com Sender: "pdm-devel" Adds an edit window for creating a new zone. This windows shows a form containing all fields required to create new zone via the create_zone API endpoint and will initially be used by the EVPN panel. Signed-off-by: Stefan Hanreich --- ui/src/sdn/evpn/add_zone.rs | 328 ++++++++++++++++++++++++++++++++++++ ui/src/sdn/evpn/mod.rs | 3 + 2 files changed, 331 insertions(+) create mode 100644 ui/src/sdn/evpn/add_zone.rs diff --git a/ui/src/sdn/evpn/add_zone.rs b/ui/src/sdn/evpn/add_zone.rs new file mode 100644 index 0000000..ec4ae47 --- /dev/null +++ b/ui/src/sdn/evpn/add_zone.rs @@ -0,0 +1,328 @@ +use std::{collections::HashSet, rc::Rc}; + +use anyhow::{bail, format_err, Error}; +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use yew::{virtual_dom::Key, Callback, Component, Html, Properties}; + +use pdm_client::types::{CreateZoneParams, ListController, SDN_ID_SCHEMA}; +use proxmox_yew_comp::{EditWindow, SchemaValidation}; +use pwt::{ + css, + props::{ + ContainerBuilder, CssBorderBuilder, CssPaddingBuilder, ExtractPrimaryKey, FieldBuilder, + WidgetBuilder, WidgetStyleBuilder, + }, + state::{Selection, Store}, + tr, + widget::{ + data_table::{DataTable, DataTableColumn, DataTableHeader, MultiSelectMode}, + error_message, + form::{ + Field, FormContext, ManagedField, ManagedFieldContext, ManagedFieldMaster, + ManagedFieldState, Number, + }, + Column, Container, GridPicker, InputPanel, + }, +}; +use pwt_macros::widget; + +use crate::pdm_client; + +#[widget(comp=AddZoneWindowComp)] +#[derive(Properties, PartialEq, Clone)] +pub struct AddZoneWindow { + pub controllers: Rc>, + pub on_success: Option>, + pub on_close: Option>, +} + +impl AddZoneWindow { + pub fn new( + controllers: Rc>, + on_success: impl Into>>, + on_close: impl Into>>, + ) -> Self { + yew::props!(Self { + controllers, + on_success: on_success.into(), + on_close: on_close.into(), + }) + } +} + +pub struct AddZoneWindowComp {} + +impl Component for AddZoneWindowComp { + type Message = (); + + type Properties = AddZoneWindow; + + fn create(_ctx: &yew::Context) -> Self { + Self {} + } + + fn view(&self, ctx: &yew::Context) -> Html { + let props = ctx.props().clone(); + + EditWindow::new(tr!("Add Zone")) + .renderer(move |form_ctx: &FormContext| { + InputPanel::new() + .class(css::FlexFit) + .padding(4) + .width("auto") + .with_field( + tr!("Zone ID"), + Field::new() + .name("zone") + .schema(&SDN_ID_SCHEMA) + .required(true), + ) + .with_field( + tr!("VRF VXLAN VNI"), + Number::::new() + .min(1) + .max(16777215) + .name("vrf-vxlan") + .required(true), + ) + .with_custom_child( + Column::new() + .with_child( + ControllerTable::new(props.controllers.clone()).name("remotes"), + ) + .with_optional_child( + form_ctx + .read() + .get_field_valid("remotes") + .and_then(|result| result.err().as_deref().map(error_message)), + ), + ) + .into() + }) + .on_close(ctx.props().on_close.clone()) + .on_submit({ + let on_success = props.on_success.clone(); + + move |form_ctx: FormContext| { + let on_success = on_success.clone(); + + async move { + let client = pdm_client(); + + let params: CreateZoneParams = + serde_json::from_value(form_ctx.get_submit_data()).unwrap(); + + let upid = client.pve_sdn_create_zone(params).await?; + + if let Some(cb) = on_success { + cb.emit(upid) + } + + Ok(()) + } + } + }) + .into() + } +} + +#[widget(comp=ManagedFieldMaster, @input)] +#[derive(Clone, PartialEq, Properties)] +struct ControllerTable { + controllers: Rc>, +} + +impl ControllerTable { + pub fn new(controllers: Rc>) -> Self { + yew::props!(Self { controllers }) + } +} + +#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)] +struct ControllerTableEntry { + remote: String, + controller: String, + #[serde(skip)] + asn: u32, +} + +impl ExtractPrimaryKey for ControllerTableEntry { + fn extract_key(&self) -> Key { + Key::from(format!("{}/{}", self.remote, self.controller)) + } +} + +struct ControllerTableComponent { + store: Store, + selection: Selection, + columns: Rc>>, + error_msg: Option, +} + +enum ControllerTableMsg { + SelectionChange, +} + +#[derive(PartialEq)] +struct ValidationContext { + controller_count: usize, +} + +impl ManagedField for ControllerTableComponent { + type Properties = ControllerTable; + type Message = ControllerTableMsg; + type ValidateClosure = ValidationContext; + + fn validation_args(props: &Self::Properties) -> Self::ValidateClosure { + ValidationContext { + controller_count: props.controllers.len(), + } + } + + fn validator(props: &Self::ValidateClosure, value: &Value) -> Result { + let selected_entries: Vec = serde_json::from_value(value.clone())?; + + if selected_entries.is_empty() { + if props.controller_count == 0 { + bail!(tr!( + "at least one remote needs to have an EVPN controller configured" + )); + } else { + bail!(tr!("at least one EVPN controller needs to be selected")); + } + } + + let mut unique = HashSet::new(); + + if !selected_entries + .iter() + .all(|entry| unique.insert(entry.remote.as_str())) + { + bail!(tr!("can only create the zone once per remote!")); + } + + Ok(value.clone()) + } + + fn setup(_props: &Self::Properties) -> ManagedFieldState { + ManagedFieldState { + value: Value::Null, + valid: Ok(()), + default: Value::Array(Vec::new()), + radio_group: false, + unique: false, + } + } + + fn create(ctx: &ManagedFieldContext) -> Self { + let link = ctx.link().clone(); + + let selection = Selection::new().multiselect(true).on_select(move |_| { + link.send_message(Self::Message::SelectionChange); + }); + + let store = Store::new(); + + let columns = Self::columns(); + + let controllers: Result, Error> = ctx + .props() + .controllers + .iter() + .map(|controller| { + Ok(ControllerTableEntry { + remote: controller.remote.clone(), + controller: controller.controller.controller.clone(), + asn: controller.controller.asn.ok_or_else(|| { + format_err!(tr!( + "EVPN controller {} has no ASN", + controller.controller.controller + )) + })?, + }) + }) + .collect(); + + let mut error_msg = None; + + match controllers { + Ok(controllers) => { + store.set_data(controllers); + } + Err(error) => error_msg = Some(error.to_string()), + }; + + Self { + store, + selection, + columns, + error_msg, + } + } + + fn update(&mut self, ctx: &ManagedFieldContext, msg: Self::Message) -> bool { + match msg { + Self::Message::SelectionChange => { + let read_guard = self.store.read(); + + ctx.link().update_value( + serde_json::to_value( + self.selection + .selected_keys() + .iter() + // todo: handle miss? + .filter_map(|key| read_guard.lookup_record(key)) + .collect::>(), + ) + .unwrap(), + ); + } + } + + false + } + + fn view(&self, _ctx: &ManagedFieldContext) -> Html { + let table = DataTable::new(self.columns.clone(), self.store.clone()) + .multiselect_mode(MultiSelectMode::Simple) + .border(true) + .class(css::FlexFit); + + let mut container = + Container::new().with_child(GridPicker::new(table).selection(self.selection.clone())); + + if let Some(error_msg) = &self.error_msg { + container.add_child(error_message(error_msg)); + } + + container.into() + } +} + +impl ControllerTableComponent { + fn columns() -> Rc>> { + Rc::new(vec![ + DataTableColumn::selection_indicator().into(), + DataTableColumn::new(tr!("Remote")) + .flex(1) + .render(move |item: &ControllerTableEntry| item.remote.as_str().into()) + .sorter(|a: &ControllerTableEntry, b: &ControllerTableEntry| { + a.remote.cmp(&b.remote) + }) + .into(), + DataTableColumn::new(tr!("Controller")) + .flex(1) + .render(move |item: &ControllerTableEntry| item.controller.as_str().into()) + .sorter(|a: &ControllerTableEntry, b: &ControllerTableEntry| { + a.controller.cmp(&b.controller) + }) + .into(), + DataTableColumn::new(tr!("ASN")) + .flex(1) + .render(move |item: &ControllerTableEntry| item.asn.into()) + .sorter(|a: &ControllerTableEntry, b: &ControllerTableEntry| a.asn.cmp(&b.asn)) + .into(), + ]) + } +} diff --git a/ui/src/sdn/evpn/mod.rs b/ui/src/sdn/evpn/mod.rs index 9fda8a1..adcf272 100644 --- a/ui/src/sdn/evpn/mod.rs +++ b/ui/src/sdn/evpn/mod.rs @@ -7,6 +7,9 @@ pub use vrf_tree::VrfTree; mod add_vnet; pub use add_vnet::AddVnetWindow; +mod add_zone; +pub use add_zone::AddZoneWindow; + #[derive(Clone, Copy, Debug, PartialEq, Eq, Ord, PartialOrd, Hash)] pub struct EvpnRouteTarget { asn: u32, -- 2.47.2 _______________________________________________ pdm-devel mailing list pdm-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pdm-devel