Merge pull request #150 from phongdly/fm-4969/lvm_automate_test_phy-log-volume_volume-group_on_aix

Ryan Gard · Ryan Gard · commit 815594e82be7 · 2016-03-29T14:09:49.000-07:00
(FM-4969) aix auto tests for physical/logical volume and volume_group on aix
diff --git a/tests/beaker/configs/aix-71-spec.yml b/tests/beaker/configs/aix-71-spec.yml
@@ -0,0 +1,23 @@
+HOSTS:
+  redhat-6-x86_64:
+    roles:
+      - master
+      - dashboard
+      - database
+      - agent
+    platform: el-6-x86_64
+    template: redhat-6-x86_64
+    hypervisor: vcloud
+  pe-aix-71-spec:
+    roles:
+      - agent
+    platform: aix-7.1-power
+    hypervisor: none
+    vmhostname: pe-aix-71-spec.delivery.puppetlabs.net
+CONFIG:
+  nfs_server: NONE
+  consoleport: 443
+  datastore: instance0
+  folder: Delivery/Quality Assurance/Enterprise/Dynamic
+  resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
+  pooling_api: http://vcloud.delivery.puppetlabs.net/
diff --git a/tests/beaker/lib/lvm_helper.rb b/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,13 +27,29 @@ 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
           assert_match(/#{properties}/, result.stdout, 'Unexpected error was detected')
         end
       end
+    when 'aix_physical_volume'
+      on(agent, "lspv #{resource_name}") do |result|
+        assert_match(/Physical volume #{resource_name} is not assigned to/, result.stdout, 'Unexpected error was detected')
+      end
+    when 'aix_volume_group'
+      on(agent, "lsvg") do |result|
+        assert_match(/#{resource_name}/, result.stdout, 'Unexpected error was detected')
+      end
+    when 'aix_logical_volume'
+      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
+          assert_match(/#{properties}/, result.stdout, 'Unexpected error was detected')
+        end
+      end
   end
 end
 
@@ -68,6 +85,7 @@ def is_correct_format?(agent, volume_group, logical_volume, format_type)
 # * +pv+ - physical volume, can be one volume or an array of multiple volumes
 # * +vg+ - volume group, can be one group or an array of multiple volume groups
 # * +lv+ - logical volume, can be one volume or an array of multiple volumes
+# * +aix+ - if the agent is an AIX server.
 #
 # ==== Returns
 #
@@ -78,41 +96,47 @@ 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)
-  step 'remove logical volume if any:'
-  if lv
-    if lv.kind_of?(Array)
-      lv.each do |logical_volume|
-        on(agent, "umount /dev/#{vg}/#{logical_volume}", :acceptable_exit_codes => [0,1])
-        on(agent, "lvremove /dev/#{vg}/#{logical_volume} --force")
+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}")
+    on(agent, "rm -rf /dev/#{vg} /dev/#{lv}")
+  else
+    step 'remove logical volume if any:'
+    if lv
+      if lv.kind_of?(Array)
+        lv.each do |logical_volume|
+          on(agent, "umount /dev/#{vg}/#{logical_volume}", :acceptable_exit_codes => [0,1])
+          on(agent, "lvremove /dev/#{vg}/#{logical_volume} --force")
+        end
+      else
+        #note: in some test cases, for example, the test case 'create_vg_property_logical_volume'
+        # the logical volume must be unmount before being able to delete it
+        on(agent, "umount /dev/#{vg}/#{lv}", :acceptable_exit_codes => [0,1])
+        on(agent, "lvremove /dev/#{vg}/#{lv} --force")
       end
-    else
-      #note: in some test cases, for example, the test case 'create_vg_property_logical_volume'
-      # the logical volume must be unmount before being able to delete it
-      on(agent, "umount /dev/#{vg}/#{lv}", :acceptable_exit_codes => [0,1])
-      on(agent, "lvremove /dev/#{vg}/#{lv} --force")
     end
-  end
 
-  step 'remove volume group if any:'
-  if vg
-    if vg.kind_of?(Array)
-      vg.each do |volume_group|
-        on(agent, "vgremove /dev/#{volume_group}")
+    step 'remove volume group if any:'
+    if vg
+      if vg.kind_of?(Array)
+        vg.each do |volume_group|
+          on(agent, "vgremove /dev/#{volume_group}")
+        end
+      else
+        on(agent, "vgremove /dev/#{vg}")
       end
-    else
-      on(agent, "vgremove /dev/#{vg}")
     end
-  end
 
-  step 'remove logical volume if any:'
-  if pv
-    if pv.kind_of?(Array)
-      pv.each do |physical_volume|
-        on(agent, "pvremove #{physical_volume}")
+    step 'remove logical volume if any:'
+    if pv
+      if pv.kind_of?(Array)
+        pv.each do |physical_volume|
+          on(agent, "pvremove #{physical_volume}")
+        end
+      else
+        on(agent, "pvremove #{pv}")
       end
-    else
-      on(agent, "pvremove #{pv}")
     end
   end
 end
diff --git a/tests/beaker/pre-suite/02_add_extra_hdd.rb b/tests/beaker/pre-suite/02_add_extra_hdd.rb
@@ -6,29 +6,32 @@
 
 # On the PE agent where LVM running
 confine_block(:except, :roles => %w{master dashboard database}) do
-  agents.each do |agent|
-    step 'adding an extra disk: /dev/sdc:'
-    on(agent, "curl -X POST -H X-AUTH-TOKEN:#{auth_tok} --url vcloud/api/v1/vm/#{agent[:vmhostname]}/disk/1")
-    sleep(30)
-    step 'rescan the SCSI bus on the host to make the newly added hdd recognized'
-    on(agent, "echo \"- - -\" >/sys/class/scsi_host/host0/scan")
 
-    #keep trying until the hdd is found
-    retry_on(agent, "fdisk -l | grep \"/dev/sdc\"", :max_retries => 360, :retry_interval => 5)
+    agents.each do |agent|
+      unless (agent['platform'] =~ /windows/ && agent['platform'] =~ /aix/)
+        step 'adding an extra disk: /dev/sdc:'
+        on(agent, "curl -X POST -H X-AUTH-TOKEN:#{auth_tok} --url vcloud/api/v1/vm/#{agent[:vmhostname]}/disk/1")
+        sleep(30)
+        step 'rescan the SCSI bus on the host to make the newly added hdd recognized'
+        on(agent, "echo \"- - -\" >/sys/class/scsi_host/host0/scan")
 
-    step 'adding a second extra disk: /dev/sdd:'
-    on(agent, "curl -X POST -H X-AUTH-TOKEN:#{auth_tok} --url vcloud/api/v1/vm/#{agent[:vmhostname]}/disk/1")
-    sleep(30)
-    step 'rescan the SCSI bus on the host to make the newly added hdd recognized'
-    on(agent, "echo \"- - -\" >/sys/class/scsi_host/host0/scan")
+        #keep trying until the hdd is found
+        retry_on(agent, "fdisk -l | grep \"/dev/sdc\"", :max_retries => 420, :retry_interval => 5)
 
-    #keep trying until the hdd is found
-    retry_on(agent, "fdisk -l | grep \"/dev/sdd\"", :max_retries => 360, :retry_interval => 5)
+        step 'adding a second extra disk: /dev/sdd:'
+        on(agent, "curl -X POST -H X-AUTH-TOKEN:#{auth_tok} --url vcloud/api/v1/vm/#{agent[:vmhostname]}/disk/1")
+        sleep(30)
+        step 'rescan the SCSI bus on the host to make the newly added hdd recognized'
+        on(agent, "echo \"- - -\" >/sys/class/scsi_host/host0/scan")
 
-    step 'Verify the newly add HDDs recognized:'
-    on(agent, "fdisk -l") do |result|
-      assert_match(/\/dev\/sdc/, result.stdout, "Unexpected errors is detected")
-      assert_match(/\/dev\/sdd/, result.stdout, "Unexpected errors is detected")
-    end
+        #keep trying until the hdd is found
+        retry_on(agent, "fdisk -l | grep \"/dev/sdd\"", :max_retries => 420, :retry_interval => 5)
+
+        step 'Verify the newly add HDDs recognized:'
+        on(agent, "fdisk -l") do |result|
+          assert_match(/\/dev\/sdc/, result.stdout, "Unexpected errors is detected")
+          assert_match(/\/dev\/sdd/, result.stdout, "Unexpected errors is detected")
+        end
+      end
   end
 end
diff --git a/tests/beaker/test_run_scripts/integration_tests_aix.sh b/tests/beaker/test_run_scripts/integration_tests_aix.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# Init
+SCRIPT_PATH=$(pwd)
+BASENAME_CMD="basename ${SCRIPT_PATH}"
+SCRIPT_BASE_PATH=`eval ${BASENAME_CMD}`
+
+if [ $SCRIPT_BASE_PATH = "test_run_scripts" ]; then
+  cd ../
+fi
+
+export pe_dist_dir="http://pe-releases.puppetlabs.lan/2015.3.3"
+export GEM_SOURCE=http://rubygems.delivery.puppetlabs.net
+
+bundle install --without build development test --path .bundle/gems
+
+bundle exec beaker \
+  --no-provision \
+  --host configs/aix-71-spec.yml \
+  --debug \
+  --pre-suite pre-suite \
+  --tests tests/aix \
+  --keyfile ~/.ssh/id_rsa-acceptance \
+  --load-path lib
diff --git a/tests/beaker/tests/aix/create_lv_with_param_max_range.rb b/tests/beaker/tests/aix/create_lv_with_param_max_range.rb
@@ -0,0 +1,49 @@
+require 'master_manipulator'
+require 'lvm_helper'
+require 'securerandom'
+
+test_name "FM-4969 - C97367 - create logical volume with parameter max 'range'"
+
+#initilize
+pv = 'hdisk1'
+vg = "VG_" + SecureRandom.hex(2)
+lv = "LV_" + SecureRandom.hex(3)
+
+#Teardown
+teardown do
+  confine_block(:except, :roles => %w{master dashboard database}) do
+    agents.each do |agent|
+      remove_all(agent, pv, vg, lv, aix = true)
+    end
+  end
+end
+
+pp = <<-MANIFEST
+volume_group {'#{vg}':
+  ensure            => present,
+  physical_volumes  => #{pv}
+}
+->
+logical_volume{'#{lv}':
+  ensure        => present,
+  volume_group  => '#{vg}',
+  initial_size  => '5M',
+  range         => 'maximum',
+}
+MANIFEST
+
+step 'Inject "site.pp" on Master'
+site_pp = create_site_pp(master, :manifest => pp)
+inject_site_pp(master, get_site_pp_path(master), site_pp)
+
+step 'Run Puppet Agent to create logical volumes'
+confine_block(:except, :roles => %w{master dashboard database}) do
+  agents.each do |agent|
+    on(agent,"/opt/puppetlabs/puppet/bin/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 with param maximum is created: #{lv}"
+    verify_if_created?(agent, 'aix_logical_volume', lv, vg, "INTER-POLICY:\s+maximum")
+  end
+end
diff --git a/tests/beaker/tests/aix/create_lv_with_param_min_range.rb b/tests/beaker/tests/aix/create_lv_with_param_min_range.rb
@@ -0,0 +1,49 @@
+require 'master_manipulator'
+require 'lvm_helper'
+require 'securerandom'
+
+test_name "FM-4969 - C97372 - create logical volume with parameter min 'range'"
+
+#initilize
+pv = 'hdisk1'
+vg = "VG_" + SecureRandom.hex(2)
+lv = "LV_" + SecureRandom.hex(3)
+
+#Teardown
+teardown do
+  confine_block(:except, :roles => %w{master dashboard database}) do
+    agents.each do |agent|
+      remove_all(agent, pv, vg, lv, aix = true)
+    end
+  end
+end
+
+pp = <<-MANIFEST
+volume_group {'#{vg}':
+  ensure            => present,
+  physical_volumes  => #{pv}
+}
+->
+logical_volume{'#{lv}':
+  ensure        => present,
+  volume_group  => '#{vg}',
+  initial_size  => '20M',
+  range         => 'minimum',
+}
+MANIFEST
+
+step 'Inject "site.pp" on Master'
+site_pp = create_site_pp(master, :manifest => pp)
+inject_site_pp(master, get_site_pp_path(master), site_pp)
+
+step 'Run Puppet Agent to create logical volumes'
+confine_block(:except, :roles => %w{master dashboard database}) do
+  agents.each do |agent|
+    on(agent,"/opt/puppetlabs/puppet/bin/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 with param minimum is created: #{lv}"
+    verify_if_created?(agent, 'aix_logical_volume', lv, vg, "INTER-POLICY:\s+minimum")
+  end
+end
diff --git a/tests/beaker/tests/aix/create_lv_with_param_type.rb b/tests/beaker/tests/aix/create_lv_with_param_type.rb
@@ -0,0 +1,49 @@
+require 'master_manipulator'
+require 'lvm_helper'
+require 'securerandom'
+
+test_name "FM-4969 - C97368 - create logical volume with param 'type'"
+
+#initilize
+pv = 'hdisk1'
+vg = "VG_" + SecureRandom.hex(2)
+lv = "LV_" + SecureRandom.hex(3)
+
+#Teardown
+teardown do
+  confine_block(:except, :roles => %w{master dashboard database}) do
+    agents.each do |agent|
+      remove_all(agent, pv, vg, lv, aix = true)
+    end
+  end
+end
+
+pp = <<-MANIFEST
+volume_group {'#{vg}':
+  ensure            => present,
+  physical_volumes  => #{pv}
+}
+->
+logical_volume{'#{lv}':
+  ensure        => present,
+  volume_group  => '#{vg}',
+  initial_size  => '5M',
+  type          => 'jfs',
+}
+MANIFEST
+
+step 'Inject "site.pp" on Master'
+site_pp = create_site_pp(master, :manifest => pp)
+inject_site_pp(master, get_site_pp_path(master), site_pp)
+
+step 'Run Puppet Agent to create logical volumes'
+confine_block(:except, :roles => %w{master dashboard database}) do
+  agents.each do |agent|
+    on(agent,"/opt/puppetlabs/puppet/bin/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 with param maximum is created: #{lv}"
+    verify_if_created?(agent, 'aix_logical_volume', lv, vg, "TYPE:\s+jfs")
+  end
+end
diff --git a/tests/beaker/tests/aix/create_physical_volume_on_aix.rb b/tests/beaker/tests/aix/create_physical_volume_on_aix.rb
diff --git a/tests/beaker/tests/aix/create_volume_group_on_aix.rb b/tests/beaker/tests/aix/create_volume_group_on_aix.rb
