vdsm-patches April 2013

vdsm-patches@lists.fedorahosted.org

46 participants
465 discussions

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 10 Apr '13

10 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 2: Fails Build Failed http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1889/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1940/ : FAILURE -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: Remove redundant parameter that breaks resourceManager test
by ykaplan＠redhat.com 10 Apr '13

10 Apr '13

Yeela Kaplan has uploaded a new change for review. Change subject: Remove redundant parameter that breaks resourceManager test ...................................................................... Remove redundant parameter that breaks resourceManager test Change-Id: I50f392061379832e625162750d3df547444b928a Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M tests/resourceManagerTests.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/77/13777/1 diff --git a/tests/resourceManagerTests.py b/tests/resourceManagerTests.py index 3dbd8a2..be451d4 100644 --- a/tests/resourceManagerTests.py +++ b/tests/resourceManagerTests.py @@ -80,7 +80,7 @@ s = StringIO("%s:%s" % (name, lockType)) s.seek(0) - def close(self, lockType): + def close(self): raise Exception("I NEVER CLOSE!!!") s.close = types.MethodType(close, s, StringIO) -- To view, visit http://gerrit.ovirt.org/13777 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I50f392061379832e625162750d3df547444b928a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

4 6

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 10 Apr '13

10 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 2: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1889/ (2/2) -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: [WIP] Java client
by Jenkins CI RO 10 Apr '13

10 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: [WIP] Java client ...................................................................... Patch Set 2: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1940/ (1/2) -- To view, visit http://gerrit.ovirt.org/13747 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I1af69cee1aced5c28e48c0c07a1d155be2889036 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: NetReload: ConfigWriter ifup/down to configurator
by asegurap＠redhat.com 10 Apr '13

10 Apr '13

Antoni Segura Puimedon has uploaded a new change for review. Change subject: NetReload: ConfigWriter ifup/down to configurator ...................................................................... NetReload: ConfigWriter ifup/down to configurator NetworkReloaded mandates that the configuration done by configNetworks shall be done using configurators that do the step of modifying the state of the networking stack. This patch moves ConfigWriter ifup and ifdown to the ifcfgConfigurator module while keeping everything working. Next in the series there shall be patches that wrap the methods that were moved into actions done to the IfcfgConfigurator object. Change-Id: I8f28fa717eb501f61ed922cf2571181ff3b42532 Signed-off-by: Antoni S. Puimedon <asegurap(a)redhat.com> --- M tests/configNetworkTests.py M vdsm.spec.in M vdsm/Makefile.am M vdsm/configNetwork.py M vdsm/neterrors.py M vdsm/netinfo.py 6 files changed, 19 insertions(+), 616 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/82/13182/1 diff --git a/tests/configNetworkTests.py b/tests/configNetworkTests.py index d5b670f..42605ae 100644 --- a/tests/configNetworkTests.py +++ b/tests/configNetworkTests.py @@ -108,7 +108,7 @@ def testValidateBondingOptions(self): # Monkey patch os.path.exists to let validateBondingOptions logic be # tested when a bonding device is not present. - if not os.path.exists(configNetwork.BONDING_MASTERS): + if not os.path.exists(netinfo.BONDING_MASTERS): raise SkipTest("bonding kernel module could not be found.") opts = 'mode=802.3ad miimon=150' diff --git a/vdsm.spec.in b/vdsm.spec.in index 695da2d..8bb76b9 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -818,6 +818,7 @@ %dir %{_libexecdir}/%{vdsm_name}/hooks/after_vdsm_stop %{_datadir}/%{vdsm_name}/addNetwork %{_datadir}/%{vdsm_name}/configNetwork.py* +%{_datadir}/%{vdsm_name}/ifcfgConfigurator.py* %{_datadir}/%{vdsm_name}/delNetwork %{_datadir}/%{vdsm_name}/dumpStorageTable.py* %{_datadir}/%{vdsm_name}/get-conf-item diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index a36f9e8..5a4897c 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -31,11 +31,12 @@ clientIF.py \ configNetwork.py \ debugPluginClient.py \ - dummybr.py \ dmidecodeUtil.py \ + dummybr.py \ guestIF.py \ hooking.py \ hooks.py \ + ifcfgConfigurator.py \ kaxmlrpclib.py \ ksm.py \ libvirtvm.py \ diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py index 9a08de2..f556cd6 100755 --- a/vdsm/configNetwork.py +++ b/vdsm/configNetwork.py @@ -21,28 +21,23 @@ import os import re import traceback -import pipes -import pwd import time import logging -import threading -from xml.sax.saxutils import escape from contextlib import contextmanager -import glob import socket -import shutil import struct -import libvirt -import selinux from vdsm import constants from vdsm import utils from storage.misc import execCmd import neterrors as ne +from neterrors import ConfigNetworkError from vdsm import define from vdsm import netinfo -from vdsm import libvirtconnection +from ifcfgConfigurator import ifup +from ifcfgConfigurator import ifdown +from ifcfgConfigurator import ConfigWriter CONNECTIVITY_TIMEOUT_DEFAULT = 4 MAX_VLAN_ID = 4094 @@ -50,608 +45,6 @@ ILLEGAL_BRIDGE_CHARS = frozenset(':. \t') DEFAULT_MTU = '1500' -BONDING_MASTERS = '/sys/class/net/bonding_masters' - - -class ConfigNetworkError(Exception): - def __init__(self, errCode, message): - self.errCode = errCode - self.message = message - Exception.__init__(self, self.errCode, self.message) - - -def ifdown(iface): - "Bring down an interface" - rc, out, err = execCmd([constants.EXT_IFDOWN, iface], raw=True) - return rc - - -def ifup(iface, async=False): - "Bring up an interface" - def _ifup(netIf): - rc, out, err = execCmd([constants.EXT_IFUP, netIf], raw=False) - - if rc != 0: - # In /etc/sysconfig/network-scripts/ifup* the last line usually - # contains the error reason. - raise ConfigNetworkError(ne.ERR_FAILED_IFUP, out[-1]) - return rc, out, err - - if async: - # wait for dhcp in another thread, - # so vdsm won't get stuck (BZ#498940) - t = threading.Thread(target=_ifup, name='ifup-waiting-on-dhcp', - args=(iface,)) - t.daemon = True - t.start() - else: - rc, out, err = _ifup(iface) - return rc - - -class ConfigWriter(object): - CONFFILE_HEADER = '# automatically generated by vdsm' - DELETED_HEADER = '# original file did not exist' - - def __init__(self): - self._backups = {} - self._networksBackups = {} - - @staticmethod - def _removeFile(filename): - """Remove file, umounting ovirt config files if needed.""" - - mounts = open('/proc/mounts').read() - if ' /config ext3' in mounts and ' %s ext3' % filename in mounts: - execCmd([constants.EXT_UMOUNT, '-n', filename]) - utils.rmFile(filename) - logging.debug("Removed file %s", filename) - - def _createNetwork(self, netXml): - conn = libvirtconnection.get() - net = conn.networkDefineXML(netXml) - net.create() - net.setAutostart(1) - - def createLibvirtNetwork(self, network, bridged=True, iface=None, - skipBackup=False): - netName = netinfo.LIBVIRT_NET_PREFIX + network - if bridged: - netXml = '''<network><name>%s</name><forward mode='bridge'/> - <bridge name='%s'/></network>''' % (escape(netName), - escape(network)) - else: - netXml = ( - '''<network><name>%s</name><forward mode='passthrough'>''' - '''<interface dev='%s'/></forward></network>''' % - (escape(netName), escape(iface))) - if not skipBackup: - self._networkBackup(network) - self._createNetwork(netXml) - - def _removeNetwork(self, network): - netName = netinfo.LIBVIRT_NET_PREFIX + network - conn = libvirtconnection.get() - - net = conn.networkLookupByName(netName) - if net.isActive(): - net.destroy() - if net.isPersistent(): - net.undefine() - - def removeLibvirtNetwork(self, network, skipBackup=False): - if not skipBackup: - self._networkBackup(network) - self._removeNetwork(network) - - @classmethod - def getLibvirtNetwork(cls, network): - netName = netinfo.LIBVIRT_NET_PREFIX + network - conn = libvirtconnection.get() - try: - net = conn.networkLookupByName(netName) - return net.XMLDesc(0) - except libvirt.libvirtError as e: - if e.get_error_code() == libvirt.VIR_ERR_NO_NETWORK: - return - - raise - - @classmethod - def writeBackupFile(cls, dirName, fileName, content): - backup = os.path.join(dirName, fileName) - if os.path.exists(backup): - # original copy already backed up - return - - vdsm_uid = pwd.getpwnam('vdsm').pw_uid - - # make directory (if it doesn't exist) and assign it to vdsm - if not os.path.exists(dirName): - os.makedirs(dirName) - os.chown(dirName, vdsm_uid, 0) - - open(backup, 'w').write(content) - os.chown(backup, vdsm_uid, 0) - logging.debug("Persistently backed up %s " - "(until next 'set safe config')", backup) - - def _networkBackup(self, network): - self._atomicNetworkBackup(network) - self._persistentNetworkBackup(network) - - def _atomicNetworkBackup(self, network): - """ In-memory backup libvirt networks """ - if network not in self._networksBackups: - self._networksBackups[network] = self.getLibvirtNetwork(network) - logging.debug("Backed up %s", network) - - @classmethod - def _persistentNetworkBackup(cls, network): - """ Persistently backup libvirt networks """ - content = cls.getLibvirtNetwork(network) - if not content: - # For non-exists networks use predefined header - content = cls.DELETED_HEADER + '\n' - logging.debug("backing up network %s: %s", network, content) - - cls.writeBackupFile(netinfo.NET_LOGICALNET_CONF_BACK_DIR, network, - content) - - def restoreAtomicNetworkBackup(self): - logging.info("Rolling back logical networks configuration " - "(restoring atomic logical networks backup)") - for network, content in self._networksBackups.iteritems(): - # Networks with content None should be removed. - # Networks with real content should be recreated. - # To avoid libvirt errors during recreation we need - # to remove the old network first - try: - self._removeNetwork(network) - except libvirt.libvirtError as e: - if e.get_error_code() == libvirt.VIR_ERR_NO_NETWORK: - pass - - if content: - self._createNetwork(content) - - logging.info('Restored %s', network) - - def _backup(self, filename): - self._atomicBackup(filename) - self._persistentBackup(filename) - - def _atomicBackup(self, filename): - """ - Backs up configuration to memory, - for a later rollback in case of error. - """ - - if filename not in self._backups: - try: - self._backups[filename] = open(filename).read() - logging.debug("Backed up %s", filename) - except IOError as e: - if e.errno == os.errno.ENOENT: - self._backups[filename] = None - else: - raise - - def restoreAtomicBackup(self): - logging.info("Rolling back configuration (restoring atomic backup)") - for confFile, content in self._backups.iteritems(): - if content is None: - utils.rmFile(confFile) - logging.debug('Removing empty configuration backup %s', - confFile) - else: - open(confFile, 'w').write(content) - logging.info('Restored %s', confFile) - - def _devType(self, content): - if re.search('^TYPE=Bridge$', content, re.MULTILINE): - return "Bridge" - elif re.search('^VLAN=yes$', content, re.MULTILINE): - return "Vlan" - elif re.search('^SLAVE=yes$', content, re.MULTILINE): - return "Slave" - else: - return "Other" - - def _sortModifiedIfcfgs(self): - devdict = {'Bridge': [], - 'Vlan': [], - 'Slave': [], - 'Other': []} - for confFile, _ in self._backups.iteritems(): - try: - content = file(confFile).read() - except IOError as e: - if e.errno == os.errno.ENOENT: - continue - else: - raise - dev = confFile[len(netinfo.NET_CONF_PREF):] - - devdict[self._devType(content)].append(dev) - - return devdict['Other'] + devdict['Vlan'] + devdict['Bridge'] - - def _stopAtomicDevices(self): - for dev in reversed(self._sortModifiedIfcfgs()): - ifdown(dev) - - def _startAtomicDevices(self): - for dev in self._sortModifiedIfcfgs(): - try: - ifup(dev) - except ConfigNetworkError: - logging.error('Failed to ifup device %s during rollback.', dev, - exc_info=True) - - @classmethod - def _persistentBackup(cls, filename): - """ Persistently backup ifcfg-* config files """ - if os.path.exists('/usr/libexec/ovirt-functions'): - execCmd([constants.EXT_SH, '/usr/libexec/ovirt-functions', - 'unmount_config', filename]) - logging.debug("unmounted %s using ovirt", filename) - - (dummy, basename) = os.path.split(filename) - if os.path.exists(filename): - content = open(filename).read() - else: - # For non-exists ifcfg-* file use predefined header - content = cls.DELETED_HEADER + '\n' - logging.debug("backing up %s: %s", basename, content) - - cls.writeBackupFile(netinfo.NET_CONF_BACK_DIR, basename, content) - - def restorePersistentBackup(self): - """Restore network config to last known 'safe' state""" - - self.loadBackups() - self.restoreBackups() - self.clearBackups() - - def _loadBackupFiles(self, loadDir, restoreDir=None): - for fpath in glob.iglob(loadDir + '/*'): - if not os.path.isfile(fpath): - continue - - content = open(fpath).read() - if content.startswith(self.DELETED_HEADER): - content = None - - basename = os.path.basename(fpath) - if restoreDir: - self._backups[os.path.join(restoreDir, basename)] = content - else: - self._networksBackups[basename] = content - - logging.info('Loaded %s', fpath) - - def loadBackups(self): - """ Load persistent backups into memory """ - # Load logical networks - self._loadBackupFiles(netinfo.NET_LOGICALNET_CONF_BACK_DIR) - # Load config files - self._loadBackupFiles(netinfo.NET_CONF_BACK_DIR, netinfo.NET_CONF_DIR) - - def restoreBackups(self): - """ Restore network backups """ - if not self._backups and not self._networksBackups: - return - - self._stopAtomicDevices() - - self.restoreAtomicNetworkBackup() - self.restoreAtomicBackup() - - self._startAtomicDevices() - - @classmethod - def clearBackups(cls): - """ Clear backup files """ - shutil.rmtree(netinfo.NET_CONF_BACK_DIR, ignore_errors=True) - - @classmethod - def ifcfgPorts(cls, network): - ports = [] - for filePath in glob.iglob(netinfo.NET_CONF_PREF + '*'): - with open(filePath, 'r') as confFile: - for line in confFile: - if line.startswith('BRIDGE=' + network): - port = filePath[filePath.rindex('-') + 1:] - logging.debug('port %s found in ifcfg for %s', port, - network) - ports.append(port) - break - return ports - - def writeConfFile(self, fileName, configuration): - '''Backs up the previous contents of the file referenced by fileName - writes the new configuration and sets the specified access mode.''' - self._backup(fileName) - open(fileName, 'w').write(configuration) - os.chmod(fileName, 0664) - try: - selinux.restorecon(fileName) - except: - logging.debug('ignoring restorecon error in case ' - 'SElinux is disabled', exc_info=True) - - def _createConfFile(self, conf, name, ipaddr=None, netmask=None, - gateway=None, bootproto=None, mtu=None, onboot='yes', - **kwargs): - """ Create ifcfg-* file with proper fields per device """ - - cfg = """DEVICE=%s\nONBOOT=%s\n""" % (pipes.quote(name), - pipes.quote(onboot)) - cfg += conf - if ipaddr: - cfg = cfg + 'IPADDR=%s\nNETMASK=%s\n' % (pipes.quote(ipaddr), - pipes.quote(netmask)) - if gateway: - cfg = cfg + 'GATEWAY=%s\n' % pipes.quote(gateway) - # According to manual the BOOTPROTO=none should be set - # for static IP - cfg = cfg + 'BOOTPROTO=none\n' - else: - if bootproto: - cfg = cfg + 'BOOTPROTO=%s\n' % pipes.quote(bootproto) - if mtu: - cfg = cfg + 'MTU=%d\n' % mtu - cfg += 'NM_CONTROLLED=no\n' - BLACKLIST = ['TYPE', 'NAME', 'DEVICE', 'bondingOptions', - 'force', 'blockingdhcp', - 'connectivityCheck', 'connectivityTimeout', - 'implicitBonding'] - for k in set(kwargs.keys()).difference(set(BLACKLIST)): - if re.match('^[a-zA-Z_]\w*$', k): - cfg += '%s=%s\n' % (k.upper(), pipes.quote(kwargs[k])) - else: - logging.debug('ignoring variable %s', k) - - self.writeConfFile(netinfo.NET_CONF_PREF + name, cfg) - - def addBridge(self, name, ipaddr=None, netmask=None, mtu=None, - gateway=None, bootproto=None, delay='0', onboot='yes', - **kwargs): - """ Create ifcfg-* file with proper fields for bridge """ - conf = 'TYPE=Bridge\nDELAY=%s\n' % pipes.quote(delay) - self._createConfFile(conf, name, ipaddr, netmask, gateway, - bootproto, mtu, onboot, **kwargs) - - def addVlan(self, vlanId, iface, network, mtu=None, bridged=True, - ipaddr=None, netmask=None, gateway=None, bootproto=None, - onboot='yes', **kwargs): - """ Create ifcfg-* file with proper fields for VLAN """ - name = '%s.%s' % (pipes.quote(iface), vlanId) - conf = 'VLAN=yes\n' - if bridged: - conf += 'BRIDGE=%s\n' % pipes.quote(network) - - self._createConfFile(conf, name, ipaddr, netmask, gateway, - bootproto, mtu, onboot, **kwargs) - - def addBonding(self, bonding, bridge=None, bondingOptions=None, mtu=None, - ipaddr=None, netmask=None, gateway=None, bootproto=None, - onboot='yes', **kwargs): - """ Create ifcfg-* file with proper fields for bond """ - if not bondingOptions: - bondingOptions = 'mode=802.3ad miimon=150' - - conf = 'BONDING_OPTS=%s\n' % pipes.quote(bondingOptions or '') - if bridge: - conf += 'BRIDGE=%s\n' % pipes.quote(bridge) - - if netinfo.NetInfo().ifaceUsers(bonding): - confParams = netinfo.getIfaceCfg(bonding) - if not ipaddr: - ipaddr = confParams.get('IPADDR', None) - netmask = confParams.get('NETMASK', None) - gateway = confParams.get('GATEWAY', None) - bootproto = confParams.get('BOOTPROTO', None) - if not mtu: - mtu = confParams.get('MTU', None) - if mtu: - mtu = int(mtu) - - self._createConfFile(conf, bonding, ipaddr, netmask, gateway, - bootproto, mtu, onboot, **kwargs) - - # create the bonding device to avoid initscripts noise - if bonding not in open(BONDING_MASTERS).read().split(): - open(BONDING_MASTERS, 'w').write('+%s\n' % bonding) - - def addNic(self, nic, bonding=None, bridge=None, mtu=None, - ipaddr=None, netmask=None, gateway=None, bootproto=None, - onboot='yes', **kwargs): - """ Create ifcfg-* file with proper fields for NIC """ - _netinfo = netinfo.NetInfo() - hwaddr = (_netinfo.nics[nic].get('permhwaddr') or - _netinfo.nics[nic]['hwaddr']) - - conf = 'HWADDR=%s\n' % pipes.quote(hwaddr) - if bridge: - conf += 'BRIDGE=%s\n' % pipes.quote(bridge) - if bonding: - conf += 'MASTER=%s\nSLAVE=yes\n' % pipes.quote(bonding) - - if netinfo.NetInfo().ifaceUsers(nic): - confParams = netinfo.getIfaceCfg(nic) - if not ipaddr: - ipaddr = confParams.get('IPADDR', None) - netmask = confParams.get('NETMASK', None) - gateway = confParams.get('GATEWAY', None) - bootproto = confParams.get('BOOTPROTO', None) - if not mtu: - mtu = confParams.get('MTU', None) - if mtu: - mtu = int(mtu) - - self._createConfFile(conf, nic, ipaddr, netmask, gateway, - bootproto, mtu, onboot, **kwargs) - - def removeNic(self, nic): - cf = netinfo.NET_CONF_PREF + nic - self._backup(cf) - try: - hwlines = [line for line in open(cf).readlines() - if line.startswith('HWADDR=')] - l = ['DEVICE=%s\n' % nic, 'ONBOOT=yes\n', - 'MTU=%s\n' % DEFAULT_MTU] + hwlines - open(cf, 'w').writelines(l) - except IOError: - pass - - def removeVlan(self, vlan, iface): - vlandev = iface + '.' + vlan - ifdown(vlandev) - self._backup(netinfo.NET_CONF_PREF + vlandev) - self._removeFile(netinfo.NET_CONF_PREF + vlandev) - - def removeBonding(self, bonding): - self._backup(netinfo.NET_CONF_PREF + bonding) - self._removeFile(netinfo.NET_CONF_PREF + bonding) - - def removeBridge(self, bridge): - ifdown(bridge) - execCmd([constants.EXT_BRCTL, 'delbr', bridge]) - self._backup(netinfo.NET_CONF_PREF + bridge) - self._removeFile(netinfo.NET_CONF_PREF + bridge) - - def _getConfigValue(self, conffile, entry): - """ - Get value from network configuration file - - :param entry: entry to look for (entry=value) - :type entry: string - - :returns: value for entry (or None) - :rtype: string - - Search for entry in conffile and return - its value or None if not found - """ - with open(conffile) as f: - entries = [line for line in f.readlines() - if line.startswith(entry + '=')] - if len(entries) != 0: - value = entries[0].split('=', 1)[1] - return value.strip() - return None - - def _updateConfigValue(self, conffile, entry, value, delete=False): - """ - Set value for network configuration file - - :param entry: entry to update (entry=value) - :type entry: string - - :param value: value to update (entry=value) - :type value: string - - :param delete: delete entry - :type delete: boolean - - Search for entry in conffile and return - its value or None if not found, - if delete is True the entry will be deleted from - the configuration file - """ - with open(conffile) as f: - entries = [line for line in f.readlines() - if not line.startswith(entry + '=')] - - if not delete: - entries.append('\n' + entry + '=' + value) - - self._backup(conffile) - with open(conffile, 'w') as f: - f.writelines(entries) - f.close() - - def getMaxMtu(self, nics, mtu): - """ - Get the max MTU value from configuration/parameter - - :param nics: list of nics - :type nics: list - - :param mtu: mtu value - :type mtu: integer - - getMaxMtu return the highest value in a connection tree, - it check if a vlan, bond that have a higher mtu value - """ - for nic in nics: - mtuval = int(netinfo.getMtu(nic)) - - if mtuval > mtu: - mtu = mtuval - return mtu - - def setNewMtu(self, network, bridged, _netinfo=None): - """ - Set new MTU value to network and its interfaces - - :param network: network name - :type network: string - :param bridged: network type (bridged or bridgeless) - :type bridged: bool - - Update MTU to devices (vlans, bonds and nics) - or added a new value - """ - if _netinfo is None: - _netinfo = netinfo.NetInfo() - currmtu = None - if bridged: - try: - currmtu = int(netinfo.getMtu(network)) - except IOError as e: - if e.errno != os.errno.ENOENT: - raise - - nics, delvlan, bonding = \ - _netinfo.getNicsVlanAndBondingForNetwork(network) - if delvlan is None: - return - - iface = bonding if bonding else nics[0] - vlans = _netinfo.getVlansForIface(iface) - - newmtu = None - for vlan in vlans: - cf = netinfo.NET_CONF_PREF + iface + '.' + vlan - mtu = self._getConfigValue(cf, 'MTU') - if mtu: - mtu = int(mtu) - - if vlan == delvlan: - # For VLANed bridgeless networks use MTU of delvlan - # as current MTU - if not bridged and mtu: - currmtu = mtu - continue - - newmtu = max(newmtu, mtu) - - # Optimization: if network hasn't custom MTU (currmtu), do nothing - if currmtu and newmtu != currmtu: - if bonding: - cf = netinfo.NET_CONF_PREF + bonding - self._updateConfigValue(cf, 'MTU', str(newmtu), newmtu is None) - slaves = netinfo.slaves(bonding) - for slave in slaves: - cf = netinfo.NET_CONF_PREF + slave - self._updateConfigValue(cf, 'MTU', str(newmtu), - newmtu is None) - else: - cf = netinfo.NET_CONF_PREF + nics[0] - self._updateConfigValue(cf, 'MTU', str(newmtu), newmtu is None) def isBridgeNameValid(bridgeName): @@ -722,15 +115,15 @@ def _validationBond(bonding): bond_created = False try: - bonding = open(BONDING_MASTERS, 'r').read().split()[0] + bonding = open(netinfo.BONDING_MASTERS, 'r').read().split()[0] except IndexError: - open(BONDING_MASTERS, 'w').write('+%s\n' % bonding) + open(netinfo.BONDING_MASTERS, 'w').write('+%s\n' % bonding) bond_created = True try: yield bonding finally: if bond_created: - open(BONDING_MASTERS, 'w').write('-%s\n' % bonding) + open(netinfo.BONDING_MASTERS, 'w').write('-%s\n' % bonding) def validateVlanId(vlan): diff --git a/vdsm/neterrors.py b/vdsm/neterrors.py index 5ce38b6..034414c 100644 --- a/vdsm/neterrors.py +++ b/vdsm/neterrors.py @@ -29,3 +29,10 @@ ERR_USED_BRIDGE = 28 ERR_FAILED_IFUP = 29 ERR_LOST_CONNECTION = 10 # noConPeer + + +class ConfigNetworkError(Exception): + def __init__(self, errCode, message): + self.errCode = errCode + self.message = message + Exception.__init__(self, self.errCode, self.message) diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py index d7da7d9..e02e804 100644 --- a/vdsm/netinfo.py +++ b/vdsm/netinfo.py @@ -41,6 +41,7 @@ NET_CONF_PREF = NET_CONF_DIR + 'ifcfg-' PROC_NET_VLAN = '/proc/net/vlan/' +BONDING_MASTERS = '/sys/class/net/bonding_masters' LIBVIRT_NET_PREFIX = 'vdsm-' DUMMY_BRIDGE = ';vdsmdummy;' -- To view, visit http://gerrit.ovirt.org/13182 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f28fa717eb501f61ed922cf2571181ff3b42532 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Antoni Segura Puimedon <asegurap(a)redhat.com>

4 56

Change in vdsm[master]: vm: rename _updateDrive to updateDriveParameters
by Federico Simoncelli 10 Apr '13

10 Apr '13

Federico Simoncelli has uploaded a new change for review. Change subject: vm: rename _updateDrive to updateDriveParameters ...................................................................... vm: rename _updateDrive to updateDriveParameters As preparation for change I472c2931 the method _updateDrive is renamed to updateDriveParameters to avoid confusion with updateDriveVolume. Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=923964 Change-Id: Ic60f1e0bcd889dffba9003d413fa305f6102eccf Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com> --- M vdsm/libvirtvm.py 1 file changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/31/13631/1 diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py index 607dedb..0ef529b 100644 --- a/vdsm/libvirtvm.py +++ b/vdsm/libvirtvm.py @@ -1970,28 +1970,28 @@ raise LookupError("No such drive: '%s'" % drive) - def _updateDrive(self, drive): + def updateDriveParameters(self, driveParams): """Update the drive with the new volume information""" - # Updating the drive object - for device in self._devices[vm.DISK_DEVICES][:]: - if device.name == drive["name"]: - for k, v in drive.iteritems(): - setattr(device, k, v) + # Updating the vmDrive object + for vmDrive in self._devices[vm.DISK_DEVICES][:]: + if vmDrive.name == driveParams["name"]: + for k, v in driveParams.iteritems(): + setattr(vmDrive, k, v) break else: self.log.error("Unable to update the drive object for: %s", - drive["name"]) + driveParams["name"]) # Updating the VM configuration - for device in self.conf["devices"][:]: - if (device['type'] == vm.DISK_DEVICES and - device.get("name") == drive["name"]): - device.update(drive) + for vmDriveConfig in self.conf["devices"][:]: + if (vmDriveConfig['type'] == vm.DISK_DEVICES and + vmDriveConfig.get("name") == driveParams["name"]): + vmDriveConfig.update(driveParams) break else: self.log.error("Unable to update the device configuration ", - "for: %s", drive["name"]) + "for: %s", driveParams["name"]) self.saveState() @@ -2130,7 +2130,7 @@ else: # Update the drive information for drive in newDrives.values(): - self._updateDrive(drive) + self.updateDriveParameters(drive) finally: self.startDisksStatsCollection() @@ -2356,7 +2356,7 @@ # Updating the destination disk device and name, the device is used by # prepareVolumePath (required to fill the new information as the path) - # and the name is used by _updateDrive. + # and the name is used by updateDriveParameters. dstDiskCopy.update({'device': srcDrive.device, 'name': srcDrive.name}) dstDiskCopy['path'] = self.cif.prepareVolumePath(dstDiskCopy) @@ -2397,7 +2397,7 @@ # There is nothing we can do at this point other than logging self.log.error("Unable to teardown the previous chain: %s", diskToTeardown, exc_info=True) - self._updateDrive(dstDiskCopy) # Updating the drive structure + self.updateDriveParameters(dstDiskCopy) finally: self._delDiskReplica(srcDrive) self.startDisksStatsCollection() -- To view, visit http://gerrit.ovirt.org/13631 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic60f1e0bcd889dffba9003d413fa305f6102eccf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>

6 7

Change in vdsm[master]: mom: add mom balloon functional tests for running vms
by wudxw＠linux.vnet.ibm.com 10 Apr '13

10 Apr '13

Mark Wu has posted comments on this change. Change subject: mom: add mom balloon functional tests for running vms ...................................................................... Patch Set 3: I would prefer that you didn't submit this (3 inline comments) .................................................... File tests/functional/Makefile.am Line 26: xmlrpcTests.py \ Line 27: $(NULL) Line 28: Line 29: dist_vdsmfunctests_DATA = \ Line 30: 60_test_balloon_shrink.policy \ you should use tab instead of whitespace Line 31: 70_test_balloon_grow.policy \ .................................................... File tests/functional/momTests.py Line 75: except KeyError: Line 76: pass Line 77: return candidateStats Line 78: Line 79: def _prepareTarget(self, operation, vmsOldStats): I suggest you merge _prepareTarget and _filterVmsStats into one function, return a list of 'vmId'. after you set policy, you can just check result of vm in this list. It could avoid the nested loop in line 111 Line 80: # Set the balloon target to max before shrink operation. Line 81: # Set the balloon target to 0.9*max before grow operation. Line 82: func = {"Shrink": lambda x: x, "Grow": lambda x: 0.9 * x} Line 83: for vmOldStats in vmsOldStats: Line 106: # Check the new balloon_cur in the proper range. Line 107: lower_bound_func = {'Shrink': lambda x: floor(0.9 * x), Line 108: 'Grow': lambda x: floor(0.99225 * x)} Line 109: upper_bound_func = {'Shrink': lambda x: ceil(0.9025 * x), Line 110: 'Grow': lambda x: ceil(x)} it could be cleaner to define a namedtuple like this: BalloonRatio = namedtuple('BalloonRatio', ['target', 'low', 'high') shrinkRatio = BalloonRatio(1, 0.9, 0.9025) growRatio = BalloonRatio(0.9, 0.99225, 1) then you can use it in this way: balloonCur >= balloonMax * shrinkRatio.low balloonCur <= balloonMax * shrinkRatio.high Line 111: for vmNewStats in vmsNewStats: Line 112: for vmOldStats in vmsOldStats: Line 113: if vmOldStats['vmId'] == vmNewStats['vmId']: Line 114: balloonMax = vmOldStats['balloonInfo']['balloon_max'] -- To view, visit http://gerrit.ovirt.org/13156 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I922568233dc769d83e2fdffe1c24439d13d03d7e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: mom: add mom balloon functional tests for running vms
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: mom: add mom balloon functional tests for running vms ...................................................................... Patch Set 3: Build Successful http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1883/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1934/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/13156 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I922568233dc769d83e2fdffe1c24439d13d03d7e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: mom: add mom balloon functional tests for running vms
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: mom: add mom balloon functional tests for running vms ...................................................................... Patch Set 3: Build Started http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/1883/ (2/2) -- To view, visit http://gerrit.ovirt.org/13156 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I922568233dc769d83e2fdffe1c24439d13d03d7e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

Change in vdsm[master]: mom: add mom balloon functional tests for running vms
by Jenkins CI RO 09 Apr '13

09 Apr '13

oVirt Jenkins CI Server has posted comments on this change. Change subject: mom: add mom balloon functional tests for running vms ...................................................................... Patch Set 3: Build Started http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/1934/ (1/2) -- To view, visit http://gerrit.ovirt.org/13156 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I922568233dc769d83e2fdffe1c24439d13d03d7e Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mark Wu <wudxw(a)linux.vnet.ibm.com> Gerrit-Reviewer: Mei Liu <liumbj(a)linux.vnet.ibm.com> Gerrit-Reviewer: oVirt Jenkins CI Server

1 0

← Newer
1
...
39
40
41
42
43
44
45
46
47
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches April 2013