From 8ac53de10a106cb14131050cf32187ff3eed41d5 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Mon, 11 Sep 2017 01:12:36 +0200 Subject: [PATCH 1/4] - Add Vagrantfile for developing tests with vagrant and testing them in both C6 and C7 - Tweak .gitignore for vagrant --- .gitignore | 1 + Vagrantfile | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 4c5f88af..59eff500 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ *~ .*.swp +.vagrant/ diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 00000000..fac95167 --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,33 @@ +# -*- mode: ruby -*- +# vi: set ft=ruby : + +Vagrant.configure("2") do |config| + + config.vm.provider "virtualbox" do |vb| + vb.memory = "1024" + end + + config.vm.provider "libvirt" do |lv| + lv.memory = "1024" + end + + + config.vm.define "target_c7" do |target_c7| + target_c7.vm.box = "centos/7" + end + + config.vm.define "target_c6" do |target_c6| + target_c6.vm.box = "centos/6" + end + + #C5 is EOL + #config.vm.define "target_c5" do |target_c5| + # target_c5.vm.box = "centos/5" + #end + + config.vm.provision "shell", inline: <<-SHELL + yum -y update + yum -y install vim-enhanced emacs-nox nano + SHELL + +end From 8d7bf3cab65cea962574a00d339b67f83a3e2589 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Mon, 11 Sep 2017 01:14:39 +0200 Subject: [PATCH 2/4] Remove extra spaces --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index fac95167..ed539497 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -2,7 +2,7 @@ # vi: set ft=ruby : Vagrant.configure("2") do |config| - + config.vm.provider "virtualbox" do |vb| vb.memory = "1024" end @@ -27,7 +27,7 @@ Vagrant.configure("2") do |config| config.vm.provision "shell", inline: <<-SHELL yum -y update - yum -y install vim-enhanced emacs-nox nano + yum -y install vim-enhanced emacs-nox nano SHELL end From faefbd9094a392c399b17926bb658f93fbb1e170 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Mon, 11 Sep 2017 01:14:59 +0200 Subject: [PATCH 3/4] Add LVM tests --- tests/p_lvm2/00-install-lvm2.sh | 5 +++++ tests/p_lvm2/01-setup_lo_devs.sh | 18 ++++++++++++++++ tests/p_lvm2/05-test-lvm2.sh | 10 +++++++++ tests/p_lvm2/06-create-new-vg-lv-test.sh | 18 ++++++++++++++++ tests/p_lvm2/07-extend-vg-resize-lv-tests.sh | 16 ++++++++++++++ tests/p_lvm2/08-pvmove-test.sh | 17 +++++++++++++++ .../p_lvm2/09-create-new-mirrored-lv-test.sh | 21 +++++++++++++++++++ tests/p_lvm2/99-lvm-tests-cleanup.sh | 21 +++++++++++++++++++ 8 files changed, 126 insertions(+) create mode 100755 tests/p_lvm2/00-install-lvm2.sh create mode 100755 tests/p_lvm2/01-setup_lo_devs.sh create mode 100755 tests/p_lvm2/05-test-lvm2.sh create mode 100755 tests/p_lvm2/06-create-new-vg-lv-test.sh create mode 100755 tests/p_lvm2/07-extend-vg-resize-lv-tests.sh create mode 100755 tests/p_lvm2/08-pvmove-test.sh create mode 100755 tests/p_lvm2/09-create-new-mirrored-lv-test.sh create mode 100755 tests/p_lvm2/99-lvm-tests-cleanup.sh diff --git a/tests/p_lvm2/00-install-lvm2.sh b/tests/p_lvm2/00-install-lvm2.sh new file mode 100755 index 00000000..36db1b30 --- /dev/null +++ b/tests/p_lvm2/00-install-lvm2.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +# Should be installed by default +t_InstallPackage lvm2 diff --git a/tests/p_lvm2/01-setup_lo_devs.sh b/tests/p_lvm2/01-setup_lo_devs.sh new file mode 100755 index 00000000..38fcd21c --- /dev/null +++ b/tests/p_lvm2/01-setup_lo_devs.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - setting up loopback devices for LVM tests." + +# We need a fixed path for the other tests to avoid exporting variables + +#img_temp_dir=`mktemp -d /tmp/img_temp_dir.XXXXXXXXXX` +img_temp_dir="/tmp/t_lvm_temp_dir" + +# Create few disk images and loopback devices +mkdir -p $img_temp_dir +for i in `seq 0 4` ; do + dd if=/dev/zero of=$img_temp_dir/disk${i}.img bs=64K count=8192 + losetup -f $img_temp_dir/disk${i}.img +done + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/05-test-lvm2.sh b/tests/p_lvm2/05-test-lvm2.sh new file mode 100755 index 00000000..c85cc24e --- /dev/null +++ b/tests/p_lvm2/05-test-lvm2.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Basic LVM tests." + +pvs &&\ +vgs &&\ +lvs + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/06-create-new-vg-lv-test.sh b/tests/p_lvm2/06-create-new-vg-lv-test.sh new file mode 100755 index 00000000..ef593f16 --- /dev/null +++ b/tests/p_lvm2/06-create-new-vg-lv-test.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Create new Volume Group and Logical volume tests" + + +disk0=`losetup -a | grep t_lvm_temp_dir/disk0.img | cut -d: -f1` + +pvcreate $disk0 && \ +vgcreate vg_t_lvm $disk0 &&\ +lvcreate -n lv_t_lvm_test -L 200m vg_t_lvm &&\ +mkfs.ext4 /dev/vg_t_lvm/lv_t_lvm_test &&\ +mkdir /mnt/t_lvm_test &&\ +mount /dev/vg_t_lvm/lv_t_lvm_test /mnt/t_lvm_test &&\ +touch /mnt/t_lvm_test/test + + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/07-extend-vg-resize-lv-tests.sh b/tests/p_lvm2/07-extend-vg-resize-lv-tests.sh new file mode 100755 index 00000000..1f9d12e3 --- /dev/null +++ b/tests/p_lvm2/07-extend-vg-resize-lv-tests.sh @@ -0,0 +1,16 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Extend Volume Group and resize Logical volume tests" + + +disk1=`losetup -a | grep t_lvm_temp_dir/disk1.img | cut -d: -f1` + +pvcreate $disk1 &&\ +vgextend vg_t_lvm $disk1 &&\ +lvresize -L +600m /dev/vg_t_lvm/lv_t_lvm_test &&\ +resize2fs /dev/vg_t_lvm/lv_t_lvm_test &&\ +touch /mnt/t_lvm_test/test &&\ +umount /mnt/t_lvm_test + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/08-pvmove-test.sh b/tests/p_lvm2/08-pvmove-test.sh new file mode 100755 index 00000000..998346e1 --- /dev/null +++ b/tests/p_lvm2/08-pvmove-test.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Move PEs from a PV to another test." + + +disk0=`losetup -a | grep t_lvm_temp_dir/disk0.img | cut -d: -f1` +disk2=`losetup -a | grep t_lvm_temp_dir/disk2.img | cut -d: -f1` + +pvcreate $disk2 &&\ +vgextend vg_t_lvm $disk2 &&\ +pvmove $disk0 $disk2 &&\ +mount /dev/vg_t_lvm/lv_t_lvm_test /mnt/t_lvm_test &&\ +touch /mnt/t_lvm_test/test &&\ +umount /mnt/t_lvm_test + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/09-create-new-mirrored-lv-test.sh b/tests/p_lvm2/09-create-new-mirrored-lv-test.sh new file mode 100755 index 00000000..7fc26a7a --- /dev/null +++ b/tests/p_lvm2/09-create-new-mirrored-lv-test.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Create new Volume Group and Mirrored Logical volume tests" + + +disk3=`losetup -a | grep t_lvm_temp_dir/disk3.img | cut -d: -f1` +disk4=`losetup -a | grep t_lvm_temp_dir/disk4.img | cut -d: -f1` + +pvcreate $disk3 && \ +pvcreate $disk4 && \ +vgcreate vg_t_lvm_mirror $disk3 $disk4 &&\ +lvcreate -m1 -L 300m -n lv_mirror_test vg_t_lvm_mirror +mkfs.ext4 /dev/vg_t_lvm_mirror/lv_mirror_test &&\ +mkdir /mnt/t_lvm_mirror &&\ +mount /dev/vg_t_lvm_mirror/lv_mirror_test /mnt/t_lvm_mirror &&\ +touch /mnt/t_lvm_mirror/test &&\ +umount /mnt/t_lvm_mirror + + +t_CheckExitStatus $? diff --git a/tests/p_lvm2/99-lvm-tests-cleanup.sh b/tests/p_lvm2/99-lvm-tests-cleanup.sh new file mode 100755 index 00000000..5a73a005 --- /dev/null +++ b/tests/p_lvm2/99-lvm-tests-cleanup.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# Author: Athmane Madjoudj + +t_Log "Running $0 - Remove LV/VG/PV tests" + + +disk0=`losetup -a | grep t_lvm_temp_dir/disk0.img | cut -d: -f1` +disk1=`losetup -a | grep t_lvm_temp_dir/disk1.img | cut -d: -f1` +disk2=`losetup -a | grep t_lvm_temp_dir/disk2.img | cut -d: -f1` +disk3=`losetup -a | grep t_lvm_temp_dir/disk3.img | cut -d: -f1` +disk4=`losetup -a | grep t_lvm_temp_dir/disk4.img | cut -d: -f1` + +lvremove -f /dev/vg_t_lvm/lv_t_lvm_test && \ +lvremove -f /dev/vg_t_lvm_mirror/lv_mirror_test && \ +vgremove -f vg_t_lvm && \ +vgremove -f vg_t_lvm_mirror && \ +pvremove -fy $disk0 $disk1 $disk2 $disk3 $disk4 &&\ +losetup -D + + +t_CheckExitStatus $? From 91a50d73c0b761d0f7f2cefa32ea0bf851a0c362 Mon Sep 17 00:00:00 2001 From: Athmane Madjoudj Date: Mon, 11 Sep 2017 01:31:04 +0200 Subject: [PATCH 4/4] Adapt losetup since it does not support bulk detach on c6 --- tests/p_lvm2/99-lvm-tests-cleanup.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/p_lvm2/99-lvm-tests-cleanup.sh b/tests/p_lvm2/99-lvm-tests-cleanup.sh index 5a73a005..f3b91965 100755 --- a/tests/p_lvm2/99-lvm-tests-cleanup.sh +++ b/tests/p_lvm2/99-lvm-tests-cleanup.sh @@ -9,13 +9,14 @@ disk1=`losetup -a | grep t_lvm_temp_dir/disk1.img | cut -d: -f1` disk2=`losetup -a | grep t_lvm_temp_dir/disk2.img | cut -d: -f1` disk3=`losetup -a | grep t_lvm_temp_dir/disk3.img | cut -d: -f1` disk4=`losetup -a | grep t_lvm_temp_dir/disk4.img | cut -d: -f1` +all_disks="$disk0 $disk1 $disk2 $disk3 $disk4" lvremove -f /dev/vg_t_lvm/lv_t_lvm_test && \ lvremove -f /dev/vg_t_lvm_mirror/lv_mirror_test && \ vgremove -f vg_t_lvm && \ vgremove -f vg_t_lvm_mirror && \ -pvremove -fy $disk0 $disk1 $disk2 $disk3 $disk4 &&\ -losetup -D +pvremove -fy $all_disks &&\ +(for disk in $all_disks ; do losetup -d $disk ; done) t_CheckExitStatus $?