Refactor: cibquery: has_primitive_filesystem_ocfs2 to has_primitive_f…

…ilesystem_with_fstype

crmsh/cibquery.py

@@ -18,8 +18,8 @@ def get_configured_resource_agents(cib: lxml.etree.Element) -> typing.Set[Resour
     )
 
 
-def has_primitive_filesystem_ocfs2(cib: lxml.etree.Element) -> bool:
+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"]'
-        '/instance_attributes/nvpair[@name="fstype" and @value="ocfs2"]'
+        f'/instance_attributes/nvpair[@name="fstype" and @value="{fstype}"]'
     ))

crmsh/migration.py

@@ -370,7 +370,7 @@ def _check_removed_resource_agents(
 
 
 def _check_ocfs2(handler: CheckResultHandler, cib: lxml.etree.Element):
-    if cibquery.has_primitive_filesystem_ocfs2(cib):
+    if cibquery.has_primitive_filesystem_with_fstype(cib, 'ocfs2'):
        handler.handle_problem(False, 'OCFS2 is not supported in SLES 16.', [
            '* Before migrating to SLES 16, replace it with GFS2.',
        ])

test/unittests/test_cibquery.py

@@ -105,5 +105,6 @@ def test_get_resource_agents(self):
             cibquery.get_configured_resource_agents(self.cib),
         )
 
-    def test_has_primitive_filesystem_ocfs2(self):
-        self.assertTrue(cibquery.has_primitive_filesystem_ocfs2(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'))