Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Yaniv Bronhaim has submitted this change and it was merged. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. netinfo, tool: Add a vdsm-tool to determine bonding defaults offline dump-bonding-defaults reads bonding option defaults (per mode) and saves them to /var/lib/vdsm/bonding-defaults.json. VDSM loads the file once at runtime and refers to this static information of defaults when reporting bonding options of bonds in the system. As the bonding defaults are bound to the used kernel it is the responsibility of the packager (or the sysadmin in customized setups) to regenerate the file by running (during the build, or installation, respectively): vdsm-tool dump-bonding-defaults It is currently not advised to run the tool on startup because NetworkManager may ifup the reference bond, making the tool unable to determine all options. Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1142701 Signed-off-by: Ondřej Svoboda osvob...@redhat.com Reviewed-on: http://gerrit.ovirt.org/33528 Reviewed-by: Antoni Segura Puimedon asegu...@redhat.com Reviewed-by: Dan Kenigsberg dan...@redhat.com --- M debian/vdsm-python.install M debian/vdsm.install M init/vdsmd_init_common.sh.in M lib/vdsm/netinfo.py M lib/vdsm/tool/Makefile.am A lib/vdsm/tool/dump_bonding_defaults.py M tests/netinfoTests.py M vdsm.spec.in M vdsm/Makefile.am A vdsm/bonding-defaults.json M vdsm/sudoers.vdsm.in 11 files changed, 543 insertions(+), 48 deletions(-) Approvals: Ondřej Svoboda: Verified Antoni Segura Puimedon: Looks good to me, but someone else must approve Dan Kenigsberg: Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 3: Build Failed http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-fc19-x86_64_merged/50/ : FAILURE http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-fc20-x86_64_merged/46/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-el6-x86_64_merged/52/ : FAILURE http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms-el7-x86_64_merged/51/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 2: Build Failed http://jenkins.ovirt.org/job/vdsm_3.5_network_functional_tests_gerrit/13/ : There was an infra issue, please contact in...@ovirt.org -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Dan Kenigsberg has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 2: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Antoni Segura Puimedon has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 2: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 2: Verified+1 All tests passed and bonding options are reported as expected. -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Yaniv Bronhaim has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: can't merge. please rebase -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: -Code-Review Now we can consider the patches for merging into the stable branch. -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Dan Kenigsberg has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: Code-Review+1 Note that the followup patch must be taken in with this one. -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Yaniv Bronhaim has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: Code-Review+2 -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Antoni Segura Puimedon asegu...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: This patch is pending for 3.5.1 -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: I am inclined to squash the follow-up fix into this patch, putting TWO Change-Ids to indicate what commits on master were used to form the squashed one. Would that be acceptable? -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Dan Kenigsberg has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: Verified-1 unit test seems to fail when run on a clean setup please fix on master branch by mocking the missing file == FAIL: testGetBondingOptions (netinfoTests.TestNetinfo) -- Traceback (most recent call last): File /builddir/build/BUILD/vdsm-4.16.0/tests/testValidation.py, line 105, in wrapper return f(*args, **kwargs) File /builddir/build/BUILD/vdsm-4.16.0/tests/testValidation.py, line 134, in wrapper return f(*args, **kwargs) File /builddir/build/BUILD/vdsm-4.16.0/tests/netinfoTests.py, line 319, in testGetBondingOptions opt.write(INTERVAL) File /usr/lib64/python2.7/contextlib.py, line 35, in __exit__ self.gen.throw(type, value, traceback) File /builddir/build/BUILD/vdsm-4.16.0/tests/testlib.py, line 323, in not_raises raise test_case.failureException(Exception raised: %s % e) AssertionError: Exception raised: [Errno 2] No such file or directory: '/var/lib/vdsm/bonding-defaults.json' -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has uploaded a new change for review. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. netinfo, tool: Add a vdsm-tool to determine bonding defaults offline dump-bonding-defaults reads bonding option defaults (per mode) and saves them to /var/lib/vdsm/bonding-defaults.json. VDSM loads the file once at runtime and refers to this static information of defaults when reporting bonding options of bonds in the system. As the bonding defaults are bound to the used kernel it is the responsibility of the packager (or the sysadmin in customized setups) to regenerate the file by running (during the build, or installation, respectively): vdsm-tool dump-bonding-defaults It is currently not advised to run the tool on startup because NetworkManager may ifup the reference bond, making the tool unable to determine all options. Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1142701 Signed-off-by: Ondřej Svoboda osvob...@redhat.com --- M debian/vdsm-python.install M debian/vdsm.install M init/vdsmd_init_common.sh.in M lib/vdsm/netinfo.py M lib/vdsm/tool/Makefile.am A lib/vdsm/tool/dump_bonding_defaults.py M tests/netinfoTests.py M vdsm.spec.in M vdsm/Makefile.am A vdsm/bonding-defaults.json M vdsm/sudoers.vdsm.in 11 files changed, 543 insertions(+), 48 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/28/33528/1 diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install index 0294be8..42f08c2 100644 --- a/debian/vdsm-python.install +++ b/debian/vdsm-python.install @@ -17,6 +17,7 @@ ./usr/lib/python2.7/dist-packages/vdsm/sslutils.py ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py ./usr/lib/python2.7/dist-packages/vdsm/tool/dummybr.py +./usr/lib/python2.7/dist-packages/vdsm/tool/dump_bonding_defaults.py ./usr/lib/python2.7/dist-packages/vdsm/tool/configurator.py ./usr/lib/python2.7/dist-packages/vdsm/tool/load_needed_modules.py ./usr/lib/python2.7/dist-packages/vdsm/tool/nwfilter.py diff --git a/debian/vdsm.install b/debian/vdsm.install index c97b8dd..4a0b976 100644 --- a/debian/vdsm.install +++ b/debian/vdsm.install @@ -23,6 +23,7 @@ ./lib/udev/rules.d/61-vdsm-lvm.rules ./usr/lib/python2.7/dist-packages/sos/plugins/vdsm.py ./usr/lib/python2.7/dist-packages/vdsmapi.py +./var/lib/vdsm/bonding-defaults.json ./usr/libexec/vdsm/curl-img-wrap ./usr/libexec/vdsm/ovirt_functions.sh ./usr/libexec/vdsm/persist-vdsm-hooks diff --git a/init/vdsmd_init_common.sh.in b/init/vdsmd_init_common.sh.in index 298b658..49e9f19 100644 --- a/init/vdsmd_init_common.sh.in +++ b/init/vdsmd_init_common.sh.in @@ -100,6 +100,11 @@ } +task_dump_bonding_defaults(){ +${VDSM_TOOL} dump-bonding-defaults +} + + task_tune_system(){ @SYSCTL_PATH@ -q -p /etc/sysctl.d/vdsm.conf } @@ -228,6 +233,10 @@ case $1 in --pre-start) +# If dump_bonding_defaults is desired (for the uneliminable possibility +# of added bonding options or tweaked kernel defaults) it has to be run +# after load_needed_modules (modprobe bonding). +# NetworkManager must not crash on nmcli conn delete. run_tasks \ mkdirs \ configure_coredump \ diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 5dc2cd6..f98dcea 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -24,12 +24,11 @@ from datetime import datetime from functools import partial from itertools import chain +import json import logging import os -import random import shlex import socket -import string import struct from xml.dom import minidom @@ -47,7 +46,7 @@ from . import libvirtconnection from .netconfpersistence import RunningConfig from .netlink import iter_addrs, iter_links -from .utils import execCmd, memoized, CommandPath +from .utils import memoized NET_CONF_DIR = '/etc/sysconfig/network-scripts/' @@ -69,6 +68,7 @@ BONDING_MASTERS = '/sys/class/net/bonding_masters' BONDING_SLAVES = '/sys/class/net/%s/bonding/slaves' BONDING_OPT = '/sys/class/net/%s/bonding/%s' +BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' BRIDGING_OPT = '/sys/class/net/%s/bridge/%s' _BONDING_FAILOVER_MODES = frozenset(('1', '3')) _BONDING_LOADBALANCE_MODES = frozenset(('0', '2', '4', '5', '6')) @@ -78,7 +78,6 @@ )) _IFCFG_ZERO_SUFFIXED = frozenset( ('IPADDR0', 'GATEWAY0', 'PREFIX0', 'NETMASK0')) -_TEE_BINARY = CommandPath('tee', constants.EXT_TEE) LIBVIRT_NET_PREFIX = 'vdsm-' DEFAULT_MTU = '1500' @@ -187,7 +186,7 @@ return opts -def _realBondOpts(bond): +def realBondOpts(bond): Return a dictionary in the same format as bondOpts(). Exclude entries that are not bonding options, e.g. 'ad_num_ports' or 'slaves'. @@ -522,47 +521,14 @@ return paddr -def _randomIfaceName(): -MAX_LENGTH = 15 -CHARS = string.ascii_lowercase +
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
Ondřej Svoboda has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: Verified+1 Code-Review-1 Yaniv, we do not want to push this now, please wait until 3.5.1 (I'll remove my -1 then and let you know). Reporting of bonding options works and we don't upset or are not upset by NetworkManager anymore. QoS unit tests and functional testSetupNetworksOverDhcpIface failed. Toni is aware of the former, I will try to debug the latter. These are unrelated. -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.5]: netinfo, tool: Add a vdsm-tool to determine bonding defaults...
oVirt Jenkins CI Server has posted comments on this change. Change subject: netinfo, tool: Add a vdsm-tool to determine bonding defaults offline .. Patch Set 1: Build Failed http://jenkins.ovirt.org/job/vdsm_3.5_network_functional_tests_gerrit/11/ : There was an infra issue, please contact in...@ovirt.org -- To view, visit http://gerrit.ovirt.org/33528 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I89b907ba80f23f417d5e481db9350247445ab772 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.5 Gerrit-Owner: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Ondřej Svoboda osvob...@redhat.com Gerrit-Reviewer: Yaniv Bronhaim ybron...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches