Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

consider a valid ipv4 address as a validish ipv4 /32 cidr #10174

Merged
merged 5 commits into from
Jan 15, 2025
Merged

consider a valid ipv4 address as a validish ipv4 /32 cidr #10174

merged 5 commits into from
Jan 15, 2025

Conversation

DaanHoogland
Copy link
Contributor

Description

This PR...

Fixes: #10172

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

  • BLOCKER
  • Critical
  • Major
  • Minor
  • Trivial

Screenshots (if appropriate):

How Has This Been Tested?

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

@DaanHoogland DaanHoogland requested a review from Pearl1594 January 9, 2025 12:21
@DaanHoogland DaanHoogland linked an issue Jan 9, 2025 that may be closed by this pull request
SSVM goes into alert state if secstorage.allowed.internal.sites is set to an IP (not CIDR) #10172
Closed
@codecov Codecov
Copy link

codecov bot commented Jan 9, 2025 •
edited
Loading

Codecov Report

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

Project coverage is 15.12%. Comparing base (afc95f1) to head (03c2598).
Report is 4 commits behind head on 4.19.

Files with missing lines Patch % Lines
.../secondarystorage/SecondaryStorageManagerImpl.java 0.00% 5 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##               4.19   #10174      +/-   ##
============================================
- Coverage     15.12%   15.12%   -0.01%     
  Complexity    11268    11268              
============================================
  Files          5408     5408              
  Lines        473954   473961       +7     
  Branches      57810    57812       +2     
============================================
- Hits          71709    71706       -3     
- Misses       394231   394240       +9     
- Partials       8014     8015       +1
Flag Coverage Δ
uitests 4.30% <ø> (ø)
unittests 15.84% <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.

@DaanHoogland DaanHoogland added this to the 4.19.2 milestone Jan 10, 2025
@DaanHoogland
Update services/secondary-storage/controller/src/main/java/org/apache…
deb353e 
…/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@apache apache deleted a comment from blueorangutan Jan 10, 2025
@DaanHoogland DaanHoogland marked this pull request as ready for review January 10, 2025 12:19
@DaanHoogland
Copy link
Contributor Author

@Pearl1594 , could you verify if this fits your purpose?

@apache apache deleted a comment from blueorangutan Jan 13, 2025
@DaanHoogland
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

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

@wido wido self-requested a review January 13, 2025 13:35
wido
wido approved these changes Jan 13, 2025
View reviewed changes
Copy link
Contributor

@wido wido left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code LGTM

@apache apache deleted a comment from blueorangutan Jan 13, 2025
@apache apache deleted a comment from blueorangutan Jan 13, 2025
@blueorangutan
Copy link

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

@DaanHoogland
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

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

Pearl1594
Pearl1594 approved these changes Jan 14, 2025
View reviewed changes
Copy link
Contributor

@Pearl1594 Pearl1594 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tested. LTGM. However, I am not sure how 0.0.0.0 is to be handled

@blueorangutan
Copy link

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

@DaanHoogland
Update services/secondary-storage/controller/src/main/java/org/apache…
03c2598 
…/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@DaanHoogland
Copy link
Contributor Author

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@DaanHoogland
Copy link
Contributor Author

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

weizhouapache
weizhouapache approved these changes Jan 15, 2025
View reviewed changes
Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code lgtm

@weizhouapache weizhouapache merged commit cf5bd80 into apache:4.19 Jan 15, 2025
25 of 26 checks passed
@weizhouapache weizhouapache mentioned this pull request Jan 15, 2025
Closed
@DaanHoogland DaanHoogland deleted the ghi10172-isValidCidr branch January 15, 2025 14:15
DaanHoogland added a commit that referenced this pull request Jan 15, 2025
@DaanHoogland
Merge release branch 4.20 to main
0c13ded 
* 4.20:
  Rollback of changes with errors during the VM assign (#7061)
  [VMware] Consider CD/DVD drive when calculating next free unit number for volume attachment over IDE controller (#9644)
  consider a valid ipv4 address as a validish ipv4 /32 cidr (#10174)
dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jan 16, 2025
@DaanHoogland @dhslove
consider a valid ipv4 address as a validish ipv4 /32 cidr (apache#10174)
b6ff171 
* consider a valid ipv4 address as a validish ipv4 /32 cidr

* refactor cidr evaluation for internal nets

* Apply suggestions from code review

* Update services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java

* Update services/secondary-storage/controller/src/main/java/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@weizhouapache weizhouapache weizhouapache approved these changes

@Pearl1594 Pearl1594 Pearl1594 approved these changes

@wido wido wido approved these changes

Assignees
No one assigned
Labels
component:secondary-storage component:ssvm
Projects
None yet
Milestone
4.19.2
Development

Successfully merging this pull request may close these issues.

SSVM goes into alert state if secstorage.allowed.internal.sites is set to an IP (not CIDR)
5 participants
@DaanHoogland @blueorangutan @wido @Pearl1594 @weizhouapache