Skip to content

Reapply "Use all interfaces when finding the private IP" #12439

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
Merged
jonathan-eq merged 2 commits into from
Jan 8, 2026
Merged

Reapply "Use all interfaces when finding the private IP" #12439

jonathan-eq merged 2 commits into from
Jan 8, 2026

Conversation

@jonathan-eq
Copy link
Contributor

@jonathan-eq jonathan-eq commented Dec 3, 2025 •
edited
Loading

  • Add optional flag to prioritize private IPs, default false
  • Update tests for correct ip address fetching

This reverts commit 75b190d.

Issue
Resolves ##12238

Approach
Short description of the approach

(Screenshot of new behavior in GUI if applicable)

  • PR title captures the intent of the changes, and is fitting for release notes.
  • Added appropriate release note label
  • Commit history is consistent and clean, in line with the contribution guidelines.
  • Make sure unit tests pass locally after every commit (git rebase -i main --exec 'just rapid-tests')

When applicable

  • When there are user facing changes: Updated documentation
  • New behavior or changes to existing untested code: Ensured that unit tests are added (See Ground Rules).
  • Large PR: Prepare changes in small commits for more convenient review
  • Bug fix: Add regression test for the bug
  • Bug fix: Add backport label to latest release (format: 'backport release-branch-name')

@jonathan-eq jonathan-eq added the release-notes:improvement Automatically categorise as improvement in release notes label Dec 3, 2025
@jonathan-eq jonathan-eq added this to SCOUT Dec 3, 2025
@jonathan-eq jonathan-eq moved this to In Progress in SCOUT Dec 3, 2025
@codecov-commenter
Copy link

codecov-commenter commented Dec 3, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 90.24390% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 90.62%. Comparing base (01695ab) to head (1804458).
⚠️ Report is 44 commits behind head on main.
✅ All tests successful. No failed tests found.

Files with missing lines Patch % Lines
src/ert/config/ert_config.py 55.55% 4 Missing ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #12439      +/-   ##
==========================================
+ Coverage   90.54%   90.62%   +0.07%     
==========================================
  Files         432      430       -2     
  Lines       29391    29492     +101     
==========================================
+ Hits        26612    26727     +115     
+ Misses       2779     2765      -14
Flag Coverage Δ
cli-tests 37.92% <75.60%> (+0.24%) ⬆️
gui-tests 68.58% <34.14%> (-0.63%) ⬇️
performance-and-unit-tests 74.38% <90.24%> (+0.26%) ⬆️
test 38.57% <24.39%> (+0.04%) ⬆️

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.

@codspeed-hq
Copy link

codspeed-hq bot commented Dec 3, 2025 •
edited
Loading

CodSpeed Performance Report

Merging #12439 will not alter performance

Comparing jonathan-eq:add-private-and-public-network (1804458) with main (57f3324)

Summary

✅ 22 untouched

@jonathan-eq jonathan-eq removed this from SCOUT Dec 3, 2025
@jonathan-eq jonathan-eq mentioned this pull request Dec 3, 2025
Open
@jonathan-eq jonathan-eq force-pushed the add-private-and-public-network branch 3 times, most recently from a95f39e to 3255a46 Compare December 4, 2025 13:48
@flikka @jonathan-eq
Reapply "Use all interfaces when finding the private IP"
eb1972a 
- Add optional flag to prioritize private IPs, default false
- Update tests for correct ip address fetching

This reverts commit 75b190d.
@jonathan-eq jonathan-eq force-pushed the add-private-and-public-network branch 3 times, most recently from b10c1b9 to e70f52a Compare December 5, 2025 07:08
xjules
xjules reviewed Dec 15, 2025
View reviewed changes
docs/ert/reference/configuration/keywords.rst
PRIORITIZE_PRIVATE_IP_ADDRESS
-----------------------------

The PRIORITIZE_PRIVATE_IP_ADDRESS key is used to specify if the IP address
Copy link
Contributor

@xjules xjules Dec 15, 2025

Choose a reason for hiding this comment

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

I'd be more clear with the message.
Some network setups require private IP for communication between ERT and forward models.

Also not sure if this wording is good:
This defaults to FALSE, therefore using the private IP address of the machine running Ert.

Shouldn't it be other-way around?

Copy link
Contributor Author

@jonathan-eq jonathan-eq Dec 15, 2025

Choose a reason for hiding this comment

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

Yes, youre right :)

@jonathan-eq
Add config keyword for PRIORITIZE_PRIVATE_IP_ADDRESS
1804458 
This commit adds the new config keyword `PRIORITIZE_PRIVATE_IP_ADDRESS`,
letting the user specify in their config/site_config if Ert should
communicate with the fm_dispatch event reporter over the host's public
or private IP address. If this setting is incorrect, the event reporter
will not be able to reach Ert, and no granular forward model step
updates will be available in the GUI.
@jonathan-eq jonathan-eq force-pushed the add-private-and-public-network branch from e70f52a to 1804458 Compare December 15, 2025 13:55
xjules
xjules reviewed Dec 15, 2025
View reviewed changes
src/ert/shared/net_utils.py

# Select first non-empty value, based on prioritization
if prioritize_private:
selected_ip = private or public or loopback
Copy link
Contributor

@xjules xjules Dec 15, 2025

Choose a reason for hiding this comment

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

nice, I didn't know about this ""==False :)

xjules
xjules approved these changes Dec 15, 2025
View reviewed changes
Copy link
Contributor

@xjules xjules left a comment

Choose a reason for hiding this comment

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

nice one @jonathan-eq ! 🚀
I think the release label should cover that it is user facing also.

@jonathan-eq jonathan-eq added the release-notes:user-impact Automatically categorise as breaking for people using CLI/GUI label Dec 15, 2025
@jonathan-eq jonathan-eq merged commit 998d029 into equinor:main Jan 8, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@xjules xjules xjules approved these changes

Assignees

No one assigned

Labels

release-notes:improvement Automatically categorise as improvement in release notes release-notes:user-impact Automatically categorise as breaking for people using CLI/GUI

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@jonathan-eq @codecov-commenter @xjules @flikka