Update CIDR/Gateway of the Shared Networks from Guest IP ranges #11249

sureshanaparti · 2025-07-20T17:34:33Z

Description

This PR updates the CIDR/Gateway of the Shared Networks from Guest IP ranges.

CIDR/Gateway list are maintained for shared networks in networks table (null when there are no Guest IP ranges), and only the first one would be returned through the list networks response (for backward compatibility).

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?

Created a shared network with gateway/netmask/startip/endip, Checked the network cidr/gateway after the following operations - added more guest ip ranges to the shared network, removed some ranges and added new ranges, removed all ranges and added new ranges. Deployed instances on the shared network.

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

Copilot

Pull Request Overview

This PR enhances shared network functionality by allowing network CIDR and gateway fields to store comma-separated values representing multiple IP ranges. When guest IP ranges are added or removed from a shared network, the corresponding CIDR and gateway values are automatically updated to reflect all active ranges.

Adds utility methods for managing comma-separated strings and extracting first values
Modifies network CIDR/gateway management to support multiple values during IP range operations
Updates API responses to display only the first CIDR/gateway value for backward compatibility

Reviewed Changes

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

Show a summary per file

File	Description
StringUtils.java	Adds utility methods for comma-separated string manipulation and first value extraction
ConfigurationManagerImpl.java	Updates VLAN creation/deletion to maintain network CIDR/gateway lists
ApiResponseHelper.java	Modifies network response to show first CIDR/gateway value only
schema-41930to41940.sql	Increases database column sizes for CIDR and gateway fields
schema-41930to41940-cleanup.sql	Empty cleanup script for database migration
Upgrade41930to41940.java	Database upgrade handler for version 4.19.3.0 to 4.19.4.0
Upgrade41920to41930.java	Database upgrade handler for version 4.19.2.0 to 4.19.3.0
DatabaseUpgradeChecker.java	Registers new upgrade handlers in the upgrade chain

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql

utils/src/main/java/com/cloud/utils/StringUtils.java

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

sureshanaparti · 2025-07-20T17:44:09Z

@blueorangutan package

blueorangutan · 2025-07-20T17:46:04Z

@sureshanaparti 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-07-20T17:51:54Z

Codecov Report

❌ Patch coverage is 0% with 112 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.76%. Comparing base (0d4147f) to head (500d375).

Files with missing lines	Patch %	Lines
.../cloud/configuration/ConfigurationManagerImpl.java	0.00%	54 Missing ⚠️
...com/cloud/network/element/BigSwitchBcfElement.java	0.00%	27 Missing ⚠️
...ils/src/main/java/com/cloud/utils/StringUtils.java	0.00%	22 Missing ⚠️
...src/main/java/com/cloud/api/ApiResponseHelper.java	0.00%	9 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main   #11249      +/-   ##
============================================
- Coverage     16.76%   16.76%   -0.01%     
+ Complexity    14285    14283       -2     
============================================
  Files          5767     5767              
  Lines        512657   512734      +77     
  Branches      62359    62370      +11     
============================================
- Hits          85950    85941       -9     
- Misses       417108   417194      +86     
  Partials       9599     9599

Flag	Coverage Δ
uitests	`3.85% <ø> (ø)`
unittests	`17.68% <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.

blueorangutan · 2025-07-20T19:05:52Z

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

sureshanaparti · 2025-07-20T19:34:20Z

@blueorangutan test

blueorangutan · 2025-07-20T19:36:05Z

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

blueorangutan · 2025-07-21T08:57:46Z

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

Test	Result	Time (s)	Test File

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql

github-actions · 2025-07-25T14:23:22Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

…(and some code improvements)

sureshanaparti · 2025-07-25T14:27:33Z

@blueorangutan package

blueorangutan · 2025-07-25T14:28:03Z

@sureshanaparti 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-07-25T15:40:39Z

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

sureshanaparti · 2025-07-25T16:05:22Z

@blueorangutan package

blueorangutan · 2025-07-25T16:06:04Z

@sureshanaparti 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-07-25T17:35:19Z

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

nvazquez · 2025-07-25T19:48:16Z

@blueorangutan test

blueorangutan · 2025-07-25T19:50:04Z

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

blueorangutan · 2025-07-26T12:17:17Z

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

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.25	test_metrics_api.py

DaanHoogland

clgtm

DaanHoogland · 2025-07-26T13:47:13Z

@blueorangutan test keepEnv

blueorangutan · 2025-07-26T13:48:03Z

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

blueorangutan · 2025-07-27T07:07:57Z

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

Test	Result	Time (s)	Test File
test_list_zones_metrics	`Error`	0.24	test_metrics_api.py

nvazquez

LGTM

boring-cyborg bot added the component:networking label Jul 20, 2025

sureshanaparti requested review from weizhouapache, DaanHoogland and Copilot July 20, 2025 17:36

sureshanaparti added the status:needs-testing label Jul 20, 2025

Copilot AI reviewed Jul 20, 2025

View reviewed changes

sureshanaparti added this to the 4.19.4 milestone Jul 20, 2025

sureshanaparti commented Jul 20, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql Outdated Show resolved Hide resolved

sureshanaparti commented Jul 20, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql Outdated Show resolved Hide resolved

sureshanaparti commented Jul 20, 2025

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti commented Jul 20, 2025

View reviewed changes

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java Outdated Show resolved Hide resolved

sureshanaparti marked this pull request as ready for review July 21, 2025 10:40

sureshanaparti mentioned this pull request Jul 25, 2025

[WIP] Allow CIDR update for the shared network when the network IPs are not in use #10839

Closed

14 tasks

DaanHoogland reviewed Jul 25, 2025

View reviewed changes

sureshanaparti requested review from nvazquez and Pearl1594 July 25, 2025 12:41

sureshanaparti modified the milestones: 4.19.4, 4.20.2, 4.21.0 Jul 25, 2025

nvazquez reviewed Jul 25, 2025

View reviewed changes

engine/schema/src/main/resources/META-INF/db/schema-41930to41940.sql Outdated Show resolved Hide resolved

sureshanaparti force-pushed the cidr-gateway-from-guest-ip-ranges-for-shared-nw branch from 01ef7f3 to 278a0b4 Compare July 25, 2025 14:23

boring-cyborg bot added the component:agent label Jul 25, 2025

boring-cyborg bot added the component:integration label Jul 25, 2025

github-actions bot added the status:has-conflicts label Jul 25, 2025

sureshanaparti changed the base branch from 4.19 to main July 25, 2025 14:24

sureshanaparti closed this Jul 25, 2025

sureshanaparti reopened this Jul 25, 2025

sureshanaparti added 2 commits July 25, 2025 19:56

Update CIDR/Gateway of the shared network from the Guest IP range(s) …

d072584

…(and some code improvements)

code improvements

500d375

sureshanaparti force-pushed the cidr-gateway-from-guest-ip-ranges-for-shared-nw branch from 278a0b4 to 500d375 Compare July 25, 2025 14:26

github-actions bot removed the status:has-conflicts label Jul 25, 2025

sureshanaparti requested review from nvazquez and DaanHoogland July 25, 2025 14:27

sureshanaparti assigned DaanHoogland Jul 25, 2025

DaanHoogland approved these changes Jul 26, 2025

View reviewed changes

nvazquez approved these changes Jul 27, 2025

View reviewed changes

Update CIDR/Gateway of the Shared Networks from Guest IP ranges #11249

Are you sure you want to change the base?

Update CIDR/Gateway of the Shared Networks from Guest IP ranges #11249

Conversation

sureshanaparti commented Jul 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sureshanaparti commented Jul 20, 2025

Uh oh!

blueorangutan commented Jul 20, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Jul 20, 2025

Uh oh!

sureshanaparti commented Jul 20, 2025

Uh oh!

blueorangutan commented Jul 20, 2025

Uh oh!

blueorangutan commented Jul 21, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Jul 25, 2025

Uh oh!

sureshanaparti commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 25, 2025

Uh oh!

sureshanaparti commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 25, 2025

Uh oh!

nvazquez commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 25, 2025

Uh oh!

blueorangutan commented Jul 26, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jul 26, 2025

Uh oh!

blueorangutan commented Jul 26, 2025

Uh oh!

blueorangutan commented Jul 27, 2025

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

sureshanaparti commented Jul 20, 2025 •

edited

Loading

codecov bot commented Jul 20, 2025 •

edited

Loading