Dev: behave: Adjust functional test for previous commits

Author: liangxin1300

test/features/bootstrap_sbd_normal.feature

@@ -81,14 +81,12 @@ Feature: crmsh bootstrap sbd management
     Given   Cluster service is "stopped" on "hanode1"
     Given   Cluster service is "stopped" on "hanode2"
     When    Run "crm cluster init ssh -y" on "hanode1"
-    And     Run "crm cluster init csync2 -y" on "hanode1"
     And     Run "crm cluster init corosync -y" on "hanode1"
     And     Run "crm cluster init sbd -s /dev/sda1 -y" on "hanode1"
     And     Run "crm cluster init cluster -y" on "hanode1"
     Then    Cluster service is "started" on "hanode1"
     And     Service "sbd" is "started" on "hanode1"
     When    Run "crm cluster join ssh -y -c hanode1" on "hanode2"
-    And     Run "crm cluster join csync2 -y -c hanode1" on "hanode2"
     And     Run "crm cluster join ssh_merge -y -c hanode1" on "hanode2"
     And     Run "crm cluster join cluster -y -c hanode1" on "hanode2"
     Then    Cluster service is "started" on "hanode2"
@@ -100,14 +98,12 @@ Feature: crmsh bootstrap sbd management
     Given   Cluster service is "stopped" on "hanode1"
     Given   Cluster service is "stopped" on "hanode2"
     When    Run "crm cluster init ssh -y" on "hanode1"
-    And     Run "crm cluster init csync2 -y" on "hanode1"
     And     Run "crm cluster init corosync -y" on "hanode1"
     And     Run "crm cluster init sbd -S -y" on "hanode1"
     And     Run "crm cluster init cluster -y" on "hanode1"
     Then    Cluster service is "started" on "hanode1"
     And     Service "sbd" is "started" on "hanode1"
     When    Run "crm cluster join ssh -y -c hanode1" on "hanode2"
-    And     Run "crm cluster join csync2 -y -c hanode1" on "hanode2"
     And     Run "crm cluster join ssh_merge -y -c hanode1" on "hanode2"
     And     Run "crm cluster join cluster -y -c hanode1" on "hanode2"
     Then    Cluster service is "started" on "hanode2"

test/features/steps/step_implementation.py

@@ -479,9 +479,10 @@ def step_impl(context, key, value):
 
 @then('SBD option "{key}" value for "{dev}" is "{value}"')
 def step_impl(context, key, dev, value):
-    res = sbd.SBDTimeout.get_sbd_msgwait(dev)
+    res = sbd.SBDUtils.get_sbd_device_metadata(dev).get(key)
     assert_eq(int(value), res)
 
+
 @then('Start timeout for sbd.service is "{value}" seconds')
 def step_impl(context, value):
     systemd_start_timeout = sbd.SBDTimeout.get_sbd_systemd_start_timeout()