(FM-4614) updated lib

Author: phongdly

Gemfile

@@ -25,6 +25,6 @@ group :system_tests do
     gem 'beaker', *location_for(beaker_version)
   end
   gem 'beaker-puppet_install_helper', :require => false
-  gem 'master_manipulator', '1.1.2',  :require => false
+  gem 'master_manipulator', '~> 1.2',  :require => false
 end
 # vim:ft=ruby

tests/beaker/configs/redhat-6-64mda.yml

@@ -20,4 +20,4 @@ CONFIG:
   datastore: instance0
   folder: Delivery/Quality Assurance/Enterprise/Dynamic
   resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
-  pooling_api: http://vcloud.delivery.puppetlabs.net/
+  pooling_api: http://vcloud.delivery.puppetlabs.net/

tests/beaker/lib/lvm_helper.rb

@@ -14,7 +14,7 @@
 # ==== Examples
 #
 # verify_if_created?(agent, 'physical_volume', /dev/sdb')
-def verify_if_created?(agent, resource_type, resource_name)
+def verify_if_created?(agent, resource_type, resource_name, vg=nil, properties=nil)
   case resource_type
     when 'physical_volume'
       on(agent, "pvdisplay") do |result|
@@ -25,13 +25,15 @@ def verify_if_created?(agent, resource_type, resource_name)
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
       end
     when 'logical_volume'
-      on(agent, "lvdisplay") do |result|
+      on(agent, "lvdisplay /dev/#{vg}/#{resource_name}") do |result|
         assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
+        if properties
+          assert_match(/#{properties}/, result.stdout, 'Unexpected error was detected')
+        end
       end
   end
 end
 
-
 # Clean the box after each test, make sure the newly created logical volumes, volume groups,
 # and physical volumes are removed at the end of each test to make the server ready for the
 # next test case.

tests/beaker/pre-suite/00_pe_install.rb

@@ -1,5 +1,5 @@
 require 'master_manipulator'
-test_name 'FM-3808 - Cxx - Install Puppet Enterprise'
+test_name 'FM-4614 - Cxx - Install Puppet Enterprise'
 
 # Init
 step 'Install PE'

tests/beaker/pre-suite/01_lvm_module_install.rb

@@ -12,4 +12,4 @@
 staging[:version] = ENV['MODULE_VERSION'] if ENV['MODULE_VERSION']
 
 # in CI install from staging forge, otherwise from local
-install_dev_puppet_module_on(master, options[:forge_host] ? staging : local)
+install_dev_puppet_module_on(master, options[:forge_host] ? staging : local)

tests/beaker/pre-suite/02_add_extra_hdd.rb

@@ -1,8 +1,8 @@
-test_name 'Add extra hard drive for LVM testing'
-
+test_name 'FM-4614 - Cxx - Add extra hard drive for LVM testing'
 
 # Get the auth_token from ENV
 auth_tok = ENV['AUTH_TOKEN']
+fail_test "AUTH_TOKEN must be set" unless auth_tok
 
 # On the PE agent where LVM running
 confine_block(:except, :roles => %w{master dashboard database}) do
@@ -31,4 +31,4 @@
       assert_match(/\/dev\/sdd/, result.stdout, "Unexpected errors is detected")
     end
   end
-end
+end

tests/beaker/test_run_scripts/integration_tests.sh

@@ -9,9 +9,6 @@ if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
   cd ../
 fi
 
-# Work-around for RE-5005
-export SSL_CERT_FILE=/usr/local/etc/openssl/cert.pem
-
 export pe_dist_dir="http://enterprise.delivery.puppetlabs.net/2015.3/ci-ready"
 export GEM_SOURCE=http://rubygems.delivery.puppetlabs.net
 

tests/beaker/tests/create_lv_with_param_alloc.rb

@@ -2,13 +2,14 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4579 - C96574 - create logical volume without parameter 'alloc'"
+test_name "FM-4614 - C96574 - create logical volume  parameter 'alloc'"
 
 #initilize
 pv = '/dev/sdc'
-vg = ("VolumeGroup_" + SecureRandom.hex(2))
-lv = [("LogicalVolume_" + SecureRandom.hex(3)), ("LogicalVolume_" + SecureRandom.hex(3)), \
-("LogicalVolume_" + SecureRandom.hex(3)), ("LogicalVolume_" + SecureRandom.hex(3)), ("LogicalVolume_" + SecureRandom.hex(3))]
+vg = "VolumeGroup_" + SecureRandom.hex(2)
+lv = ["LogicalVolume_" + SecureRandom.hex(3), "LogicalVolume_" + SecureRandom.hex(3), \
+      "LogicalVolume_" + SecureRandom.hex(3), "LogicalVolume_" + SecureRandom.hex(3), \
+      "LogicalVolume_" + SecureRandom.hex(3)]
 
 # Teardown
 teardown do
@@ -72,11 +73,15 @@
 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
 
-    step "Verify the logical volume  is created: #{lv}"
-    verify_if_created?(agent, 'logical_volume', lv)
+    step "Verify the logical volumes  are successfully created: #{lv}"
+    verify_if_created?(agent, 'logical_volume', lv[0], vg, "Allocation\s+anywhere")
+    verify_if_created?(agent, 'logical_volume', lv[1], vg, "Allocation\s+contiguous")
+    verify_if_created?(agent, 'logical_volume', lv[2], vg, "Allocation\s+cling")
+    verify_if_created?(agent, 'logical_volume', lv[3], vg, "Allocation\s+inherit")
+    verify_if_created?(agent, 'logical_volume', lv[4], vg, "Allocation\s+normal")
   end
 end

tests/beaker/tests/create_lv_with_param_extents.rb

@@ -2,12 +2,12 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4579 - C96575 - create logical volume with parameter 'extents'"
+test_name "FM-4614 - C96575 - create logical volume with parameter 'extents'"
 
 #initilize
 pv = '/dev/sdc'
-vg = ("VolumeGroup_" + SecureRandom.hex(2))
-lv = ("LogicalVolume_" + SecureRandom.hex(3))
+vg = "VolumeGroup_" + SecureRandom.hex(2)
+lv = "LogicalVolume_" + SecureRandom.hex(3)
 
 # Teardown
 teardown do
@@ -27,7 +27,7 @@
 logical_volume{'#{lv}':
   ensure        => present,
   volume_group  => '#{vg}',
-  extents       => '2',
+  extents       => '50',
 }
 MANIFEST
 
@@ -38,11 +38,11 @@
 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
 
-    step "Verify the logical volume  is created: #{lv}"
-    verify_if_created?(agent, 'logical_volume', lv)
+    step "Verify the logical volume  is created and with extents is 50: #{lv}"
+    verify_if_created?(agent, 'logical_volume', lv, vg, "Current LE\s+50")
   end
 end

tests/beaker/tests/create_lv_with_param_initial_size.rb

@@ -2,12 +2,12 @@
 require 'lvm_helper'
 require 'securerandom'
 
-test_name "FM-4579 - C96576 - create logical volume with parameter 'initial_size'"
+test_name "FM-4614 - C96576 - create logical volume with parameter 'initial_size'"
 
 #initilize
 pv = '/dev/sdc'
-vg = ("VolumeGroup_" + SecureRandom.hex(2))
-lv = ("LogicalVolume_" + SecureRandom.hex(3))
+vg = "VolumeGroup_" + SecureRandom.hex(2)
+lv = "LogicalVolume_" + SecureRandom.hex(3)
 
 # Teardown
 teardown do
@@ -43,6 +43,6 @@
     end
 
     step "Verify the logical volume  is created: #{lv}"
-    verify_if_created?(agent, 'logical_volume', lv)
+    verify_if_created?(agent, 'logical_volume', lv, vg, "LV Size\s+20.00 MiB")
   end
 end