[PATCH pve-network 1/1] sdn: api: route maps: fix json schema for match, set and exit-action

[PATCH pve-network 1/1] sdn: api: route maps: fix json schema for match, set and exit-action

[Stefan Hanreich]

Add missing format_description to the value properties in match and
set property strings. Their exact format depends on the key set in the
property string.

The 2 keys that can have a value in the exit-action both refer to the
order number of a route map entry, so change the type to the
pre-defined route map order type. Order is a u16, so fix the maximum
value to match the maximum accepted value by FRR. This is wrong in
the JSON schema, but is correct in the section config type.

Reported-by: Fiona Ebner <f.ebner@proxmox.com>
Signed-off-by: Stefan Hanreich <s.hanreich@proxmox.com>
---
Not sure about the format description for match and set. Maybe we
could do something like

  `<route-type:ead|macip|multicast|es|prefix>|<vni:1-16777215>|..`

to indicate the exact format of value, depending on the key?

 src/PVE/Network/SDN/RouteMaps.pm | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/PVE/Network/SDN/RouteMaps.pm b/src/PVE/Network/SDN/RouteMaps.pm
index 5560f180..b2bf9eda 100644
--- a/src/PVE/Network/SDN/RouteMaps.pm
+++ b/src/PVE/Network/SDN/RouteMaps.pm
@@ -48,7 +48,8 @@ our $ROUTE_MAP_MATCH_FORMAT = {
     value => {
         type => 'string',
         optional => 1,
-        description => 'value that should be matched on',
+        description => 'Value that the field <key> should be matched on.',
+        format_description => '<key-dependent>',
     },
 };
 
@@ -67,7 +68,7 @@ PVE::JSONSchema::register_standard_option(
         description => 'The index of this route map entry',
         type => 'integer',
         minimum => 0,
-        maximum => 2**32 - 1,
+        maximum => 65535,
     },
 );
 
@@ -164,7 +165,8 @@ sub route_map_properties {
                     value => {
                         type => 'string',
                         optional => 1,
-                        description => 'value that should be set to',
+                        description => 'Value that the field <key> should be set to.',
+                        format_description => '<key-dependent>',
                     },
                 },
             },
@@ -187,11 +189,7 @@ sub route_map_properties {
                         'on-match-goto', 'on-match-next', 'continue',
                     ],
                 },
-                value => {
-                    type => 'string',
-                    optional => 1,
-                    description => 'type of exit action',
-                },
+                value => get_standard_option('pve-sdn-route-map-order'),
             },
             optional => 1,
         },
-- 
2.47.3

applied: [PATCH pve-network 1/1] sdn: api: route maps: fix json schema for match, set and exit-action

[Thomas Lamprecht]

On Tue, 12 May 2026 15:43:34 +0200, Stefan Hanreich wrote:
> Add missing format_description to the value properties in match and
> set property strings. Their exact format depends on the key set in the
> property string.
> 
> The 2 keys that can have a value in the exit-action both refer to the
> order number of a route map entry, so change the type to the
> pre-defined route map order type. Order is a u16, so fix the maximum
> value to match the maximum accepted value by FRR. This is wrong in
> the JSON schema, but is correct in the section config type.
> 
> [...]

Applied, thanks!

[1/1] sdn: api: route maps: fix json schema for match, set and exit-action
      commit: ba48fb02862e819552631c54b824541396a8dba6

Re: [PATCH pve-network 1/1] sdn: api: route maps: fix json schema for match, set and exit-action

[Fiona Ebner]

Am 12.05.26 um 3:41 PM schrieb Stefan Hanreich:
> The 2 keys that can have a value in the exit-action both refer to the
> order number of a route map entry, so change the type to the
> pre-defined route map order type.

---snip 8<---

> @@ -187,11 +189,7 @@ sub route_map_properties {
>                          'on-match-goto', 'on-match-next', 'continue',
>                      ],
>                  },
> -                value => {
> -                    type => 'string',
> -                    optional => 1,
> -                    description => 'type of exit action',
> -                },
> +                value => get_standard_option('pve-sdn-route-map-order'),

Don't we need an ', { optional => 1 }' here?

>              },
>              optional => 1,
>          },

Re: [PATCH pve-network 1/1] sdn: api: route maps: fix json schema for match, set and exit-action

[Stefan Hanreich]

On 5/13/26 10:13 AM, Fiona Ebner wrote:
> Am 12.05.26 um 3:41 PM schrieb Stefan Hanreich:
>> The 2 keys that can have a value in the exit-action both refer to the
>> order number of a route map entry, so change the type to the
>> pre-defined route map order type.
> 
> ---snip 8<---
> 
>> @@ -187,11 +189,7 @@ sub route_map_properties {
>>                          'on-match-goto', 'on-match-next', 'continue',
>>                      ],
>>                  },
>> -                value => {
>> -                    type => 'string',
>> -                    optional => 1,
>> -                    description => 'type of exit action',
>> -                },
>> +                value => get_standard_option('pve-sdn-route-map-order'),
> 
> Don't we need an ', { optional => 1 }' here?

yes, indeed!

https://lore.proxmox.com/pve-devel/09f5cf1a-16ec-49d4-a4de-2b412f385988@proxmox.com/T/#t