Skip to content

Commit

Permalink
Merge pull request #518 from zhaohuijuan/dev
Browse files Browse the repository at this point in the history 
Update some cloud-init cases to make them applicable to image mode
  • Loading branch information
@zhaohuijuan
zhaohuijuan authored Feb 18, 2025
2 parents 7531451 + fa1a989 commit 45a51d3
Showing 1 changed file with 29 additions and 29 deletions.
58 changes: 29 additions & 29 deletions os_tests/tests/test_cloud_init.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,15 @@ def setUp(self):
utils_lib.init_case(self)
cmd = "sudo systemctl is-enabled cloud-init-local"
utils_lib.run_cmd(self, cmd, cancel_ret='0', msg = "check cloud-init-local is enabled")
# Skip some cases for image mode
case_list = ['test_check_cloudinit_status',
'test_cloudinit_check_runcmd',
'test_cloudinit_check_NOZEROCONF',
'test_cloudinit_auto_install_package_with_subscription_manager']
out = utils_lib.run_cmd(self, 'ls /ostree/ | grep -i bootc')
for case_name in case_list:
if case_name in self.id() and 'bootc' in out:
self.skipTest('skip run as this case is not supported for image mode')

@property
def rhel_x_version(self):
Expand Down Expand Up @@ -1091,11 +1100,11 @@ def test_cloudinit_datasource(self):
expect_ret=0,
expect_kw='{}'.format(name),
msg='check if the datasource is correct')
utils_lib.run_cmd(self,
'cat /run/cloud-init/ds-identify.log | grep datasource',
expect_ret=0,
expect_kw="single entry in datasource_list \({}\) use that.".format(name),
msg='check if found the datasource')
# utils_lib.run_cmd(self,
# 'cat /run/cloud-init/ds-identify.log | grep datasource',
# expect_ret=0,
# expect_kw="single entry in datasource_list \({}\) use that.".format(name),
# msg='check if found the datasource')
else:
utils_lib.run_cmd(self,
'cat /run/cloud-init/cloud.cfg',
Expand Down Expand Up @@ -1232,10 +1241,7 @@ def test_cloudinit_check_runcmd(self):
RHEL-186183 - CLOUDINIT-TC:runcmd module:execute commands
key_steps:
"""
# We will run this case on libvirt when it could customize user-data
out = utils_lib.run_cmd(self, 'ls /ostree/ | grep -i bootc')
if 'bootc' in out:
self.skipTest('skip run as this case is not supported for bootc image')
# We will run this case on libvirt when it could customize user-data
cmd = 'sudo cat /var/log/messages'
utils_lib.run_cmd(self,
cmd,
Expand Down Expand Up @@ -1417,7 +1423,7 @@ def test_cloudinit_no_duplicate_swap(self):
self.assertNotEqual(old_swap, '0',
"Swap size is 0 before cloud-init config")
self.assertEqual(old_swap, new_swap,
"Swap size is not same before and after cloud-init config")
"Swap size is not same before and after cloud-init config. There was issue BIFROST-598 for image mode")
self.assertEqual(old_fstab, new_fstab,
"The /etc/fstab is not same before and after cloud-init config")

Expand Down Expand Up @@ -1572,10 +1578,7 @@ def test_cloudinit_check_NOZEROCONF(self):
3. There is "NOZEROCONF=yes" in /etc/sysconfig/network
"""
self.log.info(
"RHEL-152730 - CLOUDINIT-TC: Check 'NOZEROCONF=yes' in /etc/sysconfig/network")
out = utils_lib.run_cmd(self, 'ls /ostree/ | grep -i bootc')
if 'bootc' in out:
self.skipTest('skip run as this case is not supported for bootc image')
"RHEL-152730 - CLOUDINIT-TC: Check 'NOZEROCONF=yes' in /etc/sysconfig/network")
cmd = 'sudo cat /etc/sysconfig/network'
utils_lib.run_cmd(self,
cmd,
Expand Down Expand Up @@ -2250,10 +2253,7 @@ def test_cloudinit_auto_install_package_with_subscription_manager(self):
2. create VM
3. Verify register with subscription-manager and install package by cloud-init successfully
"""
self.log.info("RHEL-186182 CLOUDINIT-TC:auto install package with subscription manager")
out = utils_lib.run_cmd(self, 'ls /ostree/ | grep -i bootc')
if 'bootc' in out:
self.skipTest('skip run as this case is not supported for bootc image')
self.log.info("RHEL-186182 CLOUDINIT-TC:auto install package with subscription manager")
if self.vm.exists():
self.vm.delete()
time.sleep(30)
Expand Down Expand Up @@ -2511,11 +2511,11 @@ def test_cloudinit_swapon_with_xfs_filesystem(self):
description:
Test swapon when created on a xfs filesystem by cloud-init.
key_steps: |
1. Add additional data disk and format to xfs, mount to /datatest and add to /etc/fstab
1. Add additional data disk and format to xfs, mount to /mnt/datatest and add to /etc/fstab
2. Configure cloud-config and run mounts module
# cat /etc/cloud/cloud.cfg.d/test_swap.cfg
swap:
filename: /datatest/swap.img
filename: /mnt/datatest/swap.img
size: "auto" # or size in bytes
maxsize: 2G
3. Check the swap, verify /datadisk/swap.img exists, verify no error logs in cloud-init.log
Expand All @@ -2538,13 +2538,13 @@ def test_cloudinit_swapon_with_xfs_filesystem(self):
test_part = '/dev/' + utils_lib.run_cmd(self, cmd, expect_ret=0, msg='get test part')
test_part = test_part.strip('\n')
utils_lib.run_cmd(self, "sudo mkfs.xfs {} -f".format(test_part))
utils_lib.run_cmd(self, "sudo mkdir -p /datatest")
utils_lib.run_cmd(self, "sudo mount {} /datatest".format(test_part))
utils_lib.run_cmd(self, "sudo mount|grep /datatest", expect_ret=0, msg="Fail to mount datadisk")
utils_lib.run_cmd(self, "sudo mkdir -p /mnt/datatest")
utils_lib.run_cmd(self, "sudo mount {} /mnt/datatest".format(test_part))
utils_lib.run_cmd(self, "sudo mount|grep /mnt/datatest", expect_ret=0, msg="Fail to mount datadisk")
# Test begin
CONFIG='''\
swap:
filename: /datatest/swap.img
filename: /mnt/datatest/swap.img
size: "8M" # or size in bytes
maxsize: 2G'''
utils_lib.run_cmd(self,'sudo tail /var/log/cloud-init.log')
Expand All @@ -2554,15 +2554,15 @@ def test_cloudinit_swapon_with_xfs_filesystem(self):
new_swap = utils_lib.run_cmd(self, "free -m|grep Swap|awk '{print $2}'")
self.assertAlmostEqual(first=int(old_swap)+7, second=int(new_swap), delta=1,
msg="The enabled swap size does not correct.")
utils_lib.run_cmd(self, "ls /datatest/swap.img", expect_ret=0, msg="/datatest/swap.img doesn't exist.")
utils_lib.run_cmd(self, "ls /mnt/datatest/swap.img", expect_ret=0, msg="/mnt/datatest/swap.img doesn't exist.")
utils_lib.run_cmd(self, "grep swap.img /etc/fstab", expect_ret=0, msg="Fail to add swap to /etc/fstab")
cmd = "grep 'Permission denied' /var/log/cloud-init-output.log"
utils_lib.run_cmd(self, cmd, expect_not_ret=0, msg="There are Permission denied logs in /var/log/cloud-init-output.log")
#teardown
utils_lib.run_cmd(self, "sudo swapoff /datatest/swap.img")
utils_lib.run_cmd(self, "sudo umount /datatest")
utils_lib.run_cmd(self, "sudo rm -rf /datatest")
utils_lib.run_cmd(self, "sudo bash -c \"sed -i '/.*\/datatest.*/d' /etc/fstab\"")
utils_lib.run_cmd(self, "sudo swapoff /mnt/datatest/swap.img")
utils_lib.run_cmd(self, "sudo umount /mnt/datatest")
utils_lib.run_cmd(self, "sudo rm -rf /mnt/datatest")
utils_lib.run_cmd(self, "sudo bash -c \"sed -i '/.*\/mnt\/datatest.*/d' /etc/fstab\"")

def _generate_password(self, password, hash, salt=''):
import crypt
Expand Down

0 comments on commit 45a51d3

Please sign in to comment.