Assaf Muller has posted comments on this change. Change subject: Quarantine ovirt-3.0.0 network upgrade ......................................................................
Patch Set 3: (5 comments) .................................................... File init/vdsmd_init_common.sh.in Line 200: return 0 Line 201: } Line 202: Line 203: task_upgrade_300_nets(){ Line 204: "$VDSM_TOOL" upgrade-3.0.0-networks I agree. Line 205: } Line 206: #### pre-start tasks end #### Line 207: Line 208: .................................................... File lib/vdsm/tool/upgrade_300_networks.py Line 26: from vdsm.tool import expose Line 27: from vdsm.tool.upgrade import Upgrade Line 28: Line 29: sys.path.append("/usr/share/vdsm") Line 30: from netconf import ifcfg If we move the netconf directory to lib/vdsm it would require also moving: netmodels.py sourceRoute.py Which would then require moving: neterrors.py dsaversion.py At what point are we simply moving the entire VDSM project to 'lib'? I agree that there's a problem here (sys.path manipulations hint that the design here is rotten) but the solution is not to move all of the aforementioned files to 'lib', and I can't think of a better solution right now. Line 31: Line 32: Line 33: def isNeeded(networks, bridges): Line 34: return (MANAGEMENT_NETWORK not in networks and Line 55: def upgrade_networks(): Line 56: """ Line 57: Since ovirt-3.0, Vdsm uses libvirt networks (with names vdsm-*) to store Line 58: its own networks. Older Vdsms did not have those defined, and used only Line 59: linux bridges. This script is kept as an upgrade tool for the (very few) Done Line 60: people who still have such old setups running. Line 61: """ Line 62: upgradeName = '3.0.0-networks' Line 63: upgrade = Upgrade(upgradeName) .................................................... File vdsm/clientIF.py Line 399 Line 400 Line 401 Line 402 Line 403 Done Line 394: # we prefer running this code in external thread to avoid blocking Line 395: # API response. Line 396: self._initializingLibvirt() Line 397: Line 398: vdsmVms = self._getVDSMVms() Done Line 399: #Recover Line 400: for v in vdsmVms: Line 401: vmId = v.UUIDString() Line 402: if not self._recoverVm(vmId): -- To view, visit http://gerrit.ovirt.org/20803 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Icb2ffff1715dc3b92fc6c198dbb4c49f0bbef0cb Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Antoni Segura Puimedon <asegu...@redhat.com> Gerrit-Reviewer: Assaf Muller <amul...@redhat.com> Gerrit-Reviewer: Dan Kenigsberg <dan...@redhat.com> Gerrit-Reviewer: Yaniv Bronhaim <ybron...@redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches