Dev: unittest: Remove or replace stonith:null and stonith:ssh

test/unittests/test_bugs.py

@@ -572,7 +572,6 @@ def test_id_collision_breakage_1(mock_incr, mock_line_num):
 primitive p2 ocf:heartbeat:Delay \
     params startdelay=2 mondelay=2 stopdelay=2
 primitive p3 ocf:pacemaker:Dummy
-primitive st stonith:null params hostlist=node1
 clone c1 p1
 ms m1 p2
 op_defaults timeout=60s
@@ -584,10 +583,6 @@ def test_id_collision_breakage_1(mock_incr, mock_line_num):
     ok = obj.save("""op_defaults timeout=2m
 node node1 \
     attributes mem=16G
-primitive st stonith:null \
-    params hostlist='node1' \
-    meta description="some description here" requires=nothing \
-    op monitor interval=60m
 primitive p1 ocf:heartbeat:Dummy \
     op monitor interval=60m \
     op monitor interval=120m OCF_CHECK_LEVEL=10
@@ -703,8 +698,6 @@ def test_id_collision_breakage_2(mock_incr, mock_line_num):
 primitive d1 Dummy
 primitive d2 Dummy
 # Never use this STONITH agent in production!
-primitive development-stonith stonith:null \
-	params hostlist="webui node1 node2 node3"
 primitive proxy systemd:haproxy \
 	op monitor interval=10s
 primitive proxy-vip IPaddr2 \
@@ -778,8 +771,8 @@ def test_bug_110():
     """
     configuring attribute-based fencing-topology
     """
-    factory.create_object(*"primitive stonith-libvirt stonith:null".split())
-    factory.create_object(*"primitive fence-nova stonith:null".split())
+    factory.create_object(*"primitive stonith-libvirt stonith:fence_sbd".split())
+    factory.create_object(*"primitive fence-nova stonith:fence_sbd".split())
     cmd = "fencing_topology attr:OpenStack-role=compute stonith-libvirt,fence-nova".split()
     ok = factory.create_object(*cmd)
     assert ok

test/unittests/test_parse.py

@@ -160,18 +160,15 @@ def test_resources(self, mock_error):
         self.assertEqual(out.get('class'), 'ocf')
         #print out
 
-        out = self._parse('primitive st stonith:ssh params hostlist=node1 meta target-role=Started requires=nothing op start timeout=60s op monitor interval=60m timeout=60s')
+        out = self._parse('primitive st stonith:fence_sbd meta target-role=Started requires=nothing op start timeout=60s op monitor interval=60m timeout=60s')
         self.assertEqual(out.get('id'), 'st')
 
-        out2 = self._parse('primitive st stonith:ssh hostlist=node1 meta target-role=Started requires=nothing op start timeout=60s op monitor interval=60m timeout=60s')
+        out2 = self._parse('primitive st stonith:fence_sbd meta target-role=Started requires=nothing op start timeout=60s op monitor interval=60m timeout=60s')
         self.assertEqual(out2.get('id'), 'st')
 
         self.assertEqual(xml_tostring(out), xml_tostring(out2))
 
-        out = self._parse('primitive st stonith:ssh params hostlist= meta')
-        self.assertEqual(out.get('id'), 'st')
-
-        out = self._parse('primitive st stonith:null params hostlist=node1 meta requires=nothing description="some description here" op start op monitor interval=60m')
+        out = self._parse('primitive st stonith:fence_sbd meta')
         self.assertEqual(out.get('id'), 'st')
 
         out = self._parse('ms m0 resource params a=b')
@@ -635,13 +632,6 @@ def test_configs(self, mock_error):
         inp = [
             """node node1 attributes mem=16G""",
             """node node2 utilization cpu=4""",
-            """primitive st stonith:ssh \
-            params hostlist='node1 node2' \
-            meta target-role="Started" requires="nothing" \
-            op start timeout=60s \
-            op monitor interval=60m timeout=60s""",
-            """primitive st2 stonith:ssh \
-            params hostlist='node1 node2'""",
             """primitive d1 ocf:pacemaker:Dummy \
             operations $id=d1-ops \
             op monitor interval=60m \
@@ -702,8 +692,6 @@ def test_configs(self, mock_error):
         b = [
             '<node uname="node1"><instance_attributes><nvpair name="mem" value="16G"/></instance_attributes></node>',
             '<node uname="node2"><utilization><nvpair name="cpu" value="4"/></utilization></node>',
-            '<primitive id="st" class="stonith" type="ssh"><instance_attributes><nvpair name="hostlist" value="node1 node2"/></instance_attributes><meta_attributes><nvpair name="target-role" value="Started"/><nvpair name="requires" value="nothing"/></meta_attributes><operations><op name="start" timeout="60s" interval="0s"/><op name="monitor" interval="60m" timeout="60s"/></operations></primitive>',
-            '<primitive id="st2" class="stonith" type="ssh"><instance_attributes><nvpair name="hostlist" value="node1 node2"/></instance_attributes></primitive>',
             '<primitive id="d1" class="ocf" provider="pacemaker" type="Dummy"><operations id="d1-ops"><op name="monitor" interval="60m"/><op name="monitor" interval="120m"><instance_attributes><nvpair name="OCF_CHECK_LEVEL" value="10"/></instance_attributes></op></operations></primitive>',
             '<op name="monitor" rsc="d1" interval="60s" timeout="30s"/>',
             '<primitive id="d2" class="ocf" provider="heartbeat" type="Delay"><instance_attributes><nvpair name="mondelay" value="60"/></instance_attributes><operations><op name="start" timeout="60s" interval="0s"/><op name="stop" timeout="60s" interval="0s"/></operations></primitive>',