isis: T3783: bugfix configuring spf-delay-ietf

Mandatory FRR options for spf-delay-ietf did not get rendered in the Jinja2
template.

4 files changed, 71 insertions, 2 deletions

diff --git a/data/templates/frr/isisd.frr.tmpl b/data/templates/frr/isisd.frr.tmpl
index 6cfa076d0..51ac40060 100644
--- a/data/templates/frr/isisd.frr.tmpl
+++ b/data/templates/frr/isisd.frr.tmpl
@@ -100,7 +100,7 @@ router isis VyOS {{ 'vrf ' + vrf if vrf is defined and vrf is not none }}
 {%   endif %}
 {% endif %}
 {% if spf_delay_ietf is defined and spf_delay_ietf.init_delay is defined and spf_delay_ietf.init_delay is not none %}
- spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }}
+ spf-delay-ietf init-delay {{ spf_delay_ietf.init_delay }} short-delay {{ spf_delay_ietf.short_delay }} long-delay {{ spf_delay_ietf.long_delay }} holddown {{ spf_delay_ietf.holddown }} time-to-learn {{ spf_delay_ietf.time_to_learn }}
 {% endif %}
 {% if area_password is defined and area_password is not none %}
 {%   if area_password.md5 is defined and area_password.md5 is not none %}
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 9b6d4a4ec..8170f2b56 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -199,5 +199,58 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
         self.assertIn(f' area-password clear {password}', tmp)
 
 
+    def test_isis_06_spf_delay(self):
+        self.isis_base_config()
+
+        network = 'point-to-point'
+        holddown = '10'
+        init_delay = '50'
+        long_delay = '200'
+        short_delay = '100'
+        time_to_learn = '75'
+
+        for interface in self._interfaces:
+            self.cli_set(base_path + ['interface', interface, 'network', network])
+
+        self.cli_set(base_path + ['spf-delay-ietf', 'holddown', holddown])
+        # verify() - All types of spf-delay must be configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        self.cli_set(base_path + ['spf-delay-ietf', 'init-delay', init_delay])
+        # verify() - All types of spf-delay must be configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        self.cli_set(base_path + ['spf-delay-ietf', 'long-delay', long_delay])
+        # verify() - All types of spf-delay must be configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        self.cli_set(base_path + ['spf-delay-ietf', 'long-delay', long_delay])
+        # verify() - All types of spf-delay must be configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+
+        self.cli_set(base_path + ['spf-delay-ietf', 'short-delay', short_delay])
+        # verify() - All types of spf-delay must be configured
+        with self.assertRaises(ConfigSessionError):
+            self.cli_commit()
+        self.cli_set(base_path + ['spf-delay-ietf', 'time-to-learn', time_to_learn])
+
+        # Commit all changes
+        self.cli_commit()
+
+        # Verify all changes
+        tmp = self.getFRRconfig(f'router isis {domain}')
+        self.assertIn(f' net {net}', tmp)
+        self.assertIn(f' spf-delay-ietf init-delay {init_delay} short-delay {short_delay} long-delay {long_delay} holddown {holddown} time-to-learn {time_to_learn}', tmp)
+
+        for interface in self._interfaces:
+            tmp = self.getFRRconfig(f'interface {interface}')
+            self.assertIn(f' ip router isis {domain}', tmp)
+            self.assertIn(f' ipv6 router isis {domain}', tmp)
+            self.assertIn(f' isis network {network}', tmp)
+
 if __name__ == '__main__':
     unittest.main(verbosity=2)
diff --git a/src/conf_mode/containers.py b/src/conf_mode/containers.py
index 32320a4b2..3a93bf062 100755
--- a/src/conf_mode/containers.py
+++ b/src/conf_mode/containers.py
@@ -19,6 +19,7 @@ import json
 
 from ipaddress import ip_address
 from ipaddress import ip_network
+from time import sleep
 
 from vyos.config import Config
 from vyos.configdict import dict_merge
@@ -28,6 +29,9 @@ from vyos.util import cmd
 from vyos.util import run
 from vyos.util import read_file
 from vyos.util import write_file
+from vyos.util import is_systemd_service_active
+from vyos.util import is_systemd_service_running
+
 from vyos.template import render
 from vyos.template import is_ipv4
 from vyos.template import is_ipv6
@@ -199,6 +203,18 @@ def apply(container):
         for network in container['network_remove']:
             call(f'podman network rm --force {network}')
 
+    service_name = 'podman.service'
+    if 'network' in container or 'name' in container:
+        # Start podman if it's required and not yet running
+        if not is_systemd_service_active(service_name):
+            _cmd(f'systemctl start {service_name}')
+        # Wait for podman to be running
+        while not is_systemd_service_running(service_name):
+            sleep(0.250)
+    else:
+        _cmd(f'systemctl stop {service_name}')
+
+
     # Add network
     if 'network' in container:
         for network, network_config in container['network'].items():
diff --git a/src/conf_mode/protocols_isis.py b/src/conf_mode/protocols_isis.py
index 4cf0312e9..4505e2496 100755
--- a/src/conf_mode/protocols_isis.py
+++ b/src/conf_mode/protocols_isis.py
@@ -148,7 +148,7 @@ def verify(isis):
 
         exist_timers = set(required_timers).difference(set(exist_timers))
         if len(exist_timers) > 0:
-            raise ConfigError('All types of delay must be specified: ' + ', '.join(exist_timers).replace('_', '-'))
+            raise ConfigError('All types of spf-delay must be configured. Missing: ' + ', '.join(exist_timers).replace('_', '-'))
 
     # If Redistribute set, but level don't set
     if 'redistribute' in isis: