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.

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

fix(distrib): Updated installer script to write all interface names to snapshot file #5522

Merged
merged 1 commit into from
Nov 7, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions kura/distrib/src/main/resources/common/customize_snapshot.py
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ def main():

interfaces_list = "lo"

for i, eth_name in enumerate(eth_names[:2]):
for i, eth_name in enumerate(eth_names):
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)
Comment on lines +93 to 94
Copy link
Contributor

Choose a reason for hiding this comment

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

I would try to keep this more explicit since, in the future, we don't know whether the template will change. Therefore I would suggest something like:

Suggested change
for i, eth_name in enumerate(eth_names):
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)
for i, eth_name in enumerate(eth_names):
if i < 2: # only replace the template content with the first two network interfaces
snapshot_content = snapshot_content.replace('ETH_INTERFACE_' + str(i), eth_name)

interfaces_list += "," + eth_name
logging.info("%s : replaced ETH_INTERFACE_%s with %s", SNAPSHOT_FILENAME, str(i), eth_name)

for i, wlan_name in enumerate(wlan_names[:1]):
for i, wlan_name in enumerate(wlan_names):
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)
Comment on lines +98 to 99
Copy link
Contributor

Choose a reason for hiding this comment

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

Same thing here:

Suggested change
for i, wlan_name in enumerate(wlan_names):
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)
for i, wlan_name in enumerate(wlan_names):
if i < 1: # only replace the template content with the first network interface
snapshot_content = snapshot_content.replace('WIFI_INTERFACE_' + str(i), wlan_name)

interfaces_list += "," + wlan_name
logging.info("%s : replaced WIFI_INTERFACE_%s with %s", SNAPSHOT_FILENAME, str(i), wlan_name)
Expand Down
Loading