vdsm-patches September 2015

vdsm-patches@lists.fedorahosted.org

46 participants
667 discussions

Change in vdsm[master]: vdsm: require kernel-2.6.32-465 on for NFSv4 fixes
by ykleinbe＠redhat.com 08 Oct '15

08 Oct '15

Yoav Kleinberger has uploaded a new change for review. Change subject: vdsm: require kernel-2.6.32-465 on for NFSv4 fixes ...................................................................... vdsm: require kernel-2.6.32-465 on for NFSv4 fixes This patch updates vdsm's dependencies to incorporate, on Fedora, fixes to NFSv4 introduces in https://bugzilla.redhat.com/show_bug.cgi?id=1075123. This patch fixes https://bugzilla.redhat.com/show_bug.cgi?id=1100285. Change-Id: Ib7fae41d22065061588ef72516070bf8b55bf526 Signed-off-by: Yoav Kleinberger <ykleinbe(a)redhat.com> --- M vdsm.spec.in 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/10/33810/1 diff --git a/vdsm.spec.in b/vdsm.spec.in index 0dcd82b..35cc892 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -200,7 +200,7 @@ Requires: device-mapper-multipath >= 0.4.9-52 Requires: e2fsprogs >= 1.41.12-11 Requires: fence-agents -Requires: kernel >= 2.6.32-279.9.1 +Requires: kernel >= 2.6.32-465.9.1 Requires: initscripts >= 9.03.31-2.el6_3.1 Requires: policycoreutils >= 2.0.83-19.30 Requires: policycoreutils-python >= 2.0.83-19.30 -- To view, visit http://gerrit.ovirt.org/33810 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7fae41d22065061588ef72516070bf8b55bf526 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yoav Kleinberger <ykleinbe(a)redhat.com>

4 6

Change in vdsm[master]: tests: added NFS support to functional tests
by ykleinbe＠redhat.com 08 Oct '15

08 Oct '15

Yoav Kleinberger has uploaded a new change for review. Change subject: tests: added NFS support to functional tests ...................................................................... tests: added NFS support to functional tests In this patch, I introduce a new NFS storage context for the storage functional tests. Since there is much shared logic between NFS and LocalFS storage context, I introduce a common superclass. Change-Id: I1781fc400c0604855d3143dde22ccb29e6cc8013 Signed-off-by: Yoav Kleinberger <ykleinbe(a)redhat.com> --- M tests/functional/basicStorageTest.py M tests/functional/testlib/storagecontexts/base.py A tests/functional/testlib/storagecontexts/filebased.py M tests/functional/testlib/storagecontexts/iscsi.py M tests/functional/testlib/storagecontexts/localfs.py A tests/functional/testlib/storagecontexts/nfs.py 6 files changed, 249 insertions(+), 114 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/90/32990/1 diff --git a/tests/functional/basicStorageTest.py b/tests/functional/basicStorageTest.py index c01d14b..438f8c8 100644 --- a/tests/functional/basicStorageTest.py +++ b/tests/functional/basicStorageTest.py @@ -4,6 +4,7 @@ from functional.testlib import controlvdsm from functional.testlib.storagecontexts import localfs from functional.testlib.storagecontexts import iscsi +from functional.testlib.storagecontexts import nfs class TestBasicStorageDomain(object): @@ -23,6 +24,9 @@ def testCreateVolumeISCSI(self): self._testCreateVolume(iscsi.ISCSI) + def testCreateVolumeNFS(self): + self._testCreateVolume(nfs.NFS) + def _testCreateVolume(self, storageBackend): with storageBackend() as (vdsm, verify): storageServerID = vdsm.connectStorageServer() diff --git a/tests/functional/testlib/storagecontexts/base.py b/tests/functional/testlib/storagecontexts/base.py index 7179694..2e308ad 100644 --- a/tests/functional/testlib/storagecontexts/base.py +++ b/tests/functional/testlib/storagecontexts/base.py @@ -73,16 +73,47 @@ class StorageBackend(object): def __init__(self): self._vdsmCaller = vdsmcaller.VDSMCaller() + self._domainID = self._newUUID() + self._poolID = self._newUUID() + self._imageID = self._newUUID() + self._volumeID = self._newUUID() + self._connectionID = self._newUUID() + + def connectionID(self): + return self._connectionID + + def volumeID(self): + return self._volumeID + + def imageID(self): + return self._imageID + + def poolID(self): + return self._poolID + + def domainID(self): + return self._domainID def vdsm(self): return self._vdsmCaller - def newUUID(self): + def _newUUID(self): return str(uuid.uuid4()) def randomName(self, base): return "%s_%04d" % (base, random.randint(1, 10000)) + def createStoragePool(self): + POOL_TYPE_DEPRECATED = 0 + self.vdsm().createStoragePool( + POOL_TYPE_DEPRECATED, + self.poolID(), + self.randomName('pool'), + self.domainID(), + [self.domainID()], + 1) + return self.poolID() + def connectStoragePool(self, poolID, masterDomainID): SCSI_KEY_DEPRECATED = 0 self.vdsm().connectStoragePool( diff --git a/tests/functional/testlib/storagecontexts/filebased.py b/tests/functional/testlib/storagecontexts/filebased.py new file mode 100644 index 0000000..bdb15d7 --- /dev/null +++ b/tests/functional/testlib/storagecontexts/filebased.py @@ -0,0 +1,69 @@ +import os +import storage.volume +import storage.image +from . import base +import logging + + +class Verify(base.Verify): + + def rhevMountPoint(self): + raise Exception('you must override this function') + + def storageServerConnected(self): + self.sleepWhileVDSMCompletesTask(duration=2) + assert os.path.exists(self.rhevMountPoint()) + + def storageDomainCreated(self, domainID): + self.sleepWhileVDSMCompletesTask(duration=1) + self._directIOTestFileExists() + domainRoot = os.path.join(self.rhevMountPoint(), domainID) + expectedFiles = [ + 'images', + 'dom_md', + 'dom_md/leases', + 'dom_md/inbox', + 'dom_md/outbox', + 'dom_md/metadata', + 'dom_md/ids'] + expectedFullPaths =\ + [os.path.join(domainRoot, path) for path in expectedFiles] + for path in expectedFullPaths: + logging.info('verifying path: %s' % path) + assert os.path.exists(path) + + def _directIOTestFileExists(self): + directIOTestFile = os.path.join( + self.rhevMountPoint(), + '__DIRECT_IO_TEST__') + assert os.path.exists(directIOTestFile) + + def volumeCreated(self, volumeInfo): + taskID, domainID, imageID, volumeID = volumeInfo + self.waitUntilVDSMTaskFinished(taskID, 20) + domainRoot = os.path.join(self.rhevMountPoint(), domainID) + imageDirectory = os.path.join(domainRoot, 'images', imageID) + assert os.path.exists(imageDirectory) + volumeFile = os.path.join(imageDirectory, volumeID) + volumeLease = '%s.lease' % volumeFile + volumeMeta = '%s.meta' % volumeFile + for path in volumeFile, volumeLease, volumeMeta: + logging.info('verifying path: %s' % path) + assert os.path.exists(path) + + +class FileBased(base.StorageBackend): + def createVolume(self, size): + PREALLOCATE = 1 + result = self.vdsm().createVolume( + self.domainID(), + self.poolID(), + self.imageID(), + self.largeIntegerXMLRPCWorkaround(size), + storage.volume.RAW_FORMAT, + PREALLOCATE, + storage.image.DATA_DISK_TYPE, + self.volumeID(), + self.randomName('volume_description')) + taskID = result['uuid'] + return taskID, self.domainID(), self.imageID(), self.volumeID() diff --git a/tests/functional/testlib/storagecontexts/iscsi.py b/tests/functional/testlib/storagecontexts/iscsi.py index 0e891ee..eb19715 100644 --- a/tests/functional/testlib/storagecontexts/iscsi.py +++ b/tests/functional/testlib/storagecontexts/iscsi.py @@ -60,11 +60,7 @@ base.StorageBackend.__init__(self) self._iqn = 'iqn.1970-01.functional.test:%04d' %\ random.randint(1, 10000) - self._volumeGroup = {'uuid': self.newUUID(), 'vgs_uuid': None} - self._poolID = self.newUUID() - self._connectionID = self.newUUID() - self._imageID = self.newUUID() - self._volumeID = self.newUUID() + self._volumeGroup = {'uuid': self.domainID(), 'vgs_uuid': None} def _targetcli(self, command): commandAsList = command.split() @@ -77,6 +73,16 @@ self._fileioBackstore = self.randomName('backfile') logging.info('using %s, %s' % (self._fileioBackstore, self._storageFile)) + self._setupISCSITarget() + return (self, + Verify( + self._iqn, + self._volumeGroup, + self.vdsm, + self.volumeID()) + ) + + def _setupISCSITarget(self): self._targetcli('/backstores/fileio create %s %s 10G' % (self._fileioBackstore, self._storageFile)) self._targetcli('/iscsi create %s' % self._iqn) @@ -88,13 +94,6 @@ self._targetcli('/iscsi/%s/tpg1 set attribute ' 'generate_node_acls=1 ' 'cache_dynamic_acls=1' % self._iqn) - return (self, - Verify( - self._iqn, - self._volumeGroup, - self.vdsm, - self._volumeID) - ) def __exit__(self, *args): doubleDashed = self._volumeGroup['uuid'].replace('-', '--') @@ -145,27 +144,13 @@ 'user': '', 'tpgt': '1', 'password': '', - 'id': self._connectionID, + 'id': self.connectionID(), 'port': '3260' } self.vdsm().disconnectStorageServer( storage.sd.ISCSI_DOMAIN, - self._poolID, + self.poolID(), [connection]) - - def createStoragePool(self): - POOL_TYPE_DEPRECATED = 0 - self.vdsm().createStoragePool( - POOL_TYPE_DEPRECATED, - self._poolID, - self.randomName('pool'), - self._domainID(), - [self._domainID()], - 1) - return self._poolID - - def _domainID(self): - return self._volumeGroup['uuid'] def _createVG(self): lun = self._findLUN() @@ -194,14 +179,14 @@ def createVolume(self, size): PREALLOCATE = 1 result = self.vdsm().createVolume( - self._domainID(), - self._poolID, - self._imageID, + self.domainID(), + self.poolID(), + self.imageID(), self.largeIntegerXMLRPCWorkaround(size), storage.volume.RAW_FORMAT, PREALLOCATE, storage.image.DATA_DISK_TYPE, - self._volumeID, + self.volumeID(), self.randomName('iscsi_description')) logging.info('createVolume result: %s' % result) return result['uuid'] diff --git a/tests/functional/testlib/storagecontexts/localfs.py b/tests/functional/testlib/storagecontexts/localfs.py index ef341a0..6ba2914 100644 --- a/tests/functional/testlib/storagecontexts/localfs.py +++ b/tests/functional/testlib/storagecontexts/localfs.py @@ -5,67 +5,24 @@ import storage.sd import storage.volume import storage.image -from . import base +from . import filebased -class Verify(base.Verify): +class Verify(filebased.Verify): def __init__(self, directory, vdsm): - base.Verify.__init__(self, vdsm) + filebased.Verify.__init__(self, vdsm) self._directory = directory - def storageServerConnected(self): - self.sleepWhileVDSMCompletesTask(duration=2) + def rhevMountPoint(self): transformedDirectory = self._directory.replace('/', '_') - expectedSymlink = os.path.join( + result = os.path.join( '/rhev/data-center/mnt/', transformedDirectory) - assert os.path.lexists(expectedSymlink) - - def storageDomainCreated(self, domainID): - self.sleepWhileVDSMCompletesTask(duration=1) - self._directIOTestFileExists() - domainRoot = os.path.join(self._directory, domainID) - expectedFiles = [ - 'images', - 'dom_md', - 'dom_md/leases', - 'dom_md/inbox', - 'dom_md/outbox', - 'dom_md/metadata', - 'dom_md/ids'] - expectedFullPaths =\ - [os.path.join(domainRoot, path) for path in expectedFiles] - for path in expectedFullPaths: - assert os.path.exists(path) - - def _directIOTestFileExists(self): - self.sleepWhileVDSMCompletesTask(duration=1) - directIOTestFile = os.path.join(self._directory, '__DIRECT_IO_TEST__') - assert os.path.exists(directIOTestFile) - - def volumeCreated(self, volumeInfo): - taskID, domainID, imageID, volumeID = volumeInfo - self.waitUntilVDSMTaskFinished(taskID, 20) - domain_directory = os.path.join(self._directory, domainID) - image_directory = os.path.join(domain_directory, 'images', imageID) - assert os.path.exists(image_directory) - volume_file = os.path.join(image_directory, volumeID) - volume_lease = '%s.lease' % volume_file - volume_meta = '%s.meta' % volume_file - for path in volume_file, volume_lease, volume_meta: - assert os.path.exists(path) + return result -class LocalFS(base.StorageBackend): +class LocalFS(filebased.FileBased): _NON_EXISTANT_POOL = '00000000-0000-0000-0000-000000000000' - - def __init__(self): - base.StorageBackend.__init__(self) - self._domainID = self.newUUID() - self._poolID = self.newUUID() - self._imageID = self.newUUID() - self._volumeID = self.newUUID() - self._connectionID = self.newUUID() def __enter__(self): self._createDirectoryForLocalFSStorage() @@ -87,13 +44,13 @@ 'user': '', 'tpgt': '1', 'password': '******', - 'id': self._connectionID, + 'id': self.connectionID(), 'port': ''} result = self.vdsm().connectStorageServer( storage.sd.LOCALFS_DOMAIN, self._NON_EXISTANT_POOL, [localFilesystemConnection]) - assert result['statuslist'][0]['id'] == self._connectionID + assert result['statuslist'][0]['id'] == self.connectionID() def disconnectStorageServer(self): localFilesystemConnection = { @@ -102,46 +59,20 @@ 'user': '', 'tpgt': '1', 'password': '******', - 'id': self._connectionID, + 'id': self.connectionID(), 'port': ''} self.vdsm().disconnectStorageServer( storage.sd.LOCALFS_DOMAIN, self._NON_EXISTANT_POOL, [localFilesystemConnection]) - def createStoragePool(self): - POOL_TYPE_DEPRECATED = 0 - self.vdsm().createStoragePool( - POOL_TYPE_DEPRECATED, - self._poolID, - self.randomName('pool'), - self._domainID, - [self._domainID], - 1) - return self._poolID - def createStorageDomain(self): DOMAIN_VERSION = 3 self.vdsm().createStorageDomain( storage.sd.LOCALFS_DOMAIN, - self._domainID, + self.domainID(), 'some_name', self._directory, storage.sd.DATA_DOMAIN, DOMAIN_VERSION) - return self._domainID - - def createVolume(self, size): - PREALLOCATE = 1 - result = self.vdsm().createVolume( - self._domainID, - self._poolID, - self._imageID, - self.largeIntegerXMLRPCWorkaround(size), - storage.volume.RAW_FORMAT, - PREALLOCATE, - storage.image.DATA_DISK_TYPE, - self._volumeID, - self.randomName('localfs_description')) - taskID = result['uuid'] - return taskID, self._domainID, self._imageID, self._volumeID + return self.domainID() diff --git a/tests/functional/testlib/storagecontexts/nfs.py b/tests/functional/testlib/storagecontexts/nfs.py new file mode 100644 index 0000000..cdde3a1 --- /dev/null +++ b/tests/functional/testlib/storagecontexts/nfs.py @@ -0,0 +1,115 @@ +import subprocess +import tempfile +import pwd +import shutil +import os +import storage.sd +from . import filebased + + +class Verify(filebased.Verify): + def __init__(self, directory, vdsm): + filebased.Verify.__init__(self, vdsm) + self._directory = directory + + def rhevMountPoint(self): + transformedDirectory = self._directory.replace('/', '_') + result = os.path.join( + '/rhev/data-center/mnt/', + '127.0.0.1:%s' % transformedDirectory) + return result + + +class NFS(filebased.FileBased): + _NON_EXISTANT_POOL = '00000000-0000-0000-0000-000000000000' + + def __enter__(self): + self._setupNFSExport() + return self, Verify(self._directory, self.vdsm) + + def _setupNFSExport(self): + self._export() + self._restartNFSServer() + mountPoint = tempfile.mkdtemp() + COMMAND = 'sudo --non-interactive mount -t nfs localhost:%s %s' %\ + (self._directory, mountPoint) + subprocess.check_call(COMMAND, shell=True) + self._setPermissions(mountPoint) + subprocess.check_call( + 'sudo --non-interactive umount %s' % mountPoint, shell=True) + os.rmdir(mountPoint) + + def _export(self): + self._directory = tempfile.mkdtemp('', 'nfstest', '/var/tmp') + self._previousExports = open('/etc/exports').read() + with open('/etc/exports', 'a') as f: + line = '%s 127.0.0.1(rw,sync,no_root_squash,no_all_squash,fsid=0)\n'\ + % self._directory + f.write(line) + + def _unexport(self): + self._umount() + with open('/etc/exports', 'w') as f: + f.write(self._previousExports) + self._restartNFSServer() + + def _umount(self): + COMMAND = 'sudo --non-interactive umount 127.0.0.1:%s'\ + % self._directory + code = subprocess.call(COMMAND, shell=True) + + def _setPermissions(self, directory): + vdsmUser = pwd.getpwnam('vdsm') + os.chown(directory, vdsmUser.pw_uid, vdsmUser.pw_gid) + os.chmod(directory, 0755) + + def _restartNFSServer(self): + subprocess.check_call( + 'sudo --non-interactive service nfs-server restart', shell=True) + + def __exit__(self, *args): + self._unexport() + shutil.rmtree(self._directory) + + def connectStorageServer(self): + connection = { + 'connection': self._nfsPath(), + 'iqn': '', + 'user': '', + 'tpgt': '1', + 'password': '******', + 'id': self.connectionID(), + 'port': ''} + result = self.vdsm().connectStorageServer( + storage.sd.NFS_DOMAIN, + self._NON_EXISTANT_POOL, + [connection]) + assert result['statuslist'][0]['id'] == self.connectionID() + + def disconnectStorageServer(self): + connection = { + 'connection': self._nfsPath(), + 'iqn': '', + 'user': '', + 'tpgt': '1', + 'password': '******', + 'id': self.connectionID(), + 'port': ''} + self.vdsm().disconnectStorageServer( + storage.sd.LOCALFS_DOMAIN, + self._NON_EXISTANT_POOL, + [connection]) + + def createStorageDomain(self): + DOMAIN_VERSION = 3 + self.vdsm().createStorageDomain( + storage.sd.NFS_DOMAIN, + self.domainID(), + 'some_name', + self._nfsPath(), + storage.sd.DATA_DOMAIN, + DOMAIN_VERSION) + return self.domainID() + + def _nfsPath(self): + return '127.0.0.1:%s' % self._directory -- To view, visit http://gerrit.ovirt.org/32990 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1781fc400c0604855d3143dde22ccb29e6cc8013 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yoav Kleinberger <ykleinbe(a)redhat.com>

4 6

Change in vdsm[master]: tests: new functional tests for vdsm storage
by ykleinbe＠redhat.com 08 Oct '15

08 Oct '15

Yoav Kleinberger has uploaded a new change for review. Change subject: tests: new functional tests for vdsm storage ...................................................................... tests: new functional tests for vdsm storage Ultimately, the purpose of this patch is to replace the existing tests/functional/storageTests.py, henceforth "the old test". The old test does not, in fact, verify VDSM behaviour. It only checks for the return codes that VDSM returns to its caller. This patch introduces a framework of "test contexts" that is extensible to various storage backends. Each test context, be it iscsi, nfs or some other storage type, knows how to tell VDSM to create its particular type of storage domain, and also knows how to verify that observable actions (e.g. the creation of a logical volume in an LVM volume group) have actually been performed. Currently, only localfs and iscsi are supported. Other storage backends will be added later. Change-Id: I1703e7c1dc223ff707775865cd14c7dd62314caf Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Yoav Kleinberger <ykleinbe(a)redhat.com> --- A tests/functional/basicStorageTest.py A tests/functional/testlib/__init__.py A tests/functional/testlib/controlvdsm.py A tests/functional/testlib/testcontexts/__init__.py A tests/functional/testlib/testcontexts/base.py A tests/functional/testlib/testcontexts/iscsi.py A tests/functional/testlib/testcontexts/localfs.py A tests/run_functional_storage_tests.sh 8 files changed, 459 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/32496/1 diff --git a/tests/functional/basicStorageTest.py b/tests/functional/basicStorageTest.py new file mode 100644 index 0000000..c78e4b2 --- /dev/null +++ b/tests/functional/basicStorageTest.py @@ -0,0 +1,42 @@ +import storage.volume +import storage.image +import logging +from testlib import controlvdsm +from testlib.testcontexts import localfs +from testlib.testcontexts import iscsi + +class TestBasicStorageDomain: + @classmethod + def setup_class(cls): + logging.basicConfig(level=logging.DEBUG, format='%(asctime)s TEST %(levelname)s: %(message)s') + + def setup(self): + controlVDSM = controlvdsm.ControlVDSM() + controlVDSM.cleanup() + + def testCreateVolumeLocalFS(self): + self._testCreateVolume(localfs.LocalFS) + + def testCreateVolumeISCSI(self): + self._testCreateVolume(iscsi.ISCSI) + + def _testCreateVolume(self, storageContext): + with storageContext() as (vdsm, verify): + storageServerID = vdsm.connectStorageServer() + verify.storageServerConnected() + + domainID = vdsm.createStorageDomain() + verify.storageDomainCreated(domainID) + + poolID = vdsm.createStoragePool() + verify.storagePoolCreated(poolID, masterDomainID = domainID) + + vdsm.connectStoragePool(poolID, masterDomainID = domainID) + vdsm.spmStart(poolID) + verify.spmStarted(poolID) + + vdsm.activateStorageDomain(domainID, poolID) + GIGABYTE = 1024 ** 3 + volumeInfo = vdsm.createVolume(1 * GIGABYTE) + verify.volumeCreated(volumeInfo) + vdsm.disconnectStorageServer() diff --git a/tests/functional/testlib/__init__.py b/tests/functional/testlib/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/functional/testlib/__init__.py diff --git a/tests/functional/testlib/controlvdsm.py b/tests/functional/testlib/controlvdsm.py new file mode 100644 index 0000000..a983bf3 --- /dev/null +++ b/tests/functional/testlib/controlvdsm.py @@ -0,0 +1,53 @@ +import subprocess +import logging +import vdsm.vdscli +import socket +import vdsm.config +import time + +class ControlVDSM: + def cleanup(self): + self._stopService() + assert not self._serviceRunning() + self._brutallyCleanFiles() + self._restartService() + return self._checkConnection() + + def _checkConnection(self): + useSSL = vdsm.config.config.getboolean('vars', 'ssl') + vdsmClient = vdsm.vdscli.connect(useSSL=useSSL) + RETRIES = 5 + for _ in range(RETRIES): + try: + vdsmClient.getStorageDomainsList() + logging.info('connection to VDSM succeeded') + return + except socket.error as e: + logging.warning('could not talk to VDSM: %s' % e) + time.sleep(1) + + raise Exception('could not connect to VDSM') + + def _stopService(self): + self._run("sudo service vdsmd stop") + + def _serviceRunning(self): + returnCode = subprocess.call('sudo service vdsmd status', shell=True, stdout=open('/dev/null','w'), stderr=open('/dev/null','w')) + logging.info('vdsm running: %s' % (returnCode == 0)) + return returnCode == 0 + + def _restartService(self): + self._run("sudo vdsm-tool configure --force") + self._run("sudo service vdsmd start") + + def _run(self, command): + logging.info('running: %s' % command) + returnCode = subprocess.call(command, shell=True, close_fds=True, stdout=open('/dev/null','w'), stderr=open('/dev/null','w')) + if returnCode != 0: + logging.warning('failure! command was: %s' % command) + else: + logging.info('finished.') + + def _brutallyCleanFiles(self): + logging.warning('removing /rhev/data-center without asking too many questions') + self._run('sudo rm -fr /rhev/data-center/*') diff --git a/tests/functional/testlib/testcontexts/__init__.py b/tests/functional/testlib/testcontexts/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/functional/testlib/testcontexts/__init__.py diff --git a/tests/functional/testlib/testcontexts/base.py b/tests/functional/testlib/testcontexts/base.py new file mode 100644 index 0000000..bccebdf --- /dev/null +++ b/tests/functional/testlib/testcontexts/base.py @@ -0,0 +1,101 @@ +import os +import vdsm.vdscli +import vdsm.config +import random +import uuid +import logging +import time + +class Verify: + def __init__(self, vdsm): + self._vdsm = vdsm + + def assertPathExists(self, path, link = False): + logging.info('verifying path: %s' % path) + if link: + assert os.path.lexists(path) + else: + assert os.path.exists(path) + + def assertPathDoesNotExist(self, path, link = False): + if link: + assert not os.path.lexists(path) + else: + assert not os.path.exists(path) + + def waitForVDSMToFinishTask(self, duration = 1): + time.sleep(duration) + + def storagePoolCreated(self, poolID, masterDomainID): + self.waitForVDSMToFinishTask() + linkToDomain = os.path.join('/rhev/data-center', poolID, masterDomainID) + masterAliasLink = os.path.join('/rhev/data-center', poolID, 'mastersd') + logging.info('verifying domain %s in pool %s' % (masterDomainID, poolID)) + assert os.path.lexists(linkToDomain) + logging.info('verifying symlink to master domain') + assert os.path.lexists(masterAliasLink) + + def waitFor(self, timeout, description, predicate, *args, **kwargs): + logging.info('waiting for "%s"' % description) + start = time.time() + for _ in xrange(timeout): + if predicate(*args, **kwargs): + logging.info('it took %s seconds' % (time.time() - start)) + return + time.sleep(1) + + assert False, 'waited %s seconds for "%s" but it did not happen' % (timeout, description) + + def spmStarted(self, poolID): + self.waitForVDSMToFinishTask() + masterDomainDirectory = '/rhev/data-center/%s/mastersd' % poolID + master = os.path.join(masterDomainDirectory, 'master') + tasks = os.path.join(master, 'tasks') + vms = os.path.join(master, 'vms') + allExist = lambda: ( os.path.exists(master) and os.path.exists(tasks) and os.path.exists(vms) ) + self.waitFor(60, 'SPM related subdirectories exist', allExist) + + def waitOnVDSMTask(self, taskID, timeout): + taskFinished = lambda: (self._taskStatus(taskID)['taskState'] == 'finished') + self.waitFor(timeout, 'vdsm task to be finished', taskFinished) + taskStatus = self._taskStatus(taskID) + assert taskStatus['code'] == 0, taskStatus['message'] + + def _taskStatus(self, taskID): + result = self._vdsm.getTaskStatus(taskID) + assert result['status']['code'] == 0 + taskStatus = result['taskStatus'] + return taskStatus + +class StorageBackend: + def __init__(self): + useSSL = vdsm.config.config.getboolean('vars', 'ssl') + self._vdsm = vdsm.vdscli.connect(useSSL=useSSL) + + def newUUID(self): + return str(uuid.uuid4()) + + def randomName(self, base): + return "%s_%04d" % (base, random.randint(1,10000)) + + def connectStoragePool(self, poolID, masterDomainID): + SCSI_KEY_DEPRECATED = 0 + result = self._vdsm.connectStoragePool(poolID, 1, SCSI_KEY_DEPRECATED, masterDomainID, 1) + self.verifyVDSMSuccess(result) + + def spmStart(self, poolID): + RECOVERY_MODE_DEPRECATED = 0 + SCSI_FENCING_DEPRECATED = 0 + result = self._vdsm.spmStart(poolID, -1, '-1', SCSI_FENCING_DEPRECATED, RECOVERY_MODE_DEPRECATED) + self.verifyVDSMSuccess(result) + + def activateStorageDomain(self, domainID, poolID): + result = self._vdsm.activateStorageDomain(domainID,poolID) + self.verifyVDSMSuccess(result) + + def stringForXMLRPC(self, number): + return str(number) + + def verifyVDSMSuccess(self, result): + if result[ 'status' ][ 'code' ] != 0: + raise Exception('expected OK result from VDSM, got "%s" instead' % str(result)) diff --git a/tests/functional/testlib/testcontexts/iscsi.py b/tests/functional/testlib/testcontexts/iscsi.py new file mode 100644 index 0000000..96d6958 --- /dev/null +++ b/tests/functional/testlib/testcontexts/iscsi.py @@ -0,0 +1,150 @@ +import os +import random +import logging +import tempfile +import shutil +import subprocess +import glob +import storage.sd +import storage.volume +import storage.image +from . import base + +class Verify(base.Verify): + def __init__(self, iqn, volumeGroup, vdsm, volumeID): + base.Verify.__init__(self, vdsm) + self._iqn = iqn + self._volumeGroup = volumeGroup + self._volumeID = volumeID + + def storageServerConnected(self): + targetNameFiles = glob.glob('/sys/devices/platform/host*/session*/iscsi_session/*/targetname') + targetNames = [ open(file).read().strip() for file in targetNameFiles ] + assert self._iqn in targetNames + + def storageDomainCreated(self, domainID): + self.waitFor(10, 'storage domain exists', self._storageDomainVolumesExist, domainID) + + def _storageDomainVolumesExist(self, domainID): + for name in [ 'ids', 'inbox', 'leases', 'master', 'metadata', 'outbox' ]: + doubleDashed = domainID.replace('-', '--') + expectedPath = os.path.join('/dev/mapper', '%s-%s' % (doubleDashed, name)) + logging.info('verifying: %s' % expectedPath) + if not os.path.lexists(expectedPath): + return False + + return True + + def volumeCreated(self, taskID): + self.waitOnVDSMTask(taskID, 10) + result = subprocess.call('sudo lvs %s | grep %s' % (self._volumeGroup['uuid'], self._volumeID), shell = True) + assert result == 0, "did not find logical volume in volume group" + +class ISCSI(base.StorageBackend): + _NULL_UUID = '00000000-0000-0000-0000-000000000000' + def __init__(self): + base.StorageBackend.__init__(self) + self._iqn = 'iqn.1970-01.functional.test:%04d' % random.randint(1,10000) + self._volumeGroup = { 'uuid': self.newUUID(), 'vgs_uuid': None } + self._poolID = self.newUUID() + self._connectionID = self.newUUID() + self._imageID = self.newUUID() + self._volumeID = self.newUUID() + logging.info( 'using the following attributes:' ) + for name in [ '_volumeGroup', '_iqn', '_poolID', '_connectionID', '_imageID', '_volumeID' ]: + logging.info( '%s => %s' % ( name, getattr(self,name) ) ) + + def _targetcli(self, command): + commandAsList = command.split() + logging.info('running targetcli: targetcli %s' % commandAsList) + subprocess.check_call( [ 'targetcli' ] + commandAsList, close_fds = True ) + + def __enter__(self): + self._testDirectory = tempfile.mkdtemp() + self._storageFile = os.path.join(self._testDirectory, 'testfile') + self._fileioBackstore = self.randomName('backfile') + logging.info('using %s, %s' % (self._fileioBackstore, self._storageFile)) + self._targetcli('/backstores/fileio create %s %s 10G' % (self._fileioBackstore, self._storageFile)) + self._targetcli('/iscsi create %s' % self._iqn) + self._targetcli('/iscsi/%s/tpg1/luns create /backstores/fileio/%s' % (self._iqn, self._fileioBackstore)) + self._targetcli('/iscsi/%s/tpg1 set attribute authentication=0 demo_mode_write_protect=0' % self._iqn) + self._targetcli('/iscsi/%s/tpg1 set attribute generate_node_acls=1 cache_dynamic_acls=1' % self._iqn) + return self, Verify(self._iqn, self._volumeGroup, self._vdsm, self._volumeID) + + def __exit__(self, *args): + doubleDashed = self._volumeGroup['uuid'].replace('-', '--') + mapperDevices = glob.glob('/dev/mapper/%s*' % doubleDashed ) + [ '/dev/mapper/%s' % self._lunGUID ] + for device in mapperDevices: + logging.info('removing %s' % device) + result = subprocess.call('sudo dmsetup remove %s' % device, shell=True) + if result != 0: + logging.warning('could not remove %s' % device) + self._targetcli( '/iscsi delete %s' % self._iqn ) + self._targetcli( '/backstores/fileio delete %s' % self._fileioBackstore ) + shutil.rmtree(self._testDirectory) + + def connectStorageServer(self): + connection = {'connection': '127.0.0.1', 'iqn': self._iqn, 'user': '', 'tpgt': '1', 'password': '', 'id': self._NULL_UUID, 'port': '3260'} + result = self._vdsm.connectStorageServer( + storage.sd.ISCSI_DOMAIN, + self._NULL_UUID, + [ connection ]) + self.verifyVDSMSuccess(result) + connectionDetails = result['statuslist'][0] + assert connectionDetails['status'] == 0 + logging.info( 'got id %s', connectionDetails['id'] ) + + def _findLUN(self): + result = self._vdsm.getDeviceList(storage.sd.ISCSI_DOMAIN) + for device in result['devList']: + for path in device['pathlist']: + if path['iqn'] == self._iqn: + logging.info( 'vdsm reports our LUN %s' % device ) + return device + + raise Exception("LUN not found!") + + def disconnectStorageServer(self): + connection = {'connection': '127.0.0.1', 'iqn': self._iqn, 'user': '', 'tpgt': '1', 'password': '', 'id': self._connectionID, 'port': '3260'} + result = self._vdsm.disconnectStorageServer( + storage.sd.ISCSI_DOMAIN, + self._poolID, + [ connection ]) + self.verifyVDSMSuccess(result) + + def createStoragePool(self): + POOL_TYPE_DEPRECATED = 0 + result = self._vdsm.createStoragePool(POOL_TYPE_DEPRECATED, self._poolID, self.randomName('pool'), self._domainID(), [ self._domainID() ], 1) + self.verifyVDSMSuccess(result) + return self._poolID + + def _domainID(self): + return self._volumeGroup['uuid'] + + def _createVG(self): + lun = self._findLUN() + result = self._vdsm.createVG(self._volumeGroup['uuid'], [ lun['GUID'] ]) + logging.info('createVG returned %s' % result) + self.verifyVDSMSuccess(result) + self._volumeGroup[ 'vgs_uuid' ] = result[ 'uuid' ] + self._lunGUID = lun['GUID'] + + def createStorageDomain(self): + self._createVG() + self._createStorageDomain() + return self._volumeGroup['uuid'] + + def _createStorageDomain(self): + domainID = self._volumeGroup['uuid'] + DOMAIN_VERSION = 3 + domainName = self.randomName( 'some_name' ) + result = self._vdsm.createStorageDomain(storage.sd.ISCSI_DOMAIN, domainID, domainName, self._volumeGroup['vgs_uuid'], storage.sd.DATA_DOMAIN, DOMAIN_VERSION) + self.verifyVDSMSuccess(result) + + def createVolume(self, size): + PREALLOCATE = 1 + result = self._vdsm.createVolume(self._domainID(), self._poolID, self._imageID, + self.stringForXMLRPC(size), storage.volume.RAW_FORMAT, PREALLOCATE, storage.image.DATA_DISK_TYPE, self._volumeID, self.randomName('iscsi_description')) + logging.info( 'createVolume result: %s' % result) + self.verifyVDSMSuccess(result) + return result[ 'uuid' ] diff --git a/tests/functional/testlib/testcontexts/localfs.py b/tests/functional/testlib/testcontexts/localfs.py new file mode 100644 index 0000000..b498b6e --- /dev/null +++ b/tests/functional/testlib/testcontexts/localfs.py @@ -0,0 +1,104 @@ +import tempfile +import pwd +import shutil +import os +import storage.sd +import storage.volume +import storage.image +from . import base + +class Verify(base.Verify): + def __init__(self, directory, vdsm): + base.Verify.__init__(self, vdsm) + self._directory = directory + + def storageServerConnected(self): + self.waitForVDSMToFinishTask(2) + transformedDirectory = self._directory.replace( '/', '_' ) + expectedSymlink = os.path.join('/rhev/data-center/mnt/', transformedDirectory) + self.assertPathExists(expectedSymlink, link = True) + + def storageDomainCreated(self, domainID): + self.waitForVDSMToFinishTask() + self._directIOTestFileExists() + domainRoot = os.path.join(self._directory, domainID) + expectedFiles = [ 'images', 'dom_md', 'dom_md/leases', 'dom_md/inbox', 'dom_md/outbox', 'dom_md/metadata', 'dom_md/ids' ] + expectedFullPaths = [ os.path.join(domainRoot, path) for path in expectedFiles ] + for path in expectedFullPaths: + assert os.path.exists(path) + + def _directIOTestFileExists(self): + self.waitForVDSMToFinishTask() + directIOTestFile = os.path.join(self._directory, '__DIRECT_IO_TEST__') + self.assertPathExists(directIOTestFile) + + def volumeCreated(self, volumeInfo): + taskID, domainID, imageID, volumeID = volumeInfo + self.waitOnVDSMTask(taskID, 20) + domain_directory = os.path.join(self._directory, domainID) + image_directory = os.path.join(domain_directory, 'images', imageID) + self.assertPathExists(image_directory) + volume_file = os.path.join(image_directory, volumeID) + volume_lease = '%s.lease' % volume_file + volume_meta = '%s.meta' % volume_file + for path in volume_file, volume_lease, volume_meta: + self.assertPathExists(path) + +class LocalFS(base.StorageBackend): + _NON_EXISTANT_POOL = '00000000-0000-0000-0000-000000000000' + def __init__(self): + base.StorageBackend.__init__(self) + self._domainID = self.newUUID() + self._poolID = self.newUUID() + self._imageID = self.newUUID() + self._volumeID = self.newUUID() + self._connectionID = self.newUUID() + + def __enter__(self): + self._createDirectoryForLocalFSStorage() + return self, Verify(self._directory, self._vdsm) + + def _createDirectoryForLocalFSStorage(self): + self._directory = tempfile.mkdtemp('', 'localfstest', '/var/tmp') + vdsm_user = pwd.getpwnam('vdsm') + os.chown(self._directory, vdsm_user.pw_uid, vdsm_user.pw_gid) + os.chmod(self._directory, 0755) + + def __exit__(self, *args): + shutil.rmtree(self._directory) + + def connectStorageServer(self): + localFilesystemConnection = {'connection': self._directory, 'iqn': '', 'user': '', 'tpgt': '1', 'password': '******', 'id': self._connectionID, 'port': ''} + result = self._vdsm.connectStorageServer( + storage.sd.LOCALFS_DOMAIN, + self._NON_EXISTANT_POOL, + [ localFilesystemConnection ]) + self.verifyVDSMSuccess(result) + assert result[ 'statuslist' ][ 0 ][ 'id' ] == self._connectionID + + def disconnectStorageServer(self): + localFilesystemConnection = {'connection': self._directory, 'iqn': '', 'user': '', 'tpgt': '1', 'password': '******', 'id': self._connectionID, 'port': ''} + result = self._vdsm.disconnectStorageServer( + storage.sd.LOCALFS_DOMAIN, + self._NON_EXISTANT_POOL, + [ localFilesystemConnection ]) + self.verifyVDSMSuccess(result) + + def createStoragePool(self): + POOL_TYPE_DEPRECATED = 0 + result = self._vdsm.createStoragePool(POOL_TYPE_DEPRECATED, self._poolID, self.randomName('pool'), self._domainID, [ self._domainID ], 1) + self.verifyVDSMSuccess(result) + return self._poolID + + def createStorageDomain(self): + DOMAIN_VERSION = 3 + result = self._vdsm.createStorageDomain(storage.sd.LOCALFS_DOMAIN, self._domainID, 'some_name', self._directory, storage.sd.DATA_DOMAIN, DOMAIN_VERSION) + self.verifyVDSMSuccess(result) + return self._domainID + + def createVolume(self, size): + PREALLOCATE = 1 + result = self._vdsm.createVolume(self._domainID, self._poolID, self._imageID, self.stringForXMLRPC(size), storage.volume.RAW_FORMAT, PREALLOCATE, storage.image.DATA_DISK_TYPE, self._volumeID, self.randomName('localfs_description')) + self.verifyVDSMSuccess(result) + taskID = result[ 'uuid' ] + return taskID, self._domainID, self._imageID, self._volumeID diff --git a/tests/run_functional_storage_tests.sh b/tests/run_functional_storage_tests.sh new file mode 100755 index 0000000..cb544ee --- /dev/null +++ b/tests/run_functional_storage_tests.sh @@ -0,0 +1,9 @@ +#!/bin/bash +if [[ "$1" = "--help" ]]; then + echo "run_functional_storage_tests.sh [--verbose]" + exit -1 +fi +if [[ "$1" = "--verbose" ]]; then + verbose="--nologcapture" +fi +sudo PYTHONPATH=../lib:../vdsm:functional nosetests -s $verbose functional/basicStorageTest.py -- To view, visit http://gerrit.ovirt.org/32496 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1703e7c1dc223ff707775865cd14c7dd62314caf Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yoav Kleinberger <ykleinbe(a)redhat.com>

6 26

Change in vdsm[master]: tests: alignmentScanTests.py is a functional test
by ykleinbe＠redhat.com 08 Oct '15

08 Oct '15

Yoav Kleinberger has uploaded a new change for review. Change subject: tests: alignmentScanTests.py is a functional test ...................................................................... tests: alignmentScanTests.py is a functional test Since alignmentScanTests invokes actual storage code, and does not mock it out, it should be categorized as a functional test. Change-Id: I4e20d17c3ebee1203bb5a721ce44d5867570ce8e Signed-off-by: Yoav Kleinberger <ykleinbe(a)redhat.com> --- M tests/Makefile.am M tests/functional/Makefile.am R tests/functional/alignmentScanTests.py 3 files changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/29745/1 diff --git a/tests/Makefile.am b/tests/Makefile.am index 4ef8f7d..f7f4f97 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = functional test_modules = \ - alignmentScanTests.py \ blocksdTests.py \ bridgeTests.py \ cPopenTests.py \ diff --git a/tests/functional/Makefile.am b/tests/functional/Makefile.am index b87fdf0..4fc2cc8 100644 --- a/tests/functional/Makefile.am +++ b/tests/functional/Makefile.am @@ -33,6 +33,7 @@ vmRecoveryTests.py \ storageTests.py \ veth.py \ + alignmentScanTests.py \ $(NULL) dist_vdsmfunctests_DATA = \ diff --git a/tests/alignmentScanTests.py b/tests/functional/alignmentScanTests.py similarity index 100% rename from tests/alignmentScanTests.py rename to tests/functional/alignmentScanTests.py -- To view, visit http://gerrit.ovirt.org/29745 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e20d17c3ebee1203bb5a721ce44d5867570ce8e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yoav Kleinberger <ykleinbe(a)redhat.com>

9 39

Change in vdsm[master]: tests: use 'localhost' explicitly in test
by ykleinbe＠redhat.com 08 Oct '15

08 Oct '15

Yoav Kleinberger has uploaded a new change for review. Change subject: tests: use 'localhost' explicitly in test ...................................................................... tests: use 'localhost' explicitly in test Previously tests could on some machines (in case the machine has a non-default hostname). Now, since we use 'localhost' explicitly, this will not happen. Change-Id: I89990cff46e64120262e250eee9238b49c4edee4 Signed-off-by: Yoav Kleinberger <ykleinbe(a)redhat.com> --- M tests/functional/storageTests.py 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/28107/1 diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py index 80ba312..76ca91d 100644 --- a/tests/functional/storageTests.py +++ b/tests/functional/storageTests.py @@ -79,7 +79,8 @@ isSSL = config.getboolean('vars', 'ssl') if isSSL and os.geteuid() != 0: raise SkipTest("Must be root to use SSL connection to server") - self.s = vdscli.connect(useSSL=isSSL) + address = 'localhost:%s' % config.get('addresses', 'management_port') + self.s = vdscli.connect(hostPort=address, useSSL=isSSL) def assertVdsOK(self, vdsResult): # code == 0 means OK -- To view, visit http://gerrit.ovirt.org/28107 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I89990cff46e64120262e250eee9238b49c4edee4 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yoav Kleinberger <ykleinbe(a)redhat.com>

8 20

Change in vdsm[master]: netinfoTests: add a test for getNicsVlanAndBondingForNetwork
by osvoboda＠redhat.com 08 Oct '15

08 Oct '15

Ondřej Svoboda has uploaded a new change for review. Change subject: netinfoTests: add a test for getNicsVlanAndBondingForNetwork ...................................................................... netinfoTests: add a test for getNicsVlanAndBondingForNetwork Change-Id: Ie196879ef7fd8ea54816cd090dead569c04c7f5b Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M tests/netinfoTests.py 1 file changed, 93 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/12/45112/1 diff --git a/tests/netinfoTests.py b/tests/netinfoTests.py index 94bf924..b3e4330 100644 --- a/tests/netinfoTests.py +++ b/tests/netinfoTests.py @@ -336,3 +336,96 @@ self.assertEqual(gateway, '12.34.56.1') gateway = netinfo._get_gateway(DUPLICATED_GATEWAY, TEST_IFACE) self.assertEqual(gateway, '12.34.56.1') + + def test_getNicsVlanAndBondingForNetwork(self): + FAKE_NETINFO = { + 'networks': { + 'just-nic': { + 'bridged': False, + 'iface': 'eth0', + + '_expected_nics': ['eth0'], + '_expected_vlan': None, + '_expected_vlan_id': None, + '_expected_bond': None, + }, + 'bond': { + 'bridged': False, + 'iface': 'bond0', + + '_expected_nics': ['eth1', 'eth2'], + '_expected_vlan': None, + '_expected_vlan_id': None, + '_expected_bond': 'bond0', + }, + 'vlan': { + 'bridged': False, + 'iface': 'eth0.123', + + '_expected_nics': ['eth0'], + '_expected_vlan': 'eth0.123', + '_expected_vlan_id': '123', + '_expected_bond': None, + }, + 'vlan-bond': { + 'bridged': False, + 'iface': 'bond0.99', + + '_expected_nics': ['eth1', 'eth2'], + '_expected_vlan': 'bond0.99', + '_expected_vlan_id': '99', + '_expected_bond': 'bond0', + }, + }, + 'vlans': { + 'eth0.123': { + 'iface': 'eth0', + 'vlanid': '123', + }, + 'bond0.99': { + 'iface': 'bond0', + 'vlanid': '99', + }, + }, + 'bondings': { + 'bond0': { + 'slaves': ['eth1', 'eth2'], + }, + }, + 'nics': { + 'eth0': {}, + 'eth1': {}, + 'eth2': {}, + 'vnet0': {}, # TUN device of a running VM + }, + 'bridges': {'not necessary': 'for the test'}, + } + + def _test(): + fake_netinfo = NetInfo(FAKE_NETINFO) + + for network, netdict in FAKE_NETINFO['networks'].iteritems(): + nics, vlan, vlan_id, bond = ( + fake_netinfo.getNicsVlanAndBondingForNetwork(network)) + self.assertEqual(nics, netdict['_expected_nics']) + self.assertEqual(vlan, netdict['_expected_vlan']) + self.assertEqual(vlan_id, netdict['_expected_vlan_id']) + self.assertEqual(bond, netdict['_expected_bond']) + + def _convert_to_bridged(): + for network, netdict in FAKE_NETINFO['networks'].iteritems(): + netdict['bridged'] = True + netdict['ports'] = [netdict['iface']] + del netdict['iface'] + + def _add_vnet0(): + for network, netdict in FAKE_NETINFO['networks'].iteritems(): + if netdict['bridged']: + netdict['ports'].append('vnet0') + netdict['_expected_nics'].append('vnet0') + + _test() + _convert_to_bridged() + _test() + _add_vnet0() + _test() -- To view, visit https://gerrit.ovirt.org/45112 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie196879ef7fd8ea54816cd090dead569c04c7f5b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

4 16

Change in vdsm[master]: netinfo: stop using getVlanID() in network.api
by osvoboda＠redhat.com 08 Oct '15

08 Oct '15

Ondřej Svoboda has uploaded a new change for review. Change subject: netinfo: stop using getVlanID() in network.api ...................................................................... netinfo: stop using getVlanID() in network.api The same information is already present in _netinfo. Change-Id: Ic473f3fbb0d7add34dca338d2b02f4d4d9ed47b0 Signed-off-by: Ondřej Svoboda <osvoboda(a)redhat.com> --- M lib/vdsm/netinfo.py M vdsm/network/api.py 2 files changed, 10 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/46741/1 diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py index 9245463..a96391d 100644 --- a/lib/vdsm/netinfo.py +++ b/lib/vdsm/netinfo.py @@ -795,7 +795,7 @@ return vlanLink.device -def getVlanID(vlan): +def _vlan_id(vlan): """ Return the ID of the given VLAN. """ vlanLink = getLink(vlan) return int(vlanLink.vlanid) @@ -884,7 +884,7 @@ if iface == interface: yield (network, None) elif interface.startswith(iface + '.'): - yield (network, getVlanID(interface)) + yield (network, _vlan_id(interface)) def _getBridgelessNetworksAndVlansForIface(self, iface): """ Returns tuples of (network, vlan) connected to nic/bond """ @@ -893,11 +893,11 @@ if iface == netdict['iface']: yield (network, None) elif netdict['iface'].startswith(iface + '.'): - yield (network, getVlanID(netdict['iface'])) + yield (network, _vlan_id(netdict['iface'])) def getVlansForIface(self, iface): for vlanDevName in self._getVlanDevsForIface(iface): - yield getVlanID(vlanDevName) + yield _vlan_id(vlanDevName) def _getVlanDevsForIface(self, iface): for v, vdict in self.vlans.iteritems(): diff --git a/vdsm/network/api.py b/vdsm/network/api.py index 3f1216e..518f0ae 100755 --- a/vdsm/network/api.py +++ b/vdsm/network/api.py @@ -149,7 +149,12 @@ 'enslaved to %s' % (nic, bond)) topNetDev = Nic(nic, configurator, mtu=mtu, _netinfo=_netinfo) if vlan is not None: - tag = netinfo.getVlanID(vlan) if vlan_id is None else vlan_id + try: + tag = (_netinfo.vlans[vlan]['vlanid'] if vlan_id is None else + vlan_id) + except IndexError: + raise ConfigNetworkError(ne.ERR_BAD_VLAN, 'VLAN tag was not passed' + ' for a non-existent %s' % (vlan,)) topNetDev = Vlan(topNetDev, tag, configurator, mtu=mtu, name=vlan) elif vlan_id is not None: topNetDev = Vlan(topNetDev, vlan_id, configurator, mtu=mtu) -- To view, visit https://gerrit.ovirt.org/46741 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic473f3fbb0d7add34dca338d2b02f4d4d9ed47b0 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Ondřej Svoboda <osvoboda(a)redhat.com>

5 16

Change in vdsm[master]: virt: Don't warn about unknown type for channel devices
by Vinzenz Feenstra 07 Oct '15

07 Oct '15

Vinzenz Feenstra has uploaded a new change for review. Change subject: virt: Don't warn about unknown type for channel devices ...................................................................... virt: Don't warn about unknown type for channel devices We're currently issuing warnings in the VDSM logs for channel devices: Thread-38551::WARNING::2014-08-07 08:40:26,595::vm::2059::vm.Vm::(buildConfDevices) vmId=`97ca14a3-1502-4ac6-bb48-ba9dcd8179d2`::Unknown type found, device: '{'device': 'unix', 'alias': 'channel0', 'type': 'channel', 'address': {'bus': '0', 'controller': '0', 'type': 'virtio-serial', 'port': '1'}}' found These warnings are not supposed to be issues as we do just do not maintain them. This patch changes this to not warn in those cases. Change-Id: Id391770f9f51a9190035f71a3487271d4062fa67 Bug-Url: https://bugzilla.redhat.com/1128881 Signed-off-by: Vinzenz Feenstra <vfeenstr(a)redhat.com> --- M vdsm/virt/vm.py 1 file changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/88/46788/1 diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index 601fa9c..793f1e7 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -465,8 +465,9 @@ try: devices[dev['type']].append(dev) except KeyError: - self.log.warn("Unknown type found, device: '%s' " - "found", dev) + if 'type' not in dev or dev['type'] != 'console': + self.log.warn("Unknown type found, device: '%s' " + "found", dev) devices[hwclass.GENERAL].append(dev) if not devices[hwclass.GRAPHICS]: -- To view, visit https://gerrit.ovirt.org/46788 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id391770f9f51a9190035f71a3487271d4062fa67 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Vinzenz Feenstra <vfeenstr(a)redhat.com>

5 9

Change in vdsm[master]: automation: Disable tcTests and netinfoTests correctly
by Nir Soffer 07 Oct '15

07 Oct '15

Nir Soffer has uploaded a new change for review. Change subject: automation: Disable tcTests and netinfoTests correctly ...................................................................... automation: Disable tcTests and netinfoTests correctly These tests were incorrectly disabled using NOSE_EXCLUDE, disabling also one of the tests in utilsTests.py. Now we use NOSE_EXCLUDE_FILES to exclude files. Change-Id: I3be2fe5774ec7f964416e02f809f44263e7d5644 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M automation/check-patch.sh 1 file changed, 2 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/46641/1 diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 15707e8..6e457c0 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -2,16 +2,8 @@ set -xe -# this redefines 'ugly' but looks like NOSE_EXCLUDE works at test method level, -# not at module neither at testcase level, so we have no choice but this. -export NOSE_EXCLUDE="\ -.*testGetBondingOptions.*|\ -testMirroring.*|\ -testToggleIngress|\ -testException|\ -testQdiscsOfDevice|\ -testReplacePrio\ -" +# TODO: check why these are disabled +export NOSE_IGNORE_FILES="tcTests.py|netinfoTests.py" ./autogen.sh --system --enable-hooks make check -- To view, visit https://gerrit.ovirt.org/46641 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3be2fe5774ec7f964416e02f809f44263e7d5644 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 10

Change in vdsm[master]: atomation: Remove commented code
by Nir Soffer 07 Oct '15

07 Oct '15

Nir Soffer has uploaded a new change for review. Change subject: atomation: Remove commented code ...................................................................... atomation: Remove commented code We don't keep commented code in vdsm. Change-Id: I3a3bf8c82ce38afe064a0941e7e9af550e39dc2b Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M automation/check-patch.sh 1 file changed, 0 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/39/46639/1 diff --git a/automation/check-patch.sh b/automation/check-patch.sh index 76b194b..15707e8 100755 --- a/automation/check-patch.sh +++ b/automation/check-patch.sh @@ -2,9 +2,6 @@ set -xe -# Nose 1.3.0 and later segatult with this flag -#export NOSE_WITH_XUNIT=1 - # this redefines 'ugly' but looks like NOSE_EXCLUDE works at test method level, # not at module neither at testcase level, so we have no choice but this. export NOSE_EXCLUDE="\ -- To view, visit https://gerrit.ovirt.org/46639 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3a3bf8c82ce38afe064a0941e7e9af550e39dc2b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 7

← Newer
1
...
23
24
25
26
27
28
29
...
67
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches September 2015