Merge pull request #5058 from alexk37/fix-isisd-fabricd-md5

T8389: fix domain-password md5 for isisd/fabricd

4 files changed, 44 insertions, 2 deletions

diff --git a/data/templates/frr/fabricd.frr.j2 b/data/templates/frr/fabricd.frr.j2
index 3a0646eb8..27110f6ae 100644
--- a/data/templates/frr/fabricd.frr.j2
+++ b/data/templates/frr/fabricd.frr.j2
@@ -39,7 +39,7 @@ exit
 router openfabric {{ name }}
  net {{ net }}
 {%     if router_config.domain_password.md5 is vyos_defined %}
- domain-password md5 {{ router_config.domain_password.plaintext_password }}
+ domain-password md5 {{ router_config.domain_password.md5 }}
 {%     elif router_config.domain_password.plaintext_password is vyos_defined %}
  domain-password clear {{ router_config.domain_password.plaintext_password }}
 {%     endif %}
diff --git a/data/templates/frr/isisd.frr.j2 b/data/templates/frr/isisd.frr.j2
index 8128c6711..75b98c091 100644
--- a/data/templates/frr/isisd.frr.j2
+++ b/data/templates/frr/isisd.frr.j2
@@ -107,7 +107,7 @@ advertise-passive-only
  metric-style {{ metric_style }}
 {% endif %}
 {% if domain_password.md5 is vyos_defined %}
- domain-password md5 {{ domain_password.plaintext_password }}
+ domain-password md5 {{ domain_password.md5 }}
 {% elif domain_password.plaintext_password is vyos_defined %}
  domain-password clear {{ domain_password.plaintext_password }}
 {% endif %}
diff --git a/smoketest/scripts/cli/test_protocols_isis.py b/smoketest/scripts/cli/test_protocols_isis.py
index 5d61f4ce0..c0d505616 100755
--- a/smoketest/scripts/cli/test_protocols_isis.py
+++ b/smoketest/scripts/cli/test_protocols_isis.py
@@ -167,6 +167,7 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
 
     def test_isis_05_password(self):
         password = 'foo'
+        md5_password = 'secret_md5_hash'
 
         self.cli_set(base_path + ['net', net])
         for interface in self._interfaces:
@@ -200,6 +201,29 @@ class TestProtocolsISIS(VyOSUnitTestSHIM.TestCase):
             tmp = self.getFRRconfig(f'interface {interface}', stop_section='^exit')
             self.assertIn(f' isis password clear {password}-{interface}', tmp)
 
+        # Switch to MD5 passwords - delete plaintext passwords first
+        self.cli_delete(base_path + ['area-password', 'plaintext-password'])
+        self.cli_delete(base_path + ['domain-password', 'plaintext-password'])
+        for interface in self._interfaces:
+            self.cli_delete(base_path + ['interface', interface, 'password', 'plaintext-password'])
+
+        self.cli_set(base_path + ['domain-password', 'md5', md5_password])
+        self.cli_set(base_path + ['area-password', 'md5', md5_password])
+        for interface in self._interfaces:
+            self.cli_set(base_path + ['interface', interface, 'password', 'md5', md5_password])
+
+        # Commit all changes
+        self.cli_commit()
+
+        # Verify all changes
+        tmp = self.getFRRconfig(f'router isis {domain}', stop_section='exit')
+        self.assertIn(f' domain-password md5 {md5_password}', tmp)
+        self.assertIn(f' area-password md5 {md5_password}', tmp)
+
+        for interface in self._interfaces:
+            tmp = self.getFRRconfig(f'interface {interface}', stop_section='^exit')
+            self.assertIn(f' isis password md5 {md5_password}', tmp)
+
     def test_isis_06_spf_delay_bfd(self):
         network = 'point-to-point'
         holddown = '10'
diff --git a/smoketest/scripts/cli/test_protocols_openfabric.py b/smoketest/scripts/cli/test_protocols_openfabric.py
index f5dcc53cd..c1e6f6598 100644
--- a/smoketest/scripts/cli/test_protocols_openfabric.py
+++ b/smoketest/scripts/cli/test_protocols_openfabric.py
@@ -117,6 +117,7 @@ class TestProtocolsOpenFabric(VyOSUnitTestSHIM.TestCase):
 
     def test_openfabric_03_password(self):
         password = 'foo'
+        md5_password = 'secret_md5_hash'
 
         self.openfabric_base_config()
 
@@ -147,6 +148,23 @@ class TestProtocolsOpenFabric(VyOSUnitTestSHIM.TestCase):
         tmp = self.getFRRconfig(f'interface {dummy_if}', stop_section='^exit')
         self.assertIn(f' openfabric password clear {password}-{dummy_if}', tmp)
 
+        # Switch to MD5 passwords - delete plaintext passwords first
+        self.cli_delete(path + ['domain-password', 'plaintext-password'])
+        self.cli_delete(path + ['interface', dummy_if, 'password', 'plaintext-password'])
+
+        self.cli_set(path + ['domain-password', 'md5', md5_password])
+        self.cli_set(path + ['interface', dummy_if, 'password', 'md5', md5_password])
+
+        # Commit all changes
+        self.cli_commit()
+
+        # Verify all changes
+        tmp = self.getFRRconfig(f'router openfabric {domain}', stop_section='^exit')
+        self.assertIn(f' domain-password md5 {md5_password}', tmp)
+
+        tmp = self.getFRRconfig(f'interface {dummy_if}', stop_section='^exit')
+        self.assertIn(f' openfabric password md5 {md5_password}', tmp)
+
     def test_openfabric_multiple_domains(self):
         domain_2 = 'VyOS_2'
         interface = 'dum5678'