Import KVM VM: Autodetect vlan id from bridge name #11507

abh1sar · 2025-08-25T13:04:31Z

Description

This PR fixes #11183

Vlan id is shown correctly in the Import VM Form instead of -1.
The default network selected in the form is retrieved using the vlan id.

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

Bug Severity

Screenshots (if appropriate):

Before fix:

After fix:

Before match default network with vlan in UI change:

After:

How Has This Been Tested?

How did you try to break this feature and the system with this change?

.../hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java

codecov · 2025-08-25T13:12:47Z

Codecov Report

❌ Patch coverage is 0% with 17 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.17%. Comparing base (adec5f4) to head (ea5e1c0).
⚠️ Report is 16 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...ervisor/kvm/resource/LibvirtComputingResource.java	0.00%	11 Missing ⚠️
...er/LibvirtGetUnmanagedInstancesCommandWrapper.java	0.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##               4.20   #11507    +/-   ##
==========================================
  Coverage     16.17%   16.17%            
- Complexity    13290    13295     +5     
==========================================
  Files          5656     5656            
  Lines        498020   498121   +101     
  Branches      60405    60431    +26     
==========================================
+ Hits          80545    80569    +24     
- Misses       408513   408584    +71     
- Partials       8962     8968     +6

Flag	Coverage Δ
uitests	`4.00% <ø> (-0.01%)`	⬇️
unittests	`17.02% <0.00%> (+<0.01%)`	⬆️

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.

abh1sar · 2025-08-29T09:49:06Z

@blueorangutan package

blueorangutan · 2025-08-29T09:50:03Z

@abh1sar 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-08-29T11:01:15Z

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

weizhouapache · 2025-09-03T13:52:12Z

@blueorangutan package

blueorangutan · 2025-09-03T13:54:04Z

@weizhouapache 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-03T15:07:23Z

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

weizhouapache · 2025-09-04T16:23:10Z

@blueorangutan package

blueorangutan · 2025-09-04T16:24:08Z

@weizhouapache 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-04T19:42:15Z

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

weizhouapache · 2025-09-04T19:47:40Z

@blueorangutan test ubuntu24 kvm-ubuntu24

blueorangutan · 2025-09-04T19:50:15Z

@weizhouapache a [SL] Trillian-Jenkins test job (ubuntu24 mgmt + kvm-ubuntu24) has been kicked to run smoke tests

blueorangutan · 2025-09-04T20:15:16Z

[SF] Trillian Build Failed (tid-14215)

weizhouapache · 2025-09-05T05:53:03Z

@blueorangutan package

blueorangutan · 2025-09-05T05:54:08Z

@weizhouapache 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-05T08:14:49Z

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

weizhouapache · 2025-09-05T08:44:13Z

@blueorangutan package

blueorangutan · 2025-09-05T08:46:03Z

@weizhouapache 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-05T09:55:55Z

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

…bridge name

blueorangutan · 2025-09-10T06:39:27Z

[SF] Trillian test result (tid-14258)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 54386 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11507-t14258-kvm-ol8.zip
Smoke tests completed. 141 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

…infinte loop

abh1sar · 2025-09-10T09:33:26Z

@blueorangutan package

blueorangutan · 2025-09-10T09:34:04Z

@abh1sar 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.

weizhouapache · 2025-09-10T09:53:38Z

@blueorangutan ui

blueorangutan · 2025-09-10T09:54:03Z

@weizhouapache a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2025-09-10T10:11:28Z

UI build: ✔️
Live QA URL: https://qa.cloudstack.cloud/simulator/pr/11507 (QA-JID-745)

blueorangutan · 2025-09-10T11:13:15Z

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

weizhouapache · 2025-09-10T11:57:10Z

@abh1sar
thanks for the update

is it ready for testing/review ?

weizhouapache · 2025-09-10T14:39:07Z

@blueorangutan test

blueorangutan · 2025-09-10T14:40:04Z

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

…etwork

abh1sar · 2025-09-10T15:24:59Z

@abh1sar thanks for the update

is it ready for testing/review ?

@weizhouapache unfortunately, that commit didn't fix the issue. I have added another commit which should fix it.

abh1sar · 2025-09-10T15:25:46Z

@blueorangutan package

weizhouapache · 2025-09-10T15:26:58Z

@abh1sar thanks for the update
is it ready for testing/review ?

@weizhouapache unfortunately, that commit didn't fix the issue. I have added another commit which should fix it.

good, thanks @abh1sar

abh1sar · 2025-09-10T15:38:16Z

@blueorangutan package

blueorangutan · 2025-09-10T15:40:07Z

@abh1sar 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-10T17:25:31Z

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

abh1sar · 2025-09-10T17:29:03Z

@blueorangutan test

blueorangutan · 2025-09-10T17:30:03Z

@abh1sar a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

abh1sar · 2025-09-11T01:56:50Z

@weizhouapache this is ready for review/testing now.

weizhouapache · 2025-09-11T08:37:41Z

looks good

vm is attached to bridge with vlan 2472

vm is attached to bridge without virtual nic with vlanid

vm is not attached to bridge

weizhouapache · 2025-09-11T08:38:29Z

We had some issues with the testing environments.
Merging on approvals and manual test results. Will keep eye on smoke tests of the health check PR

blueorangutan · 2025-09-11T12:12:16Z

[SF] Trillian test result (tid-14282)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 64276 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11507-t14282-kvm-ol8.zip
Smoke tests completed. 137 look OK, 4 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestSetSourceNatIp>:setup	`Error`	0.00	test_set_sourcenat.py
ContextSuite context=TestSharedFSLifecycle>:setup	`Error`	0.00	test_sharedfs_lifecycle.py
ContextSuite context=TestSnapshotRootDisk>:setup	`Error`	0.00	test_snapshots.py
ContextSuite context=TestSnapshotStandaloneBackup>:setup	`Error`	0.00	test_snapshots.py
test_12_list_user_webhook_deliveries	`Failure`	11.37	test_webhook_lifecycle.py

* Get vlan from bridge name while importing kvm instances * Fix LibvirtReplugNicCommandWrapperTest * Cleanup MultiNetworkSelection.vue * getting the vlanid from the /proc/net/vlan/<pif> file instead of the bridge name * Update plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetUnmanagedInstancesCommandWrapper.java Co-authored-by: dahn <[email protected]> * Don't call sendValuesTimed from getDefaultNetwork as it's causing an infinte loop * set default network values in setDefaultValues instead of getDefaultNetwork --------- Co-authored-by: Wei Zhou <[email protected]> Co-authored-by: dahn <[email protected]>

boring-cyborg bot added component:kvm component:UI labels Aug 25, 2025

weizhouapache reviewed Aug 25, 2025

View reviewed changes

.../hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtDomainXMLParser.java Outdated Show resolved Hide resolved

abh1sar marked this pull request as draft August 27, 2025 07:22

weizhouapache linked an issue Aug 29, 2025 that may be closed by this pull request

Improve VLAN detection for importing KVM instances #11183

Closed

abh1sar marked this pull request as ready for review August 29, 2025 09:45

abh1sar requested a review from weizhouapache August 29, 2025 09:46

abh1sar added 4 commits September 8, 2025 10:42

Get vlan from bridge name while importing kvm instances

24a0383

Fix LibvirtReplugNicCommandWrapperTest

5d2e664

Cleanup MultiNetworkSelection.vue

bb066cd

getting the vlanid from the /proc/net/vlan/<pif> file instead of the …

9f78d8f

…bridge name

abh1sar marked this pull request as draft September 10, 2025 04:07

Don't call sendValuesTimed from getDefaultNetwork as it's causing an …

896b43b

…infinte loop

set default network values in setDefaultValues instead of getDefaultN…

ea5e1c0

…etwork

abh1sar marked this pull request as ready for review September 11, 2025 01:54

weizhouapache merged commit e64e94a into apache:4.20 Sep 11, 2025
23 of 26 checks passed

weizhouapache mentioned this pull request Sep 11, 2025

Improve VLAN detection for importing KVM instances #11183

Closed

DaanHoogland deleted the vlanid-import-kvm branch September 15, 2025 07:15

Import KVM VM: Autodetect vlan id from bridge name #11507

Import KVM VM: Autodetect vlan id from bridge name #11507

Uh oh!

Conversation

abh1sar commented Aug 25, 2025

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

How did you try to break this feature and the system with this change?

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

abh1sar commented Aug 29, 2025

Uh oh!

blueorangutan commented Aug 29, 2025

Uh oh!

blueorangutan commented Aug 29, 2025

Uh oh!

weizhouapache commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

blueorangutan commented Sep 3, 2025

Uh oh!

weizhouapache commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

weizhouapache commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

blueorangutan commented Sep 4, 2025

Uh oh!

weizhouapache commented Sep 5, 2025

Uh oh!

blueorangutan commented Sep 5, 2025

Uh oh!

blueorangutan commented Sep 5, 2025

Uh oh!

weizhouapache commented Sep 5, 2025

Uh oh!

blueorangutan commented Sep 5, 2025

Uh oh!

blueorangutan commented Sep 5, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

abh1sar commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

weizhouapache commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

weizhouapache commented Sep 10, 2025

Uh oh!

weizhouapache commented Sep 10, 2025

Uh oh!

blueorangutan commented Sep 10, 2025

Uh oh!

abh1sar commented Sep 10, 2025

Uh oh!

abh1sar commented Sep 10, 2025

Uh oh!

weizhouapache commented Sep 10, 2025

codecov bot commented Aug 25, 2025 •

edited

Loading

weizhouapache commented Sep 11, 2025 •

edited

Loading