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

extend nmcli autoconnect-retries and autoconnect-slaves to replace default value #6299

Merged
merged 1 commit into from
May 8, 2019

Conversation

bybai
Copy link
Contributor

@bybai bybai commented May 8, 2019

The PR is to fix issue

#6228

The modification include

When activate NICs on some servers, nmcli con up <con_name> is timeout, so I add extend nmcli autoconnect-retries and autoconnect-slaves to replace default value, the connect can retry activate itself and its slaves.

autoconnect-retries int32 -1 The number of times a connection should be tried when autoactivating before giving up. Zero means forever, -1 means the global default (4 times if not overridden). Setting this to 1 means to try activation only once before blocking autoconnect. Note that after a timeout, NetworkManager will try to autoconnect again.
autoconnect-slaves NMSettingConnectionAutoconnectSlaves (int32)   Whether or not slaves of this connection should be automatically brought up when NetworkManager activates this connection. This only has a real effect for master connections. The properties "autoconnect", "autoconnect-priority" and "autoconnect-retries" are unrelated to this setting. The permitted values are: 0: leave slave connections untouched, 1: activate all the slave connections with this connection, -1: default. If -1 (default) is set, global connection.autoconnect-slaves is read to determine the real value. If it is default as well, this fallbacks to 0.

The UT result

The following auto test cases are passed:

]# grep END /opt/xcat/bin/../share/xcat/tools/autotest/result//performance.report.20190507233039
END::confignetwork_2eth_bridge_br0::Passed::Time:Tue May  7 23:32:00 2019 ::Duration::77 sec
END::confignetwork_2eth_bridge_br22_br33::Passed::Time:Tue May  7 23:34:07 2019 ::Duration::127 sec
END::confignetwork__bridge_false::Passed::Time:Tue May  7 23:34:33 2019 ::Duration::26 sec
END::confignetwork_bond_eth2_eth3::Passed::Time:Tue May  7 23:35:20 2019 ::Duration::47 sec
END::confignetwork_bond_false::Passed::Time:Tue May  7 23:35:54 2019 ::Duration::34 sec
END::confignetwork_disable_set_to_1::Passed::Time:Tue May  7 23:36:02 2019 ::Duration::8 sec
END::confignetwork_disable_set_to_yes::Passed::Time:Tue May  7 23:36:10 2019 ::Duration::8 sec
END::confignetwork_installnic_2eth_bridge_br22_br33::Passed::Time:Tue May  7 23:38:17 2019 ::Duration::127 sec
END::confignetwork_niccustomscripts::Passed::Time:Tue May  7 23:38:25 2019 ::Duration::8 sec
END::confignetwork_s_installnic_secondarynic_updatenode::Passed::Time:Tue May  7 23:38:47 2019 ::Duration::22 sec
END::confignetwork_secondarynic_nicaliases_updatenode::Passed::Time:Tue May  7 23:39:04 2019 ::Duration::17 sec
END::confignetwork_secondarynic_nicextraparams_updatenode::Passed::Time:Tue May  7 23:39:25 2019 ::Duration::21 sec
END::confignetwork_secondarynic_nicips_updatenode_false::Passed::Time:Tue May  7 23:39:32 2019 ::Duration::7 sec
END::confignetwork_secondarynic_nicnetworks_updatenode_false::Passed::Time:Tue May  7 23:39:38 2019 ::Duration::6 sec
END::confignetwork_secondarynic_nictype_updatenode_false::Passed::Time:Tue May  7 23:39:45 2019 ::Duration::7 sec
END::confignetwork_secondarynic_thirdnic_multiplevalue_updatenode::Passed::Time:Tue May  7 23:40:09 2019 ::Duration::24 sec
END::confignetwork_secondarynic_updatenode::Passed::Time:Tue May  7 23:40:23 2019 ::Duration::14 sec
END::confignetwork_vlan_bond::Passed::Time:Tue May  7 23:41:05 2019 ::Duration::42 sec
END::confignetwork_vlan_eth0::Passed::Time:Tue May  7 23:41:35 2019 ::Duration::30 sec
END::confignetwork_vlan_false::Passed::Time:Tue May  7 23:41:57 2019 ::Duration::22 sec

@bybai bybai requested a review from zet809 May 8, 2019 03:51
@bybai bybai added this to the 2.15 milestone May 8, 2019
@zet809
Copy link

zet809 commented May 8, 2019

Good to me, I agree to merge. thx @bybai

@zet809 zet809 merged commit cbaa115 into xcat2:master May 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants