From: Stefan Hanreich <s.hanreich@proxmox.com>
To: pdm-devel@lists.proxmox.com
Subject: [pdm-devel] [PATCH proxmox-datacenter-manager v2 12/15] ui: sdn: add component for creating evpn vnets
Date: Fri, 29 Aug 2025 16:53:08 +0200 [thread overview]
Message-ID: <20250829145313.329114-28-s.hanreich@proxmox.com> (raw)
In-Reply-To: <20250829145313.329114-1-s.hanreich@proxmox.com>
This windows shows a form containing all fields required to create new
VNet via the create_vnet API endpoint and will initially be used by
the EVPN panel.
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
lib/pdm-client/src/lib.rs | 2 +-
ui/src/sdn/evpn/add_vnet.rs | 313 ++++++++++++++++++++++++++++++++++++
ui/src/sdn/evpn/mod.rs | 3 +
3 files changed, 317 insertions(+), 1 deletion(-)
create mode 100644 ui/src/sdn/evpn/add_vnet.rs
diff --git a/lib/pdm-client/src/lib.rs b/lib/pdm-client/src/lib.rs
index 9314559..4573271 100644
--- a/lib/pdm-client/src/lib.rs
+++ b/lib/pdm-client/src/lib.rs
@@ -60,7 +60,7 @@ pub mod types {
pub use pve_api_types::PveUpid;
pub use pdm_api_types::sdn::{
- CreateVnetParams, CreateZoneParams, ListController, ListVnet, ListZone,
+ CreateVnetParams, CreateZoneParams, ListController, ListVnet, ListZone, SDN_ID_SCHEMA,
};
pub use pve_api_types::{ListControllersType, ListZonesType, SdnObjectState};
}
diff --git a/ui/src/sdn/evpn/add_vnet.rs b/ui/src/sdn/evpn/add_vnet.rs
new file mode 100644
index 0000000..89b2deb
--- /dev/null
+++ b/ui/src/sdn/evpn/add_vnet.rs
@@ -0,0 +1,313 @@
+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::{CreateVnetParams, ListZone, 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=AddVnetWindowComp)]
+#[derive(Properties, PartialEq, Clone)]
+pub struct AddVnetWindow {
+ pub zones: Rc<Vec<ListZone>>,
+ pub on_success: Option<Callback<String>>,
+ pub on_close: Option<Callback<()>>,
+}
+
+impl AddVnetWindow {
+ pub fn new(
+ zones: Rc<Vec<ListZone>>,
+ on_success: impl Into<Option<Callback<String>>>,
+ on_close: impl Into<Option<Callback<()>>>,
+ ) -> Self {
+ yew::props!(Self {
+ zones,
+ on_success: on_success.into(),
+ on_close: on_close.into(),
+ })
+ }
+}
+
+pub struct AddVnetWindowComp {}
+
+impl Component for AddVnetWindowComp {
+ type Message = ();
+
+ type Properties = AddVnetWindow;
+
+ fn create(_ctx: &yew::Context<Self>) -> Self {
+ Self {}
+ }
+
+ fn view(&self, ctx: &yew::Context<Self>) -> Html {
+ let props = ctx.props().clone();
+
+ EditWindow::new(tr!("Add VNet"))
+ .renderer(move |form_ctx: &FormContext| {
+ InputPanel::new()
+ .class(css::FlexFit)
+ .padding(4)
+ .width("auto")
+ .with_field(
+ tr!("VNet ID"),
+ Field::new()
+ .name("vnet")
+ .schema(&SDN_ID_SCHEMA)
+ .required(true),
+ )
+ .with_field(
+ tr!("VXLAN VNI"),
+ Number::<u32>::new()
+ .min(1)
+ .max(16777215)
+ .name("tag")
+ .required(true),
+ )
+ .with_custom_child(
+ Column::new()
+ .with_child(ZoneTable::new(props.zones.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: CreateVnetParams =
+ serde_json::from_value(form_ctx.get_submit_data()).unwrap();
+
+ let upid = client.pve_sdn_create_vnet(params).await?;
+
+ if let Some(cb) = on_success {
+ cb.emit(upid)
+ }
+
+ Ok(())
+ }
+ }
+ })
+ .into()
+ }
+}
+
+#[widget(comp=ManagedFieldMaster<ZoneTableComponent>, @input)]
+#[derive(Clone, PartialEq, Properties)]
+pub struct ZoneTable {
+ zones: Rc<Vec<ListZone>>,
+}
+
+impl ZoneTable {
+ pub fn new(zones: Rc<Vec<ListZone>>) -> Self {
+ yew::props!(Self { zones })
+ }
+}
+
+#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
+pub struct ZoneTableEntry {
+ remote: String,
+ zone: String,
+ vni: u32,
+}
+
+impl ExtractPrimaryKey for ZoneTableEntry {
+ fn extract_key(&self) -> Key {
+ Key::from(format!("{}/{}", self.remote, self.zone))
+ }
+}
+
+pub struct ZoneTableComponent {
+ store: Store<ZoneTableEntry>,
+ selection: Selection,
+ columns: Rc<Vec<DataTableHeader<ZoneTableEntry>>>,
+ error_msg: Option<String>,
+}
+
+pub enum ZoneTableMsg {
+ SelectionChange,
+}
+
+#[derive(PartialEq)]
+pub struct ValidationContext {
+ zone_count: usize,
+}
+
+impl ManagedField for ZoneTableComponent {
+ type Properties = ZoneTable;
+ type Message = ZoneTableMsg;
+ type ValidateClosure = ValidationContext;
+
+ fn validation_args(props: &Self::Properties) -> Self::ValidateClosure {
+ ValidationContext {
+ zone_count: props.zones.len(),
+ }
+ }
+
+ fn validator(props: &Self::ValidateClosure, value: &Value) -> Result<Value, Error> {
+ let selected_entries: Vec<ZoneTableEntry> = serde_json::from_value(value.clone())?;
+
+ if selected_entries.is_empty() {
+ if props.zone_count == 0 {
+ bail!(tr!("At least one zone needs to be configured on a remote"));
+ } else {
+ bail!(tr!("At least one zone 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 VNet once per remote!"))
+ }
+
+ Ok(value.clone())
+ }
+
+ fn setup(_props: &Self::Properties) -> ManagedFieldState {
+ ManagedFieldState {
+ value: Value::Array(Vec::new()),
+ valid: Ok(()),
+ default: Value::Array(Vec::new()),
+ radio_group: false,
+ unique: false,
+ }
+ }
+
+ fn create(ctx: &ManagedFieldContext<Self>) -> Self {
+ let columns = Self::columns();
+ 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 zones: Result<Vec<ZoneTableEntry>, Error> =
+ ctx.props()
+ .zones
+ .iter()
+ .map(|zone| {
+ Ok(ZoneTableEntry {
+ remote: zone.remote.clone(),
+ zone: zone.zone.zone.clone(),
+ vni: zone.zone.vrf_vxlan.ok_or_else(|| {
+ format_err!(tr!("EVPN Zone has no VRF VNI configured!"))
+ })?,
+ })
+ })
+ .collect();
+
+ let mut error_msg = None;
+
+ match zones {
+ Ok(zones) => {
+ store.set_data(zones);
+ }
+ Err(error) => error_msg = Some(error.to_string()),
+ };
+
+ Self {
+ store,
+ selection,
+ columns,
+ error_msg,
+ }
+ }
+
+ fn update(&mut self, ctx: &ManagedFieldContext<Self>, 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()
+ .filter_map(|key| read_guard.lookup_record(key))
+ .collect::<Vec<_>>(),
+ )
+ .unwrap(),
+ );
+ }
+ }
+
+ false
+ }
+
+ fn view(&self, _ctx: &ManagedFieldContext<Self>) -> 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 ZoneTableComponent {
+ fn columns() -> Rc<Vec<DataTableHeader<ZoneTableEntry>>> {
+ Rc::new(vec![
+ DataTableColumn::selection_indicator().into(),
+ DataTableColumn::new(tr!("Remote"))
+ .flex(1)
+ .render(move |item: &ZoneTableEntry| item.remote.as_str().into())
+ .sorter(|a: &ZoneTableEntry, b: &ZoneTableEntry| a.remote.cmp(&b.remote))
+ .into(),
+ DataTableColumn::new(tr!("Zone"))
+ .flex(1)
+ .render(move |item: &ZoneTableEntry| item.zone.as_str().into())
+ .sorter(|a: &ZoneTableEntry, b: &ZoneTableEntry| a.zone.cmp(&b.zone))
+ .into(),
+ DataTableColumn::new(tr!("VRF VNI"))
+ .flex(1)
+ .render(move |item: &ZoneTableEntry| item.vni.to_string().into())
+ .sorter(|a: &ZoneTableEntry, b: &ZoneTableEntry| a.vni.cmp(&b.vni))
+ .into(),
+ ])
+ }
+}
diff --git a/ui/src/sdn/evpn/mod.rs b/ui/src/sdn/evpn/mod.rs
index da020a9..9fda8a1 100644
--- a/ui/src/sdn/evpn/mod.rs
+++ b/ui/src/sdn/evpn/mod.rs
@@ -4,6 +4,9 @@ pub use remote_tree::RemoteTree;
mod vrf_tree;
pub use vrf_tree::VrfTree;
+mod add_vnet;
+pub use add_vnet::AddVnetWindow;
+
#[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
next prev parent reply other threads:[~2025-08-29 15:01 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-29 14:52 [pdm-devel] [PATCH network/proxmox{, -backup, -api-types, -datacenter-manager} v2 00/30] Add initial SDN / EVPN integration Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox v2 1/2] schema: use i64 for minimum / maximum / default integer values Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox v2 2/2] pbs-api-types: fix values for integer schemas Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-backup v2 1/1] api: change integer schema parameters to i64 Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 1/6] sdn: api: return null for rollback / lock endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 2/6] controllers: fix maximum value for ASN Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 3/6] api: add state standard option Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 4/6] api: controllers: update schema of endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 5/6] api: vnets: " Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH pve-network v2 6/6] api: zones: " Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 1/6] sdn: add list/create zone endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 2/6] sdn: add list/create vnet endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 3/6] sdn: add list/create controller endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 4/6] sdn: add sdn configuration locking endpoints Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 5/6] tasks: add helper for querying successfully finished tasks Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-api-types v2 6/6] sdn: add helpers for pending values Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 01/15] server: add locked sdn client helpers Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 02/15] ui: pve: sdn: add descriptions for sdn tasks Stefan Hanreich
2025-08-29 14:52 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 03/15] api: sdn: add list_zones endpoint Stefan Hanreich
2025-09-01 13:36 ` Dominik Csapak
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 04/15] api: sdn: add create_zone endpoint Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 05/15] api: sdn: add list_vnets endpoint Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 06/15] api: sdn: add create_vnet endpoint Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 07/15] api: sdn: add list_controllers endpoint Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 08/15] ui: sdn: add EvpnRouteTarget type Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 09/15] ui: sdn: add vnet icon Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 10/15] ui: sdn: add view for showing evpn zones Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 11/15] ui: sdn: add view for showing ip vrfs Stefan Hanreich
2025-08-29 14:53 ` Stefan Hanreich [this message]
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 13/15] ui: sdn: add component for creatin evpn zones Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 14/15] ui: sdn: add evpn overview panel Stefan Hanreich
2025-09-01 13:44 ` Dominik Csapak
2025-09-01 15:02 ` Stefan Hanreich
2025-09-02 6:34 ` Dominik Csapak
2025-09-02 9:30 ` Dominik Csapak
2025-09-02 12:22 ` Stefan Hanreich
2025-08-29 14:53 ` [pdm-devel] [PATCH proxmox-datacenter-manager v2 15/15] ui: sdn: add evpn panel to main menu Stefan Hanreich
2025-09-02 11:10 ` [pdm-devel] [PATCH network/proxmox{, -backup, -api-types, -datacenter-manager} v2 00/30] Add initial SDN / EVPN integration Dominik Csapak
2025-09-02 12:03 ` Stefan Hanreich
2025-09-02 12:29 ` Dominik Csapak
2025-09-02 12:54 ` Stefan Hanreich
2025-09-02 14:10 ` [pdm-devel] superseded: " Stefan Hanreich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250829145313.329114-28-s.hanreich@proxmox.com \
--to=s.hanreich@proxmox.com \
--cc=pdm-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.