Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true by Pearl1594 · Pull Request #10168 · apache/cloudstack

Pearl1594 · 2025-01-08T18:03:17Z

Description

Fixes: #10114
This PR adds necessary check for IP range for shared Networks.

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?

DaanHoogland · 2025-01-08T18:06:55Z

@Pearl1594 in the expected result in #10114 it says

VM should get successfully deployed with ACS automatically allocating a VLAN

So that is not true? instead it is

VM deployment should fail with an appropriate error message

?

DaanHoogland

code looks good if we accept that deployment fails.

Pearl1594 · 2025-01-08T18:09:37Z

@Pearl1594 in the expected result in #10114 it says
VM should get successfully deployed with ACS automatically allocating a VLAN
So that is not true? instead it is
VM deployment should fail with an appropriate error message
?

Initially when I reported the issue, I thought the issue was with specifyVlan - as broadcast URI ends up being null. However, on further investigation the reason for it was IP address not being passed. With missing inputs it's not possible to have a successful deployment.
I will change the issue description.

codecov · 2025-01-08T18:46:03Z

Codecov Report

Attention: Patch coverage is 0% with 2 lines in your changes missing coverage. Please review.

Project coverage is 15.14%. Comparing base (f652ad0) to head (665283a).
Report is 16 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
...ain/java/com/cloud/network/NetworkServiceImpl.java	0.00%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.19   #10168   +/-   ##
=========================================
  Coverage     15.14%   15.14%           
- Complexity    11282    11283    +1     
=========================================
  Files          5408     5408           
  Lines        473823   473825    +2     
  Branches      57826    57827    +1     
=========================================
+ Hits          71763    71764    +1     
  Misses       394038   394038           
- Partials       8022     8023    +1

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

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

DaanHoogland

clgtm

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

…ip-range-checks-sharednet

DaanHoogland · 2025-01-27T13:52:00Z

@Pearl1594 can you update on this?

DaanHoogland · 2025-01-27T14:30:10Z

@blueorangutan package

blueorangutan · 2025-01-27T14:32:03Z

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

DaanHoogland

clgtm

DaanHoogland · 2025-01-27T15:12:45Z

@bernardodemarco @weizhouapache are your questions addressed to satisfaction?

blueorangutan · 2025-01-27T15:33:34Z

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

bernardodemarco

clgtm

DaanHoogland · 2025-01-28T11:38:25Z

@blueorangutan test keepEnv

blueorangutan · 2025-01-28T11:40:03Z

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

Pearl1594 · 2025-01-28T12:47:36Z

I think this PR needs some more work, as there is a case that when we do not have any services provided by the network offering used by the shared network, it essentially behaves like an L2 network; hence there shouldn't be a need to specify IP range. However, when an IP range isn't specified, the nic is created with no broadcast_uri, which eventually results in an NPE on the agent side. Would need some investigation. cc @DaanHoogland @weizhouapache @sureshanaparti
We may want to move this to 4.20.1

weizhouapache

code lgtm

weizhouapache · 2025-01-28T13:56:45Z

@blueorangutan package

blueorangutan · 2025-01-28T13:58: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.

sonarqubecloud · 2025-01-28T14:39:29Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
25.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

blueorangutan · 2025-01-28T14:59:42Z

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

weizhouapache · 2025-01-28T16:11:48Z

@blueorangutan test

blueorangutan · 2025-01-28T16:14:04Z

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

blueorangutan · 2025-01-29T01:33:09Z

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

Test	Result	Time (s)	Test File
test_02_list_cpvm_vm	`Failure`	0.05	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.05	test_ssvm.py
test_01_secure_vm_migration	`Error`	134.38	test_vm_life_cycle.py
test_01_secure_vm_migration	`Error`	134.38	test_vm_life_cycle.py

blueorangutan · 2025-01-29T05:25:33Z

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

Test	Result	Time (s)	Test File
ContextSuite context=TestClusterDRS>:setup	`Error`	0.00	test_cluster_drs.py

DaanHoogland

clgtm

DaanHoogland · 2025-01-31T10:37:55Z

the proper error message is returned (tested in a lab env)

…etwork revert part of apache#10168

revert part of #10168

…g has no services - specifyvlan = true (apache#10168)

revert part of apache#10168

Add checks if IP range is passed if Shared Network

524fff4

Pearl1594 requested review from DaanHoogland and weizhouapache January 8, 2025 18:03

boring-cyborg bot added the component:networking label Jan 8, 2025

DaanHoogland reviewed Jan 8, 2025

View reviewed changes

weizhouapache reviewed Jan 8, 2025

View reviewed changes

server/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated Show resolved Hide resolved

DaanHoogland added this to the 4.19.2 milestone Jan 9, 2025

DaanHoogland approved these changes Jan 10, 2025

View reviewed changes

DaanHoogland self-requested a review January 10, 2025 08:40

Pearl1594 linked an issue Jan 23, 2025 that may be closed by this pull request

Broadcast URI not set for Shared networks when IP(v4) range not provided #10114

Closed

Pearl1594 mentioned this pull request Jan 24, 2025

Unable to delete shared network (specifyVlan=false and no services) #10261

Closed

bernardodemarco reviewed Jan 24, 2025

View reviewed changes

server/src/main/java/com/cloud/network/NetworkServiceImpl.java Outdated Show resolved Hide resolved

Merge branch '4.19' of https://github.com/apache/cloudstack into add-…

bf7ae51

…ip-range-checks-sharednet

Pearl1594 added 2 commits January 27, 2025 08:52

fix missing import

13a5ad8

fix log statement

9ea0eb0

DaanHoogland approved these changes Jan 27, 2025

View reviewed changes

DaanHoogland added the status:needs-testing label Jan 27, 2025

bernardodemarco approved these changes Jan 27, 2025

View reviewed changes

Pearl1594 marked this pull request as draft January 28, 2025 12:48

DaanHoogland removed the status:needs-testing label Jan 28, 2025

weizhouapache linked an issue Jan 28, 2025 that may be closed by this pull request

Unable to delete shared network (specifyVlan=false and no services) #10261

Closed

Check if associated networkId is passed when specify vlan is false

665283a

Pearl1594 requested review from DaanHoogland, bernardodemarco and weizhouapache January 28, 2025 13:44

Pearl1594 changed the title ~~Add checks if IP range is passed if Shared Network~~ Allow creation of Shared Networks without IP range if network offering has no services - specifyvlan = true Jan 28, 2025

Pearl1594 marked this pull request as ready for review January 28, 2025 13:45

weizhouapache approved these changes Jan 28, 2025

View reviewed changes

DaanHoogland approved these changes Jan 29, 2025

View reviewed changes

DaanHoogland added the status:needs-testing label Jan 29, 2025

DaanHoogland removed the status:needs-testing label Jan 31, 2025

DaanHoogland merged commit 5447950 into 4.19 Jan 31, 2025
48 of 50 checks passed

DaanHoogland deleted the add-ip-range-checks-sharednet branch January 31, 2025 10:38

DaanHoogland mentioned this pull request Jan 31, 2025

Broadcast URI not set for Shared networks when IP(v4) range not provided #10114

Closed

weizhouapache mentioned this pull request Apr 6, 2025

Creating Shared Network is failing when using specifyVlan is false #10664

Closed

DaanHoogland added a commit to shapeblue/cloudstack that referenced this pull request Apr 14, 2025

remove condition for associated network when !specifyvlan in shared n…

9c78d22

…etwork revert part of apache#10168

weizhouapache pushed a commit that referenced this pull request Apr 16, 2025

server: check startip and endip of shared network (#10704)

53d3d19

revert part of #10168

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

Allow creation of Shared Networks without IP range if network offerin…

fb061dd

…g has no services - specifyvlan = true (apache#10168)

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

server: check startip and endip of shared network (apache#10704)

7d84ead

revert part of apache#10168

Conversation

Pearl1594 commented Jan 8, 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!

DaanHoogland commented Jan 8, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Pearl1594 commented Jan 8, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

DaanHoogland commented Jan 27, 2025

Uh oh!

DaanHoogland commented Jan 27, 2025

Uh oh!

blueorangutan commented Jan 27, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jan 27, 2025

Uh oh!

blueorangutan commented Jan 27, 2025

Uh oh!

bernardodemarco left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jan 28, 2025

Uh oh!

blueorangutan commented Jan 28, 2025

Uh oh!

Pearl1594 commented Jan 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Jan 28, 2025

Uh oh!

blueorangutan commented Jan 28, 2025

Uh oh!

sonarqubecloud bot commented Jan 28, 2025

Quality Gate passed

Uh oh!

blueorangutan commented Jan 28, 2025

Uh oh!

weizhouapache commented Jan 28, 2025

Uh oh!

blueorangutan commented Jan 28, 2025

Uh oh!

blueorangutan commented Jan 29, 2025

Uh oh!

blueorangutan commented Jan 29, 2025

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Jan 31, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

codecov bot commented Jan 8, 2025 •

edited

Loading

Pearl1594 commented Jan 28, 2025 •

edited

Loading

DaanHoogland commented Jan 31, 2025 •

edited

Loading