importvm: fix IP address allocation on Shared networks #11811

weizhouapache · 2025-10-09T08:36:30Z

Description

This PR fixes #11799

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):

How Has This Been Tested?

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

harikrishna-patnala

code LGTM.

Better to test it with shared, L2 and isolated network types.

harikrishna-patnala · 2025-10-09T08:42:22Z

@blueorangutan package

blueorangutan · 2025-10-09T08:44:05Z

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

codecov · 2025-10-09T08:45:17Z

Codecov Report

❌ Patch coverage is 28.57143% with 10 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.17%. Comparing base (4d95f08) to head (49c449f).
⚠️ Report is 1 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...tack/engine/orchestration/NetworkOrchestrator.java	30.76%	8 Missing and 1 partial ⚠️
.../apache/cloudstack/vm/UnmanagedVMsManagerImpl.java	0.00%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #11811      +/-   ##
============================================
- Coverage     16.17%   16.17%   -0.01%     
- Complexity    13297    13299       +2     
============================================
  Files          5656     5656              
  Lines        498331   498338       +7     
  Branches      60476    60478       +2     
============================================
+ Hits          80591    80592       +1     
- Misses       408767   408774       +7     
+ Partials       8973     8972       -1

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`17.02% <28.57%> (-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.

blueorangutan · 2025-10-09T10:10:05Z

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

nvazquez · 2025-10-09T10:16:35Z

@blueorangutan package

blueorangutan · 2025-10-09T10:18:04Z

@nvazquez 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-10-09T12:55:49Z

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

weizhouapache · 2025-10-09T13:04:14Z

@blueorangutan test

blueorangutan · 2025-10-09T13:06:04Z

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

blueorangutan · 2025-10-10T05:49:26Z

[SF] Trillian test result (tid-14602)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 56425 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr11811-t14602-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

Copilot

Pull Request Overview

This PR fixes IP address allocation for importing VMs on Shared networks by updating the import process to handle Shared networks instead of just Basic zones.

Refactored IP allocation logic to handle Shared networks specifically instead of relying on Basic zone logic
Removed unused imports and injection dependencies for IpAddressManager
Updated method naming to reflect the change from Basic zone to Shared network handling

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
UnmanagedVMsManagerImpl.java	Removed unused IP address allocation code and dependencies, simplified IP address initialization
NetworkOrchestrator.java	Updated IP allocation logic to handle Shared networks instead of Basic zones, renamed method accordingly

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

vishesh92

clgtm. I did very basic testing by importing the VM from the shared disk. Earlier an IP was assigned to the imported VM (stopped state). After these changes, no IP is assigned to the imported VM. When the VM is started, an IP will be allocated. This should allow the user to import more VMs than the available IPs. But the start VM will probably fail due to unavailability of IPs.

weizhouapache · 2025-10-10T07:19:26Z

clgtm. I did very basic testing by importing the VM from the shared disk. Earlier an IP was assigned to the imported VM (stopped state). After these changes, no IP is assigned to the imported VM. When the VM is started, an IP will be allocated. This should allow the user to import more VMs than the available IPs. But the start VM will probably fail due to unavailability of IPs.

thanks @vishesh92 for the testing

I think it would be better to allocate an IP when VM is imported (not started).
what's your opinions ? @nvazquez @harikrishna-patnala @rajujith

harikrishna-patnala · 2025-10-10T07:57:59Z

clgtm. I did very basic testing by importing the VM from the shared disk. Earlier an IP was assigned to the imported VM (stopped state). After these changes, no IP is assigned to the imported VM. When the VM is started, an IP will be allocated. This should allow the user to import more VMs than the available IPs. But the start VM will probably fail due to unavailability of IPs.

thanks @vishesh92 for the testing

I think it would be better to allocate an IP when VM is imported (not started). what's your opinions ? @nvazquez @harikrishna-patnala @rajujith

yes I do agree @weizhouapache but with this PR it is supposed to get an IP during import itself right, except for L2 network. Do we need more changes then ?

weizhouapache · 2025-10-10T08:00:36Z

thanks @vishesh92 for the testing
I think it would be better to allocate an IP when VM is imported (not started). what's your opinions ? @nvazquez @harikrishna-patnala @rajujith

yes I do agree @weizhouapache but with this PR it is supposed to get an IP during import itself right, except for L2 network. Do we need more changes then ?

thanks @harikrishna-patnala

I tested import of Running vms on L2/shared/isolated, all worked
However, for stopped vm, as @vishesh92 tested, "After these changes, no IP is assigned to the imported VM."
it looks more changes are needed

I will test it

weizhouapache · 2025-10-10T09:12:40Z

pushed a commit to update IP state on shared network

weizhouapache · 2025-10-10T09:40:32Z

@blueorangutan package

blueorangutan · 2025-10-10T09:42:06Z

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

weizhouapache · 2025-10-10T10:27:58Z

@blueorangutan package

weizhouapache · 2025-10-10T10:29:34Z

@vishesh92
Update PR to automatically allocate an IP

on Isolated network: should be same as current behaviour
on Shared network: fix the IP allocation issue in Basic zone and Advanced zone

rajujith

Looks good except for the IP not getting allocated along with import.

weizhouapache · 2025-10-10T11:44:34Z

@blueorangutan package

blueorangutan · 2025-10-10T11:46: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.

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

Looks good except for the IP not getting allocated along with import.

thanks @rajujith
I discussed it with Vishesh, and pushed a commit to auto-allocate an IP on the network (it is not included in current packages)
can you test with new packages are ready ?

blueorangutan · 2025-10-10T11:49:17Z

Packaging result [SF]: ✖️ debian. SL-JID 15396

vishesh92 · 2025-10-10T11:50:21Z

@blueorangutan package

blueorangutan · 2025-10-10T11:52:04Z

@vishesh92 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-10-10T11:53:00Z

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

vishesh92

clgtm

rajujith · 2025-10-10T12:18:01Z

@blueorangutan package

blueorangutan · 2025-10-10T12:20:05Z

@rajujith 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-10-10T13:56:26Z

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

weizhouapache · 2025-10-10T14:20:26Z

@blueorangutan test

blueorangutan · 2025-10-10T14:21:05Z

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

weizhouapache · 2025-10-10T21:13:20Z

@blueorangutan test

blueorangutan · 2025-10-10T21:14:04Z

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

blueorangutan · 2025-10-11T15:12:14Z

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

Test	Result	Time (s)	Test File
test_02_enableHumanReadableLogs	`Error`	0.63	test_human_readable_logs.py
test_01_primary_storage_nfs	`Error`	0.25	test_primary_storage.py
ContextSuite context=TestStorageTags>:setup	`Error`	0.43	test_primary_storage.py
test_01_primary_storage_scope_change	`Error`	0.29	test_primary_storage_scope.py

rajujith

LGTM
Tested, import works and the IP address is allocated during import in a basic zone.

weizhouapache · 2025-10-13T06:16:38Z

LGTM Tested, import works and the IP address is allocated during import in a basic zone.

thanks @rajujith @vishesh92 @harikrishna-patnala for the testing and review

Merging

importvm: fix IP address allocation on Shared networks

8c4dbd4

boring-cyborg bot added the component:orchestration label Oct 9, 2025

weizhouapache requested review from harikrishna-patnala, nvazquez and rajujith October 9, 2025 08:36

harikrishna-patnala approved these changes Oct 9, 2025

View reviewed changes

harikrishna-patnala added this to the 4.20.2 milestone Oct 9, 2025

weizhouapache linked an issue Oct 9, 2025 that may be closed by this pull request

ImportVm in Basic zone fails #11799

Closed

weizhouapache added the status:needs-testing label Oct 9, 2025

weizhouapache marked this pull request as ready for review October 9, 2025 13:04

vishesh92 self-assigned this Oct 10, 2025

vishesh92 requested a review from Copilot October 10, 2025 06:52

Copilot AI reviewed Oct 10, 2025

View reviewed changes

vishesh92 approved these changes Oct 10, 2025

View reviewed changes

weizhouapache marked this pull request as draft October 10, 2025 08:40

Update 11811: update ip on shared network to Allocated state

80ebaae

Update 11811: update ip domain_id and account_id

9be6362

Update 11811: automatically allocate IP address on non-L2 networks

49c449f

rajujith reviewed Oct 10, 2025

View reviewed changes

vishesh92 approved these changes Oct 10, 2025

View reviewed changes

rajujith approved these changes Oct 13, 2025

View reviewed changes

weizhouapache marked this pull request as ready for review October 13, 2025 06:15

weizhouapache merged commit 86cad79 into apache:4.20 Oct 13, 2025
42 of 43 checks passed

weizhouapache mentioned this pull request Oct 13, 2025

ImportVm in Basic zone fails #11799

Closed

DaanHoogland deleted the 4.20-fix-importvm-shared-network branch October 13, 2025 06:33

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Oct 17, 2025

importvm: fix IP address allocation on Shared networks (apache#11811)

659f0a0

importvm: fix IP address allocation on Shared networks #11811

importvm: fix IP address allocation on Shared networks #11811

Uh oh!

Conversation

weizhouapache commented Oct 9, 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!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

harikrishna-patnala commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

nvazquez commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

weizhouapache commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 9, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

vishesh92 left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

harikrishna-patnala commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

rajujith left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

weizhouapache commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

vishesh92 commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

blueorangutan commented Oct 10, 2025

Uh oh!

codecov bot commented Oct 9, 2025 •

edited

Loading

rajujith left a comment •

edited

Loading