refactoring a few smoke tests #11748

slavkap · 2025-09-29T09:08:02Z

Description

Added few more tests scenarios and refactoring

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

How Has This Been Tested?

ran the smoke tests

codecov · 2025-09-29T09:16:51Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 17.60%. Comparing base (9dee137) to head (4028c0b).
⚠️ Report is 25 commits behind head on 4.22.

Additional details and impacted files

@@             Coverage Diff              @@
##              4.22   #11748       +/-   ##
============================================
+ Coverage     3.60%   17.60%   +13.99%     
- Complexity       0    15615    +15615     
============================================
  Files          445     5911     +5466     
  Lines        37628   530126   +492498     
  Branches      6947    64781    +57834     
============================================
+ Hits          1356    93304    +91948     
- Misses       36106   426319   +390213     
- Partials       166    10503    +10337

Flag	Coverage Δ
uitests	`3.60% <ø> (+<0.01%)`	⬆️
unittests	`18.66% <ø> (?)`

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

harikrishna-patnala · 2025-09-30T04:17:16Z

@blueorangutan package

blueorangutan · 2025-09-30T04:18:04Z

@harikrishna-patnala a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2025-09-30T05:39:38Z

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 15229

DaanHoogland · 2025-10-01T08:54:10Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        Snapshot.delete(snapshot, self.userapiclient, self.zone.id)
        self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.additional_zone.id])
-        self.cleanup.append(snapshot)
+        self._cleanup.append(snapshot)


isn’t the snapshot to be removed from the cleanup list here?

@slavkap per test items should go in the cleanup list not in the _cleanup list.

Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

@DaanHoogland, the cleanup is left on purpose for the class because there is a required time.sleep() and I don't want to delay the tests execution with invoking it in each test case

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

Copilot

Pull Request Overview

This PR refactors smoke tests by adding new test scenarios, improving cleanup management, and modifying storage pool configuration. The changes focus on improving test structure and adding coverage for virtual machine deployment scenarios with snapshots and volumes across multiple zones.

Refactored storage pool tag handling to use existing tags instead of hardcoded values
Added proper cleanup management by using _cleanup lists for resources
Added new test methods for VM deployment scenarios from snapshots and volumes

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

File	Description
test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py	Refactored storage pool tag configuration and added VM cleanup management
test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py	Added new test methods, improved cleanup handling, and added utility methods for VM deployment
test/integration/plugins/storpool/sp_util.py	Added new disk offering configuration and template definition with debug logging

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

Copilot · 2025-10-10T07:42:59Z

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

                "displaytext": "Disk offering with tags",
                "disksize":8,
-                "tags": "test-vm"
+                "tags": cls.zone_wide_storage.tags


Same potential AttributeError as above - cls.zone_wide_storage.tags may not exist or could be None.

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

vishesh92

Just reviewed the PR. Same comments as Daan.

rajujith · 2026-01-12T08:34:52Z

@slavkap Since this is for the 4.22.1 release, could you retarget the PR to the 4.22 branch?

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 9 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-01-28T07:19:43Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+                                                )
+        self._cleanup.append(virtual_machine)
+        try:
+            ssh_client = virtual_machine.get_ssh_client()


This helper adds the created VM to self._cleanup (class-level), which defers deletion until tearDownClass. Given this class already uses self.cleanup in tearDown() for test-scoped resources, consider using self.cleanup here too so each test cleans up its own VM and doesn't leave extra VMs around for subsequent tests in the same class.

Copilot · 2026-01-28T07:19:44Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+
+    @skipTestIf("testsNotSupported")
+    @attr(tags=["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"], required_hardware="false")
+    def test_07_take_snapshot_multi_zone_deply_vm_additional_zone(self):


test_07_take_snapshot_multi_zone_deply_vm_additional_zone has a typo in the test name ("deply" -> "deploy"). This makes the test name harder to search/understand and is inconsistent with the other test names in this file.

Suggested change

def test_07_take_snapshot_multi_zone_deply_vm_additional_zone(self):

def test_07_take_snapshot_multi_zone_deploy_vm_additional_zone(self):

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

Copilot · 2026-01-28T07:19:45Z

test/integration/plugins/storpool/sp_util.py

+        logging.debug("new list %s" % new_list)
+        logging.debug("zone IDs %s" % zone_ids)
+        logging.debug("snapshot entries %s" % snapshot_entries)
        if len(new_list) != len(zone_ids):
-            cls.fail("Undesired list snapshot size for multiple zones")
+            raise Exception("Undesired list snapshot size for multiple zones")


StorPoolHelper.verify_snapshot_copies now raises exceptions for some failure cases, but it still calls cls.fail(...) earlier in the method when Snapshot.list doesn't return a list. Since StorPoolHelper is not a unittest.TestCase, cls.fail is not defined and that path will raise AttributeError instead of a clear test failure. Replace that remaining cls.fail usage with an exception/AssertionError for consistency and correct error reporting.

Copilot · 2026-01-28T07:19:45Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+                                                )
+        self._cleanup.append(virtual_machine)
+        try:
+            ssh_client = virtual_machine.get_ssh_client()


This helper appends the created VM to self._cleanup (class-level), so it won't be deleted until tearDownClass. Since this test class already uses self.cleanup + tearDown() for per-test cleanup, consider adding the VM to self.cleanup instead to avoid accumulating running VMs across tests (unless you intentionally need the VM to persist across multiple test cases).

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

Copilot · 2026-01-28T07:19:45Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+                                                )
+        self._cleanup.append(virtual_machine)
+        try:
+            ssh_client = virtual_machine.get_ssh_client()


Variable ssh_client is not used.

Copilot · 2026-01-28T07:19:46Z

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

+        self.cleanup.append(self.virtual_machine)
        try:
-            ssh_client = virtual_machine.get_ssh_client()
+            ssh_client = self.virtual_machine.get_ssh_client()


Variable ssh_client is not used.

Copilot · 2026-01-28T07:19:46Z

test/integration/smoke/test_vm_lifecycle_with_snapshot_or_volume.py

+        self.cleanup.append(self.virtual_machine)
        try:
-            ssh_client = virtual_machine.get_ssh_client()
+            ssh_client = self.virtual_machine.get_ssh_client()


Variable ssh_client is not used.

DaanHoogland · 2026-01-28T11:38:17Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        """

        snapshot = Snapshot.create(self.userapiclient,volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)


Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

DaanHoogland · 2026-01-28T11:38:44Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        """

        snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)


Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

@DaanHoogland, the cleanup is left on purpose for the class because there is a required time.sleep() and I don't want to delay the tests execution with invoking it in each test case

but the creation does need to happen in the test?
seems strangely asymmetrical and I would have to think if my mind can handle this… ;)

btw, if it is really needed please leave a don’t-do-this-at-home warning with it?

DaanHoogland · 2026-01-28T11:39:12Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        """

        snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id)
+        self._cleanup.append(snapshot)


Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

DaanHoogland · 2026-01-28T11:39:36Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        Snapshot.delete(snapshot, self.userapiclient, self.zone.id)
        self.helper.verify_snapshot_copies(self.userapiclient, self.snapshot_id, [self.additional_zone.id])
-        self.cleanup.append(snapshot)
+        self._cleanup.append(snapshot)


Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

DaanHoogland · 2026-01-28T11:39:58Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

                service
            )
-            self.cleanup.append(self.disk_offering)
+            self._cleanup.append(self.disk_offering)


Suggested change

self._cleanup.append(self.disk_offering)

self.cleanup.append(self.disk_offering)

DaanHoogland · 2026-01-28T11:40:22Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

        """Test to take volume snapshot in multiple StorPool primary storages in diff zones and create a volume in one of the additional zones
        """
        snapshot = Snapshot.create(self.userapiclient, volume_id=self.volume.id, zoneids=[str(self.additional_zone.id)], usestoragereplication=True)
+        self._cleanup.append(snapshot)


Suggested change

self._cleanup.append(snapshot)

self.cleanup.append(snapshot)

DaanHoogland · 2026-01-28T11:41:19Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+                                                volumeid=volume.id,
+                                                mode="basic",
+                                                )
+        self._cleanup.append(virtual_machine)


Suggested change

self._cleanup.append(virtual_machine)

self.cleanup.append(virtual_machine)

DaanHoogland · 2026-01-28T11:41:36Z

test/integration/plugins/storpool/test_snapshot_copy_on_primary_storage.py

+                                                snapshotid=snapshot.id,
+                                                mode="basic",
+                                                )
+        self._cleanup.append(virtual_machine)


Suggested change

self._cleanup.append(virtual_machine)

self.cleanup.append(virtual_machine)

boring-cyborg bot added component:integration-test Python Warning... Python code Ahead! labels Sep 29, 2025

harikrishna-patnala added this to the 4.22.0 milestone Sep 30, 2025

DaanHoogland reviewed Oct 1, 2025

View reviewed changes

vishesh92 requested a review from Copilot October 10, 2025 07:42

vishesh92 self-assigned this Oct 10, 2025

Copilot AI reviewed Oct 10, 2025

View reviewed changes

vishesh92 reviewed Oct 10, 2025

View reviewed changes

harikrishna-patnala modified the milestones: 4.22.0, 4.22.1 Nov 12, 2025

rajujith added this to Apache CloudStack 4.22.1 Jan 5, 2026

sureshanaparti moved this to In Progress in Apache CloudStack 4.22.1 Jan 7, 2026

DaanHoogland changed the base branch from main to 4.22 January 12, 2026 09:35

Slavka Peleva added 2 commits January 27, 2026 15:55

refactor smoke tests

28bcdfc

addressed comments

147c0b1

slavkap force-pushed the refactor-tests branch from c90c4b8 to 147c0b1 Compare January 27, 2026 14:09

vishesh92 requested a review from Copilot January 28, 2026 07:11

Copilot started reviewing on behalf of vishesh92 January 28, 2026 07:11 View session

Copilot AI reviewed Jan 28, 2026

View reviewed changes

DaanHoogland requested changes Jan 28, 2026

View reviewed changes

addressed comments

4028c0b

	def test_07_take_snapshot_multi_zone_deply_vm_additional_zone(self):
	def test_07_take_snapshot_multi_zone_deploy_vm_additional_zone(self):

	self._cleanup.append(self.disk_offering)
	self.cleanup.append(self.disk_offering)

	self._cleanup.append(virtual_machine)
	self.cleanup.append(virtual_machine)

refactoring a few smoke tests #11748

Are you sure you want to change the base?

refactoring a few smoke tests #11748

Conversation

slavkap commented Sep 29, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

How Has This Been Tested?

Uh oh!

codecov bot commented Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

harikrishna-patnala commented Sep 30, 2025

Uh oh!

blueorangutan commented Sep 30, 2025

Uh oh!

blueorangutan commented Sep 30, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Copilot AI Oct 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

rajujith commented Jan 12, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Jan 28, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov bot commented Sep 29, 2025 •

edited

Loading