Add IS-IS api-types and add it to the protocol enum. Also make 'isisd' a frr daemon managed by pve (This means we can enable and disable it).
Signed-off-by: Gabriel Goller <[email protected]> --- src/PVE/Network/SDN/Fabrics.pm | 47 +++++++++++++++++++++++++++++----- src/PVE/Network/SDN/Frr.pm | 1 + 2 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/PVE/Network/SDN/Fabrics.pm b/src/PVE/Network/SDN/Fabrics.pm index 3ca362a02660..f218637e0971 100644 --- a/src/PVE/Network/SDN/Fabrics.pm +++ b/src/PVE/Network/SDN/Fabrics.pm @@ -46,7 +46,7 @@ PVE::JSONSchema::register_standard_option( { description => "Type of configuration entry in an SDN Fabric section config", type => 'string', - enum => ['openfabric', 'ospf'], + enum => ['openfabric', 'ospf', 'isis'], }, ); @@ -169,6 +169,41 @@ sub node_properties { description => 'OpenFabric network interface', optional => 1, }, + { + type => 'array', + 'instance-types' => ['isis'], + items => { + type => 'string', + format => { + name => { + type => 'string', + format => 'pve-iface', + description => 'Name of the network interface', + }, + hello_multiplier => { + type => 'integer', + description => 'The hello_multiplier property of the interface', + optional => 1, + minimum => 2, + maximum => 100, + }, + ip => { + type => 'string', + format => 'CIDRv4', + description => 'IPv4 address for this node', + optional => 1, + }, + ip6 => { + type => 'string', + format => 'CIDRv6', + description => 'IPv6 address for this node', + optional => 1, + }, + }, + }, + description => 'IS-IS network interface', + optional => 1, + }, { type => 'array', 'instance-types' => ['ospf'], @@ -232,8 +267,8 @@ sub fabric_properties { hello_interval => { type => 'number', 'type-property' => 'protocol', - 'instance-types' => ['openfabric'], - description => 'The hello_interval property for Openfabric', + 'instance-types' => ['openfabric', 'isis'], + description => 'The hello_interval property for Openfabric and IS-IS', optional => 1, minimum => 1, maximum => 600, @@ -241,8 +276,8 @@ sub fabric_properties { csnp_interval => { type => 'number', 'type-property' => 'protocol', - 'instance-types' => ['openfabric'], - description => 'The csnp_interval property for Openfabric', + 'instance-types' => ['openfabric', 'isis'], + description => 'The csnp_interval property for Openfabric and IS-IS', optional => 1, minimum => 1, maximum => 600, @@ -265,7 +300,7 @@ sub fabric_properties { oneOf => [ { type => 'array', - 'instance-types' => ['openfabric'], + 'instance-types' => ['openfabric', 'isis'], items => { type => 'string', enum => ['hello_interval', 'csnp_interval'], diff --git a/src/PVE/Network/SDN/Frr.pm b/src/PVE/Network/SDN/Frr.pm index 99002c6b65bf..da7ce0381297 100644 --- a/src/PVE/Network/SDN/Frr.pm +++ b/src/PVE/Network/SDN/Frr.pm @@ -125,6 +125,7 @@ sub restart { my $SDN_DAEMONS_DEFAULT = { ospfd => 0, fabricd => 0, + isisd => 0, }; =head3 set_daemon_status(\%daemons, $set_default) -- 2.47.3
