Added tests

Author: mariadb-AlexanderPresniakov

cmapi/cmapi_server/node_manipulation.py

@@ -1216,11 +1216,6 @@ def update_dbroots_of_readonly_nodes(root: etree.Element) -> None:
     if read_only_nodes is None:
         return
     for n in read_only_nodes.findall("./Node"):
-        add_dbroots = n.get("add_other_nodes_dbroots", "true").lower() == "true"
-        if not add_dbroots:
-            logging.info(f"Not adding dbroots of other nodes to {n.text} because it is a coordinator node")
-            continue
-
         ro_node = n.text
         # Get PM num by IP address
         this_ip_pm_num = None
@@ -1229,8 +1224,13 @@ def update_dbroots_of_readonly_nodes(root: etree.Element) -> None:
                 this_ip_pm_num = pm_num
                 break
         if this_ip_pm_num is not None:
-            # Add dbroots of other nodes to this read-only node
-            add_dbroots_of_other_nodes(root, this_ip_pm_num)
+            add_dbroots = n.get("add_other_nodes_dbroots", "true").lower() == "true"
+            if add_dbroots:
+                # Add dbroots of other nodes to this read-only node
+                add_dbroots_of_other_nodes(root, this_ip_pm_num)
+            else:
+                logging.info(f"Not adding dbroots of other nodes to {n.text} because it is a coordinator node")
+                remove_dbroots_of_node(root, this_ip_pm_num)
         else:  # This should not happen
             err_msg = f"Could not find PM number for read-only node {ro_node}"
             logging.error(err_msg)

cmapi/cmapi_server/test/test_node_manip.py

@@ -7,7 +7,9 @@
 
 from cmapi_server import node_manipulation
 from cmapi_server.constants import MCS_DATA_PATH
-from cmapi_server.node_manipulation import add_dbroots_of_other_nodes, remove_dbroots_of_node, update_dbroots_of_readonly_nodes
+from cmapi_server.node_manipulation import (
+    _add_read_only_node, add_dbroots_of_other_nodes, remove_dbroots_of_node, update_dbroots_of_readonly_nodes
+)
 from cmapi_server.test.unittest_global import BaseNodeManipTestCase, tmp_mcs_config_filename
 from mcs_node_control.models.node_config import NodeConfig
 
@@ -26,14 +28,16 @@ def test_add_remove_node(self):
 
         with patch('cmapi_server.node_manipulation.update_dbroots_of_readonly_nodes') as mock_update_dbroots_of_readonly_nodes:
             node_manipulation.add_node(
-                self.NEW_NODE_NAME, tmp_mcs_config_filename, self.tmp_files[0]
+                self.NEW_NODE_NAME, tmp_mcs_config_filename, self.tmp_files[0],
+                read_only=False,
             )
             mock_update_dbroots_of_readonly_nodes.assert_not_called()
 
             node_manipulation.add_node(
-                hostaddr, self.tmp_files[0], self.tmp_files[1]
+                hostaddr, self.tmp_files[0], self.tmp_files[1],
+                read_only=False,
             )
-            mock_update_dbroots_of_readonly_nodes.assert_called_once()
+            mock_update_dbroots_of_readonly_nodes.assert_not_called()
 
         # get a NodeConfig, read test.xml
         # look for some of the expected changes.
@@ -281,6 +285,8 @@ def test_unassign_dbroot1(self):
 
 class TestDBRootsManipulation(unittest.TestCase):
     our_module_idx = 3
+    rw_node1_ip = '192.168.1.1'
+    rw_node2_ip = '192.168.1.2'
     ro_node1_ip = '192.168.1.3'
     ro_node2_ip = '192.168.1.4'
 
@@ -292,9 +298,9 @@ def setUp(self):
         module_count = etree.SubElement(smc, 'ModuleCount3')
         module_count.text = '2'
         module1_ip = etree.SubElement(smc, 'ModuleIPAddr1-1-3')
-        module1_ip.text = '192.168.1.1'
+        module1_ip.text = self.rw_node1_ip
         module2_ip = etree.SubElement(smc, 'ModuleIPAddr2-1-3')
-        module2_ip.text = '192.168.1.2'
+        module2_ip.text = self.rw_node2_ip
 
         system_config = etree.SubElement(self.root, 'SystemConfig')
         dbroot_count = etree.SubElement(system_config, 'DBRootCount')
@@ -308,8 +314,8 @@ def test_get_pm_module_num_to_addr_map(self):
         result = node_manipulation.get_pm_module_num_to_addr_map(self.root)
 
         expected = {
-            1: '192.168.1.1',
-            2: '192.168.1.2',
+            1: self.rw_node1_ip,
+            2: self.rw_node2_ip,
         }
         self.assertEqual(result, expected)
 
@@ -383,3 +389,24 @@ def test_update_dbroots_of_readonly_nodes(self):
             self.assertIsNotNone(dbroot2)
             self.assertEqual(dbroot1.text, '1')
             self.assertEqual(dbroot2.text, '2')
+
+    def test_update_dbroots_of_readonly_nodes_ignores_coordinator_nodes(self):
+        """Test that update_dbroots_of_readonly_nodes doesn't add dbroots to coordinator nodes
+        (read-only nodes that have add_other_nodes_dbroots="false")
+        """
+        # Add read-only nodes
+        for ip, is_coordinator in zip([self.ro_node1_ip, self.ro_node2_ip], [True, False]):
+            node = etree.SubElement(self.root.find('./ReadOnlyNodes'), 'Node')
+            node.text = ip
+            node.set('add_other_nodes_dbroots', str(is_coordinator).lower())
+
+        update_dbroots_of_readonly_nodes(self.root)
+
+        # Check that RO node 1 has no dbroots
+        module_count = self.root.find(f'./SystemModuleConfig/ModuleDBRootCount3-3')
+        self.assertIsNone(module_count)
+
+        # Check that RO node 2 has dbroots
+        module_count = self.root.find(f'./SystemModuleConfig/ModuleDBRootCount4-3')
+        self.assertIsNotNone(module_count)
+        self.assertEqual(module_count.text, '2')

cmapi/mcs_node_control/models/node_config.py

@@ -592,7 +592,7 @@ def get_all_dbroots(self, root):
 
     def get_read_only_nodes(self, root=None) -> list[str]:
         """Get names of read only nodes from config"""
-        root = root or self.get_current_config_root()
+        root = root if root is not None else self.get_current_config_root()
         return [node.text for node in root.findall('./ReadOnlyNodes/Node')]
 
     def is_read_only(self, root=None) -> bool: