[crmsh-4.6] Refactor: cibquery: replace has_primitive_filesystem_with_fstype with PrimitiveFilesystemQuery

Author: nicholasyang2022

crmsh/cibquery.py

@@ -18,13 +18,6 @@ def get_configured_resource_agents(cib: lxml.etree.Element) -> typing.Set[Resour
     )
 
 
-def has_primitive_filesystem_with_fstype(cib: lxml.etree.Element, fstype: str) -> bool:
-    return bool(cib.xpath(
-        '/cib/configuration/resources//primitive[@class="ocf" and @provider="heartbeat" and @type="Filesystem"]'
-        f'/instance_attributes/nvpair[@name="fstype" and @value="{fstype}"]'
-    ))
-
-
 class PrimitiveFilesystemQuery:
     PRIMITIVE_XPATH = '/cib/configuration/resources//primitive[@class="ocf" and @provider="heartbeat" and @type="Filesystem"]'
 

crmsh/migration.py

@@ -428,7 +428,7 @@ def _check_removed_resource_agents(
 
 
 def _check_ocfs2(handler: CheckResultHandler, cib: lxml.etree.Element):
-    if cibquery.has_primitive_filesystem_with_fstype(cib, 'ocfs2'):
+    if cibquery.PrimitiveFilesystemQuery(cib).fstype('ocfs2').exists():
        handler.handle_problem(False, 'OCFS2 is not supported in SLES 16. Please use GFS2.', [
        ])
 

test/unittests/test_cibquery.py

@@ -105,10 +105,6 @@ def test_get_resource_agents(self):
             cibquery.get_configured_resource_agents(self.cib),
         )
 
-    def test_has_primitive_filesystem_with_fstype(self):
-        self.assertTrue(cibquery.has_primitive_filesystem_with_fstype(self.cib, 'ocfs2'))
-        self.assertFalse(cibquery.has_primitive_filesystem_with_fstype(self.cib, 'foo'))
-
 
 class TestPrimitiveFilesystemQuery(unittest.TestCase):
     def setUp(self) -> None:
@@ -141,4 +137,4 @@ def test_exists_directory_no_match(self):
 
     def test_exists_fstype_and_directory_match(self):
         query = cibquery.PrimitiveFilesystemQuery(self.cib)
-        self.assertTrue(query.fstype('ocfs2').directory('/srv/clusterfs').exists())
+        self.assertTrue(query.fstype('ocfs2').directory('/srv/clusterfs').exists())