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 <g.gol...@proxmox.com>
---
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 d90992a7eceb..63f4f1497117 100644
--- a/src/PVE/Network/SDN/Fabrics.pm
+++ b/src/PVE/Network/SDN/Fabrics.pm
@@ -45,7 +45,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'],
},
);
@@ -181,6 +181,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'],
@@ -244,8 +279,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,
@@ -253,8 +288,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,
@@ -277,7 +312,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 b548e7b4f0fe..4e933710d967 100644
--- a/src/PVE/Network/SDN/Frr.pm
+++ b/src/PVE/Network/SDN/Frr.pm
@@ -112,6 +112,7 @@ sub restart {
my $SDN_DAEMONS_DEFAULT = {
ospfd => 0,
fabricd => 0,
+ isisd => 0,
};
=head3 set_daemon_status(\%daemons, $set_default)
--
2.47.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
