(FM-4969) updated lvm_helper

Author: phongdly

tests/beaker/lib/lvm_helper.rb

@@ -2,7 +2,8 @@
 #
 # ==== Attributes
 #
-# * +resource_type+ - resorce type, i.e 'physical_volume', 'volume_group', 'logical_volume', or 'filesystem'
+# * +resource_type+ - resorce type, i.e 'physical_volume', 'volume_group', 'logical_volume', 'filesystem',
+# *                   'aix_physical_volume', 'aix_volume_group', or 'aix_logical_volume'.
 # * +resource_name+ - The name of resource type, i.e '/dev/sdb' for physical volume, vg_1234 for volume group
 # * +vg+ - volume group name associated with logical volume (if any)
 # * +properties+ - a matching string or regular expression in logical volume properties
@@ -26,7 +27,7 @@ def verify_if_created?(agent, resource_type, resource_name, vg=nil, properties=n
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
       end
     when 'logical_volume'
-      fail_test "Error: missing volume group that the logical volume is associated with" unless vg
+      raise ArgumentError, 'Missing volume group that the logical volume is associated with' unless vg
       on(agent, "lvdisplay /dev/#{vg}/#{resource_name}") do |result|
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
         if properties
@@ -39,11 +40,10 @@ def verify_if_created?(agent, resource_type, resource_name, vg=nil, properties=n
       end
     when 'aix_volume_group'
       on(agent, "lsvg") do |result|
-        #assert_match(/#{resource_name}\s+^a-z0-9$\s+#{vg}/, result.stdout, 'Unexpected error was detected')
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
       end
     when 'aix_logical_volume'
-      fail_test "Error: missing volume group that the logical volume is associated with" unless vg
+      raise ArgumentError, 'Missing volume group that the logical volume is associated with' unless vg
       on(agent, "lslv #{resource_name}") do |result|
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
         if properties
@@ -96,7 +96,7 @@ def is_correct_format?(agent, volume_group, logical_volume, format_type)
 # ==== Examples
 #
 # remove_all(agent, '/dev/sdb', 'VolumeGroup_1234', 'LogicalVolume_fa13')
-def remove_all(agent, pv=nil, vg=nil, lv=nil, aix=nil)
+def remove_all(agent, pv=nil, vg=nil, lv=nil, aix=false)
   if aix
     step 'remove aix volume group, physical/logical volume '
     on(agent, "reducevg -d -f #{vg} #{pv}")

tests/beaker/tests/aix/create_lv_with_param_max_range_aix.rb renamed to tests/beaker/tests/aix/create_lv_with_param_max_range.rb

@@ -2,7 +2,7 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4969 - C97367 - create logical volume with parameter min 'range' aix"
+test_name "FM-4969 - C97367 - create logical volume with parameter max 'range'"
 
 #initilize
 pv = 'hdisk1'
@@ -13,7 +13,7 @@
 teardown do
   confine_block(:except, :roles => %w{master dashboard database}) do
     agents.each do |agent|
-      remove_all(agent, pv, vg, lv, 'aix')
+      remove_all(agent, pv, vg, lv, aix = true)
     end
   end
 end

tests/beaker/tests/aix/create_lv_with_param_min_range_aix.rb renamed to tests/beaker/tests/aix/create_lv_with_param_min_range.rb

@@ -2,7 +2,7 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4969 - C97372 - create logical volume with parameter min 'range' aix"
+test_name "FM-4969 - C97372 - create logical volume with parameter min 'range'"
 
 #initilize
 pv = 'hdisk1'
@@ -13,7 +13,7 @@
 teardown do
   confine_block(:except, :roles => %w{master dashboard database}) do
     agents.each do |agent|
-      remove_all(agent, pv, vg, lv, 'aix')
+      remove_all(agent, pv, vg, lv, aix = true)
     end
   end
 end

tests/beaker/tests/aix/create_lv_with_param_type.rb

@@ -2,7 +2,7 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4969 - C97368 - create logical volume with param 'type' aix"
+test_name "FM-4969 - C97368 - create logical volume with param 'type'"
 
 #initilize
 pv = 'hdisk1'
@@ -13,7 +13,7 @@
 teardown do
   confine_block(:except, :roles => %w{master dashboard database}) do
     agents.each do |agent|
-      remove_all(agent, pv, vg, lv, 'aix')
+      remove_all(agent, pv, vg, lv, aix = true)
     end
   end
 end
@@ -28,7 +28,7 @@
   ensure        => present,
   volume_group  => '#{vg}',
   initial_size  => '5M',
-  type         => 'jfs',
+  type          => 'jfs',
 }
 MANIFEST