(FM-4614) remove --graph and added documentation for lib

phongdly · phongdly · commit ac91d2fd0229 · 2016-01-25T20:26:51.000-08:00
diff --git a/tests/beaker/lib/lvm_helper.rb b/tests/beaker/lib/lvm_helper.rb
@@ -4,7 +4,8 @@
 #
 # * +resource_type+ - resorce type, i.e 'physical_volume', 'volume_group', 'logical_volume', or 'filesystem'
 # * +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
 # ==== Returns
 #
 # +nil+
@@ -13,7 +14,7 @@
 # assert_match failure message
 # ==== Examples
 #
-# verify_if_created?(agent, 'physical_volume', /dev/sdb')
+# verify_if_created?(agent, 'physical_volume', /dev/sdb', VolumeGroup_123, "Size     7GB")
 def verify_if_created?(agent, resource_type, resource_name, vg=nil, properties=nil)
   case resource_type
     when 'physical_volume'
@@ -25,6 +26,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
       on(agent, "lvdisplay /dev/#{vg}/#{resource_name}") do |result|
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
         if properties
diff --git a/tests/beaker/tests/create_lv_with_param_alloc.rb b/tests/beaker/tests/create_lv_with_param_alloc.rb
@@ -73,7 +73,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_initial_size.rb b/tests/beaker/tests/create_lv_with_param_initial_size.rb
@@ -38,7 +38,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_name.rb b/tests/beaker/tests/create_lv_with_param_name.rb
@@ -43,7 +43,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_no_sync.rb b/tests/beaker/tests/create_lv_with_param_no_sync.rb
@@ -39,7 +39,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_readahead.rb b/tests/beaker/tests/create_lv_with_param_readahead.rb
@@ -39,7 +39,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_region_size.rb b/tests/beaker/tests/create_lv_with_param_region_size.rb
@@ -40,7 +40,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_size_is_minsize.rb b/tests/beaker/tests/create_lv_with_param_size_is_minsize.rb
@@ -44,7 +44,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_stripes.rb b/tests/beaker/tests/create_lv_with_param_stripes.rb
@@ -39,7 +39,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_param_stripesize.rb b/tests/beaker/tests/create_lv_with_param_stripesize.rb
@@ -40,7 +40,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_property_mirror.rb b/tests/beaker/tests/create_lv_with_property_mirror.rb
@@ -39,7 +39,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_with_property_mirrorlog.rb b/tests/beaker/tests/create_lv_with_property_mirrorlog.rb
@@ -55,7 +55,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_lv_without_param_name.rb b/tests/beaker/tests/create_lv_without_param_name.rb
@@ -42,7 +42,7 @@
 step 'Run Puppet Agent to create logical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_pv_param_unless_vg.rb b/tests/beaker/tests/create_pv_param_unless_vg.rb
@@ -49,7 +49,7 @@
   agents.each do |agent|
     #Run Puppet Agent with manifest pp
     step "Run Puppet Agent to create volume group '#{vg}' on physical volume '#{pv[0]}'"
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
@@ -71,7 +71,7 @@
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
     step "Run Puppet Agent to create the physical volume '#{pv[1]}':"
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_pv_w_param_force.rb b/tests/beaker/tests/create_pv_w_param_force.rb
@@ -28,7 +28,7 @@
 step 'Run Puppet Agent to create physical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_pv_with_param_name.rb b/tests/beaker/tests/create_pv_with_param_name.rb
@@ -28,7 +28,7 @@
 step 'Run Puppet Agent to create physical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_pv_wo_param_name.rb b/tests/beaker/tests/create_pv_wo_param_name.rb
@@ -27,7 +27,7 @@
 step 'Run Puppet Agent to create physical volumes'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_vg_property_logical_volumes.rb b/tests/beaker/tests/create_vg_property_logical_volumes.rb
@@ -40,7 +40,7 @@ class { 'lvm':
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_vg_property_physical_volumes.rb b/tests/beaker/tests/create_vg_property_physical_volumes.rb
@@ -36,7 +36,7 @@ class { 'lvm':
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_vg_w_2_physical_volumes.rb b/tests/beaker/tests/create_vg_w_2_physical_volumes.rb
@@ -36,7 +36,7 @@ class { 'lvm':
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_vg_w_param_name.rb b/tests/beaker/tests/create_vg_w_param_name.rb
@@ -37,7 +37,7 @@
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/create_vg_wo_param_name.rb b/tests/beaker/tests/create_vg_wo_param_name.rb
@@ -36,7 +36,7 @@
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/remove_lv.rb b/tests/beaker/tests/remove_lv.rb
@@ -51,7 +51,7 @@
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
     on(agent, "umount /dev/#{vg}/#{lv}", :acceptable_exit_codes => [0,1])
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
@@ -68,7 +68,7 @@
 step "run Puppet Agent to remove logical volume : #{lv}"
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/remove_pv.rb b/tests/beaker/tests/remove_pv.rb
@@ -28,7 +28,7 @@
 step 'Run Puppet Agent to create physical volume'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
@@ -45,7 +45,7 @@
 step "run Puppet Agent to remove the physical volume: #{pv}"
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
diff --git a/tests/beaker/tests/remove_vg.rb b/tests/beaker/tests/remove_vg.rb
@@ -44,7 +44,7 @@
 step 'Run Puppet Agent to create volume group'
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
@@ -61,7 +61,7 @@
 step "run Puppet Agent to remove volume group : #{vg}"
 confine_block(:except, :roles => %w{master dashboard database}) do
   agents.each do |agent|
-    on(agent, puppet('agent -t --graph  --environment production'), :acceptable_exit_codes => [0,2]) do |result|
+    on(agent, puppet('agent -t --environment production'), :acceptable_exit_codes => [0,2]) do |result|
       assert_no_match(/Error:/, result.stderr, 'Unexpected error was detected!')
     end
 
