From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has uploaded a new change for review.
Change subject: net: place bonding defaults under /var/lib ......................................................................
net: place bonding defaults under /var/lib
vdsm-tool places bonding-defaults.json under /usr/share. However, the proper place to store application data is under /var/lib
Change-Id: Ib50e3c34d54c949ef22e780731518ff17890226f Signed-off-by: Dan Kenigsberg danken@redhat.com --- M lib/vdsm/network/link/bond/sysfs_options.py M lib/vdsm/network/link/bond/sysfs_options_mapper.py M lib/vdsm/tool/configurators/bond_defaults.py 3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/79436/1
diff --git a/lib/vdsm/network/link/bond/sysfs_options.py b/lib/vdsm/network/link/bond/sysfs_options.py index d230736..bf5e93c 100644 --- a/lib/vdsm/network/link/bond/sysfs_options.py +++ b/lib/vdsm/network/link/bond/sysfs_options.py @@ -27,7 +27,7 @@ from vdsm import constants from vdsm.common.cache import memoized
-BONDING_DEFAULTS = constants.P_VDSM + 'bonding-defaults.json' +BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json' BONDING_OPT = '/sys/class/net/%s/bonding/%s' ARP_IP_TARGET = 'arp_ip_target'
diff --git a/lib/vdsm/network/link/bond/sysfs_options_mapper.py b/lib/vdsm/network/link/bond/sysfs_options_mapper.py index 01aaa0c..2219ab3 100644 --- a/lib/vdsm/network/link/bond/sysfs_options_mapper.py +++ b/lib/vdsm/network/link/bond/sysfs_options_mapper.py @@ -35,7 +35,7 @@ from vdsm.network.link.bond.sysfs_driver import BONDING_MASTERS from vdsm.network.link.iface import random_iface_name
-BONDING_NAME2NUMERIC_PATH = constants.P_VDSM + 'bonding-name2numeric.json' +BONDING_NAME2NUMERIC_PATH = constants.P_VDSM_LIB + 'bonding-name2numeric.json'
_MAX_BONDING_MODES = 6
diff --git a/lib/vdsm/tool/configurators/bond_defaults.py b/lib/vdsm/tool/configurators/bond_defaults.py index 6487506..adad925 100644 --- a/lib/vdsm/tool/configurators/bond_defaults.py +++ b/lib/vdsm/tool/configurators/bond_defaults.py @@ -28,7 +28,7 @@ from . import YES, NO
-BONDING_DEFAULTS = constants.P_VDSM + 'bonding-defaults.json' +BONDING_DEFAULTS = constants.P_VDSM_LIB + 'bonding-defaults.json'
def isconfigured():
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: net: place bonding defaults under /var/run ......................................................................
Patch Set 5:
ci please build
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: net: place bonding defaults under /var/run ......................................................................
Patch Set 5:
http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_...
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: net: place bonding defaults under /var/run ......................................................................
Patch Set 5: Verified+1
OST passed: http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_...
func tests passed: Ran 72 tests in 432.153s
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: net: place bonding defaults under /var/run ......................................................................
Patch Set 8: Verified-1
we still have an oddity regarding this.
ERROR: test suite for <module 'network' from '/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/tests/network/__init__.py'> ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/.tox/tests/lib/python2.7/site-packages/nose/suite.py", line 209, in run self.setUp() File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/.tox/tests/lib/python2.7/site-packages/nose/suite.py", line 292, in setUp self.setupContext(ancestor) File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/.tox/tests/lib/python2.7/site-packages/nose/suite.py", line 315, in setupContext try_run(context, names) File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/.tox/tests/lib/python2.7/site-packages/nose/util.py", line 471, in try_run return func() File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/tests/network/__init__.py", line 36, in setup_package bonding_defaults, bonding_name2numeric = bonding_default_fpath() File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/lib/vdsm/common/cache.py", line 41, in __call__ value = self.func(*args) File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/tests/network/nettestlib.py", line 535, in bonding_default_fpath sysfs_options_mapper.dump_bonding_options() File "/home/jenkins/workspace/vdsm_master_check-patch-fc25-x86_64/vdsm/lib/vdsm/network/link/bond/sysfs_options_mapper.py", line 46, in dump_bonding_options with open(sysfs_options.BONDING_DEFAULTS, 'w') as f: IOError: [Errno 2] No such file or directory: '/var/run/vdsm/bonding-defaults.json' -------------------- >> begin captured logging << --------------------
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has posted comments on this change.
Change subject: net: place bonding defaults under /var/run ......................................................................
Patch Set 10: Verified+1
OST http://jenkins.ovirt.org/view/oVirt%20system%20tests/job/ovirt-system-tests_... is happy
From Dan Kenigsberg danken@redhat.com:
Dan Kenigsberg has submitted this change and it was merged. ( https://gerrit.ovirt.org/79436 )
Change subject: net: place bonding defaults under /var/run ......................................................................
net: place bonding defaults under /var/run
vdsm-tool places bonding-defaults.json under /usr/share. However, the proper place to store application data that is generated every boot is under /var/run.
Change-Id: Ib50e3c34d54c949ef22e780731518ff17890226f Signed-off-by: Dan Kenigsberg danken@redhat.com --- M lib/vdsm/network/link/bond/sysfs_options.py M lib/vdsm/network/link/bond/sysfs_options_mapper.py M lib/vdsm/tool/configurators/bond_defaults.py 3 files changed, 3 insertions(+), 3 deletions(-)
Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Verified Edward Haas: Looks good to me, approved
vdsm-patches@lists.fedorahosted.org