Merge pull request #1418 from liangxin1300/20240508_ocf_format

Dev: Change the RA name string format

Author: liangxin1300

crmsh/constants.py

@@ -490,8 +490,8 @@
 CRM_MON_XML_OUTPUT= "crm_mon --output-as=xml"
 STONITH_TIMEOUT_DEFAULT = 60
 PCMK_DELAY_MAX = 30
-DLM_CONTROLD_RA = "ocf::pacemaker:controld"
-LVMLOCKD_RA = "ocf::heartbeat:lvmlockd"
+DLM_CONTROLD_RA = "ocf:pacemaker:controld"
+LVMLOCKD_RA = "ocf:heartbeat:lvmlockd"
 HA_USER = "hacluster"
 HA_GROUP = "haclient"
 SCHEMA_MIN_VER_SUPPORT_OCF_1_1 = "pacemaker-3.7"

test/unittests/test_xmlutil.py

@@ -24,10 +24,10 @@ def setUp(self, mock_cluster_shell):
     <node name="tbw-2" id="1084783312" online="false" standby="false" standby_onfail="false" maintenance="false" pending="false" unclean="false" shutdown="false" expected_up="true" is_dc="false" resources_running="2" type="member"/>
   </nodes>
   <resources>
-    <resource id="ocfs2-dlm" resource_agent="ocf::pacemaker:controld" role="Started" active="true" orphaned="false" blocked="false" managed="true" failed="false" failure_ignored="false" nodes_running_on="1">
+    <resource id="ocfs2-dlm" resource_agent="ocf:pacemaker:controld" role="Started" active="true" orphaned="false" blocked="false" managed="true" failed="false" failure_ignored="false" nodes_running_on="1">
       <node name="tbw-2" id="1084783312" cached="true"/>
     </resource>
-    <resource id="ocfs2-clusterfs" resource_agent="ocf::heartbeat:Filesystem" role="Started" active="true" orphaned="false" blocked="false" managed="true" failed="false" failure_ignored="false" nodes_running_on="1">
+    <resource id="ocfs2-clusterfs" resource_agent="ocf:heartbeat:Filesystem" role="Started" active="true" orphaned="false" blocked="false" managed="true" failed="false" failure_ignored="false" nodes_running_on="1">
       <node name="tbw-2" id="1084783312" cached="true"/>
     </resource>
   </resources>
@@ -46,16 +46,16 @@ def test_get_node_list(self):
 
     def test_is_resource_configured(self):
         assert self.parser_inst.is_resource_configured("test") is False
-        assert self.parser_inst.is_resource_configured("ocf::heartbeat:Filesystem") is True
+        assert self.parser_inst.is_resource_configured("ocf:heartbeat:Filesystem") is True
 
     def test_is_any_resource_running(self):
         assert self.parser_inst.is_any_resource_running() is True
 
     def test_is_resource_started(self):
         assert self.parser_inst.is_resource_started("test") is False
         assert self.parser_inst.is_resource_started("ocfs2-clusterfs") is True
-        assert self.parser_inst.is_resource_started("ocf::pacemaker:controld") is True
+        assert self.parser_inst.is_resource_started("ocf:pacemaker:controld") is True
 
     def test_get_resource_id_list_via_type(self):
         assert self.parser_inst.get_resource_id_list_via_type("test") == []
-        assert self.parser_inst.get_resource_id_list_via_type("ocf::pacemaker:controld")[0] == "ocfs2-dlm"
+        assert self.parser_inst.get_resource_id_list_via_type("ocf:pacemaker:controld")[0] == "ocfs2-dlm"