Change in vdsm[master]: automation: adding f25 conf files
by Code Review
From Yaniv Bronhaim <ybronhei(a)redhat.com>:
Yaniv Bronhaim has uploaded a new change for review.
Change subject: automation: adding f25 conf files
......................................................................
automation: adding f25 conf files
Change-Id: Ie7d527a269db00a933d2511f91134a06caacbb6b
Signed-off-by: Yaniv Bronhaim <ybronhei(a)redhat.com>
---
A automation/build-artifacts-manual.packages.fc25
A automation/build-artifacts-manual.repos.fc25
A automation/build-artifacts.packages.fc25
A automation/build-artifacts.repos.fc25
A automation/check-merged.packages.fc25
A automation/check-merged.repos.fc25
A automation/check-patch.packages.fc25
A automation/check-patch.repos.fc25
8 files changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/76/69176/1
diff --git a/automation/build-artifacts-manual.packages.fc25 b/automation/build-artifacts-manual.packages.fc25
new file mode 120000
index 0000000..179ee82
--- /dev/null
+++ b/automation/build-artifacts-manual.packages.fc25
@@ -0,0 +1 @@
+build-artifacts.packages.fc25
\ No newline at end of file
diff --git a/automation/build-artifacts-manual.repos.fc25 b/automation/build-artifacts-manual.repos.fc25
new file mode 120000
index 0000000..1841c6e
--- /dev/null
+++ b/automation/build-artifacts-manual.repos.fc25
@@ -0,0 +1 @@
+build-artifacts.repos.fc25
\ No newline at end of file
diff --git a/automation/build-artifacts.packages.fc25 b/automation/build-artifacts.packages.fc25
new file mode 120000
index 0000000..040987f
--- /dev/null
+++ b/automation/build-artifacts.packages.fc25
@@ -0,0 +1 @@
+build-artifacts.packages.fc24
\ No newline at end of file
diff --git a/automation/build-artifacts.repos.fc25 b/automation/build-artifacts.repos.fc25
new file mode 120000
index 0000000..3fe2925
--- /dev/null
+++ b/automation/build-artifacts.repos.fc25
@@ -0,0 +1 @@
+check-merged.repos.fc25
\ No newline at end of file
diff --git a/automation/check-merged.packages.fc25 b/automation/check-merged.packages.fc25
new file mode 120000
index 0000000..c5e146e
--- /dev/null
+++ b/automation/check-merged.packages.fc25
@@ -0,0 +1 @@
+check-merged.packages.fc24
\ No newline at end of file
diff --git a/automation/check-merged.repos.fc25 b/automation/check-merged.repos.fc25
new file mode 120000
index 0000000..9afbbd4
--- /dev/null
+++ b/automation/check-merged.repos.fc25
@@ -0,0 +1 @@
+check-patch.repos.fc25
\ No newline at end of file
diff --git a/automation/check-patch.packages.fc25 b/automation/check-patch.packages.fc25
new file mode 120000
index 0000000..b3d0a5b
--- /dev/null
+++ b/automation/check-patch.packages.fc25
@@ -0,0 +1 @@
+check-patch.packages.fc24
\ No newline at end of file
diff --git a/automation/check-patch.repos.fc25 b/automation/check-patch.repos.fc25
new file mode 120000
index 0000000..4b50a83
--- /dev/null
+++ b/automation/check-patch.repos.fc25
@@ -0,0 +1 @@
+check-patch.repos.fc24
\ No newline at end of file
--
To view, visit https://gerrit.ovirt.org/69176
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7d527a269db00a933d2511f91134a06caacbb6b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybronhei(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: [WIP] tests: CountFilesPlugin
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: [WIP] tests: CountFilesPlugin
......................................................................
[WIP] tests: CountFilesPlugin
A proper test should clean after itself, and close all the files it had
opened. Enabling this plugin, with --with-countfiles, shows which test
(or its tested code), fail to do so.
Change-Id: Ic71224f3c24b04cf4d08889338722cf248bcb2a9
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/testValidation.py
M tests/testlib.py
2 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/69042/1
diff --git a/tests/testValidation.py b/tests/testValidation.py
index a4b6789..ed84c19 100644
--- a/tests/testValidation.py
+++ b/tests/testValidation.py
@@ -107,6 +107,36 @@
raise Exception('thread leak: %s ' % diff)
+class CountFilesPlugin(Plugin):
+ """
+ Check whether a test (or the code it triggers) open files and do not close
+ them.
+ """
+ name = 'countfiles'
+
+ def _readlink_if_exists(self, path):
+ try:
+ return os.readlink(path)
+ except OSError as e:
+ if e.errno != errno.ENOENT:
+ raise
+
+ def _open_files(self):
+ fddir = '/proc/%s/fd/' % os.getpid()
+
+ return frozenset(
+ self._readlink_if_exists(fddir + path) for path
+ in os.listdir(fddir))
+
+ def startTest(self, test):
+ self._start_files = self._open_files()
+
+ def stopTest(self, test):
+ diff = self._open_files() - self._start_files
+ if diff:
+ raise Exception('file leak: %s ' % diff)
+
+
def ValidateRunningAsRoot(f):
@wraps(f)
def wrapper(*args, **kwargs):
diff --git a/tests/testlib.py b/tests/testlib.py
index 8a55e6e..694457d 100644
--- a/tests/testlib.py
+++ b/tests/testlib.py
@@ -59,7 +59,7 @@
from monkeypatch import Patch
from testValidation import (
- SlowTestsPlugin, StressTestsPlugin, CountThreadsPlugin)
+ SlowTestsPlugin, StressTestsPlugin, CountThreadsPlugin, CountFilesPlugin)
# /tmp may use tempfs filesystem, not suitable for some of the test assuming a
# filesystem with direct io support.
@@ -435,6 +435,7 @@
conf.plugins.addPlugin(SlowTestsPlugin())
conf.plugins.addPlugin(StressTestsPlugin())
conf.plugins.addPlugin(CountThreadsPlugin())
+ conf.plugins.addPlugin(CountFilesPlugin())
runner = VdsmTestRunner(stream=conf.stream,
verbosity=conf.verbosity,
--
To view, visit https://gerrit.ovirt.org/69042
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic71224f3c24b04cf4d08889338722cf248bcb2a9
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: spec: rpmlint: clean non-executable-script
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: spec: rpmlint: clean non-executable-script
......................................................................
spec: rpmlint: clean non-executable-script
This patch removes the shebang from python modules that are not
executable. It makes sure that python scripts are marked as such by
autoconf, and that no python file would be listed as both a script and a
module.
Change-Id: I0b2ccc1157880b75286097f0c2623616779f0113
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M automation/check-patch.sh
M lib/api/vdsmapi.py
M lib/vdsm/tool/dummybr.py
M lib/vdsm/tool/nwfilter.py
M tests/Makefile.am
M tests/alignmentScanTests.py
M vdsm.spec.in
M vdsm/virt/Makefile.am
8 files changed, 4 insertions(+), 18 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/69348/1
diff --git a/automation/check-patch.sh b/automation/check-patch.sh
index ee89fef..939161b 100755
--- a/automation/check-patch.sh
+++ b/automation/check-patch.sh
@@ -30,5 +30,5 @@
yum -y install "$EXPORT_DIR/"!(*.src).rpm
export LC_ALL=C # no idea why this is suddenly needed
rpmlint "$EXPORT_DIR/"*.src.rpm
- ! rpmlint "$EXPORT_DIR/"!(*.src).rpm | grep '\(dir-or-file-in-var-run\|wrong-script-interpreter\)'
+ ! rpmlint "$EXPORT_DIR/"!(*.src).rpm | grep '\(dir-or-file-in-var-run\|wrong-script-interpreter\|non-executable-script\)'
fi
diff --git a/lib/api/vdsmapi.py b/lib/api/vdsmapi.py
index 7392a3d..57d9aba 100755
--- a/lib/api/vdsmapi.py
+++ b/lib/api/vdsmapi.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python2
#
# Copyright 2016 Red Hat, Inc.
#
diff --git a/lib/vdsm/tool/dummybr.py b/lib/vdsm/tool/dummybr.py
index 8624eb9..01ffb6f 100644
--- a/lib/vdsm/tool/dummybr.py
+++ b/lib/vdsm/tool/dummybr.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python2
# Copyright 2012 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -56,7 +55,3 @@
if not os.path.exists('/sys/class/net/%s' % DUMMY_BRIDGE):
createEphemeralBridge(DUMMY_BRIDGE)
addBridgeToLibvirt(DUMMY_BRIDGE)
-
-
-if __name__ == '__main__':
- main()
diff --git a/lib/vdsm/tool/nwfilter.py b/lib/vdsm/tool/nwfilter.py
index 7b1bdb4..bcb5cfd 100755
--- a/lib/vdsm/tool/nwfilter.py
+++ b/lib/vdsm/tool/nwfilter.py
@@ -1,4 +1,3 @@
-#! /usr/bin/python2
# Copyright 2012-2013 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
@@ -92,6 +91,3 @@
<filterref filter='no-mac-spoofing'/>
<filterref filter='no-arp-mac-spoofing'/>
</filter> '''
-
-if __name__ == '__main__':
- main()
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3976889..fbe242b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -340,9 +340,6 @@
hookValidation.py \
fakelib.py \
fakesanlock.py \
- fake-virt-v2v \
- fake-ssh-add \
- fake-ssh-agent \
monkeypatch.py \
storagefakelib.py \
storagetestlib.py \
@@ -354,8 +351,10 @@
$(NULL)
dist_vdsmtests_SCRIPTS = \
+ fake-virt-v2v \
+ fake-ssh-add \
+ fake-ssh-agent \
run_tests.sh \
- testValidation.py \
$(NULL)
all-local: \
diff --git a/tests/alignmentScanTests.py b/tests/alignmentScanTests.py
index da589f9..762c8a5 100644
--- a/tests/alignmentScanTests.py
+++ b/tests/alignmentScanTests.py
@@ -1,4 +1,3 @@
-#!/usr/bin/python2
#
# Copyright (c) 2016 Red Hat, Inc.
# Copyright (c) 2012, Sasha Tomic <tomic80(a)gmail.com>
diff --git a/vdsm.spec.in b/vdsm.spec.in
index eef5a4f..1f4858a 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -896,7 +896,6 @@
%{_datadir}/%{vdsm_name}/virt/recovery.py*
%{_datadir}/%{vdsm_name}/virt/vmtune.py*
%{_datadir}/%{vdsm_name}/virt/vm.py*
-%{_datadir}/%{vdsm_name}/virt/vm_migrate_hook.py*
%{_datadir}/%{vdsm_name}/virt/vmxml.py*
%{_datadir}/%{vdsm_name}/virt/vmdevices/__init__.py*
%{_datadir}/%{vdsm_name}/virt/vmdevices/common.py*
diff --git a/vdsm/virt/Makefile.am b/vdsm/virt/Makefile.am
index 7ee277d..897faf0 100644
--- a/vdsm/virt/Makefile.am
+++ b/vdsm/virt/Makefile.am
@@ -28,7 +28,6 @@
domain_descriptor.py \
recovery.py \
vm.py \
- vm_migrate_hook.py \
vmtune.py \
vmxml.py \
$(NULL)
--
To view, visit https://gerrit.ovirt.org/69348
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b2ccc1157880b75286097f0c2623616779f0113
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: spec: rpmlint: clean wrong-script-interpreter
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: spec: rpmlint: clean wrong-script-interpreter
......................................................................
spec: rpmlint: clean wrong-script-interpreter
Some of our scripts used /usr/bin/env as an interpreter, which is not
allowed by Fedora.
This patch also fixes a couple of ambiguous references to "python" which
were hidden from commit 82bcde2's sed.
Change-Id: Ib17ce3292ea02388a8318707bb7ebeeaa811edb5
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M automation/check-patch.sh
M contrib/logdb
M contrib/logstat
M contrib/profile-stats
M helpers/kvm2ovirt
M lib/api/schema_to_html.py
M lib/api/vdsmapi.py
M tests/containers/fake/bin/docker
M tests/containers/fake/bin/systemctl
M tests/containers/fake/bin/systemd-run
M tests/fake-ssh-add
M tests/fake-ssh-agent
M tests/fake-virt-v2v
M tests/functional/networkTests.py
M vdsm/virt/vm_migrate_hook.py
M vdsm_hooks/allocate_net/before_device_create.py
M vdsm_hooks/checkips/after_get_stats.py
M vdsm_hooks/diskunmap/before_vm_start.py
M vdsm_hooks/ethtool_options/ethtool_options.py
M vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
M vdsm_hooks/ipv6/ipv6.py
M vdsm_hooks/macbind/before_vm_start.py
M vdsm_hooks/openstacknet/before_device_migrate_destination.py
M vdsm_hooks/ovs/ovs_after_get_caps.py
M vdsm_hooks/ovs/ovs_after_get_stats.py
M vdsm_hooks/ovs/ovs_after_network_setup.py
M vdsm_hooks/ovs/ovs_after_network_setup_fail.py
M vdsm_hooks/ovs/ovs_before_device_create.py
M vdsm_hooks/ovs/ovs_before_network_setup.py
M vdsm_hooks/ovs/ovs_before_network_setup_ip.py
M vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
M vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
M vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
M vdsm_hooks/ovs/ovs_utils.py
34 files changed, 34 insertions(+), 34 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/63/68663/1
diff --git a/automation/check-patch.sh b/automation/check-patch.sh
index 27b9d88..c4083b5 100755
--- a/automation/check-patch.sh
+++ b/automation/check-patch.sh
@@ -29,5 +29,5 @@
./automation/build-artifacts.sh
yum -y install "$EXPORT_DIR/"!(*.src).rpm
rpmlint "$EXPORT_DIR/"*.src.rpm
- ! rpmlint "$EXPORT_DIR/"!(*.src).rpm | grep dir-or-file-in-var-run
+ ! rpmlint "$EXPORT_DIR/"!(*.src).rpm | grep '\(dir-or-file-in-var-run\|wrong-script-interpreter\)
fi
diff --git a/contrib/logdb b/contrib/logdb
index 6802afc..d7e3d82 100755
--- a/contrib/logdb
+++ b/contrib/logdb
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2015 Red Hat, Inc.
#
diff --git a/contrib/logstat b/contrib/logstat
index 7d0c640..38c78dd 100755
--- a/contrib/logstat
+++ b/contrib/logstat
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2016 Red Hat, Inc.
#
diff --git a/contrib/profile-stats b/contrib/profile-stats
index 4b02cd9..c1a3c36 100755
--- a/contrib/profile-stats
+++ b/contrib/profile-stats
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/helpers/kvm2ovirt b/helpers/kvm2ovirt
index 29a2ecb..1bb4075 100755
--- a/helpers/kvm2ovirt
+++ b/helpers/kvm2ovirt
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2016 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/lib/api/schema_to_html.py b/lib/api/schema_to_html.py
index 8ba985a..30d9600 100755
--- a/lib/api/schema_to_html.py
+++ b/lib/api/schema_to_html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright (C) 2012-2016 Adam Litke, IBM Corporation
# Copyright 2016 Red Hat, Inc.
diff --git a/lib/api/vdsmapi.py b/lib/api/vdsmapi.py
index 1219f55..7392a3d 100755
--- a/lib/api/vdsmapi.py
+++ b/lib/api/vdsmapi.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2016 Red Hat, Inc.
#
diff --git a/tests/containers/fake/bin/docker b/tests/containers/fake/bin/docker
index 0358311..1e1c85d 100755
--- a/tests/containers/fake/bin/docker
+++ b/tests/containers/fake/bin/docker
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import os
import os.path
diff --git a/tests/containers/fake/bin/systemctl b/tests/containers/fake/bin/systemctl
index b17856d..50bb77c 100755
--- a/tests/containers/fake/bin/systemctl
+++ b/tests/containers/fake/bin/systemctl
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import json
import sys
diff --git a/tests/containers/fake/bin/systemd-run b/tests/containers/fake/bin/systemd-run
index 5454dd7..b8c3570 100755
--- a/tests/containers/fake/bin/systemd-run
+++ b/tests/containers/fake/bin/systemd-run
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
import subprocess
import sys
diff --git a/tests/fake-ssh-add b/tests/fake-ssh-add
index dbf9115..2798218 100755
--- a/tests/fake-ssh-add
+++ b/tests/fake-ssh-add
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2016 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/tests/fake-ssh-agent b/tests/fake-ssh-agent
index dba1af6..d206656 100755
--- a/tests/fake-ssh-agent
+++ b/tests/fake-ssh-agent
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2016 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/tests/fake-virt-v2v b/tests/fake-virt-v2v
index ff3ae15..a1373b6 100755
--- a/tests/fake-virt-v2v
+++ b/tests/fake-virt-v2v
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 6b892a7..e42989d 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -1827,7 +1827,7 @@
@cleanupNet
@ValidatesHook('before_network_setup', 'testBeforeNetworkSetup.py', True,
- "#!/usr/bin/env python\n"
+ "#!/usr/bin/python2\n"
"import json\n"
"import os\n"
"\n"
diff --git a/vdsm/virt/vm_migrate_hook.py b/vdsm/virt/vm_migrate_hook.py
index 635e5b8..673425d 100755
--- a/vdsm/virt/vm_migrate_hook.py
+++ b/vdsm/virt/vm_migrate_hook.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2016 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/allocate_net/before_device_create.py b/vdsm_hooks/allocate_net/before_device_create.py
index af32bef..279e2e5 100644
--- a/vdsm_hooks/allocate_net/before_device_create.py
+++ b/vdsm_hooks/allocate_net/before_device_create.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/vdsm_hooks/checkips/after_get_stats.py b/vdsm_hooks/checkips/after_get_stats.py
index 53942b0..3692f88 100644
--- a/vdsm_hooks/checkips/after_get_stats.py
+++ b/vdsm_hooks/checkips/after_get_stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
#
# Copyright 2016 Red Hat, Inc.
#
diff --git a/vdsm_hooks/diskunmap/before_vm_start.py b/vdsm_hooks/diskunmap/before_vm_start.py
index 067ad93..e31361d 100644
--- a/vdsm_hooks/diskunmap/before_vm_start.py
+++ b/vdsm_hooks/diskunmap/before_vm_start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/vdsm_hooks/ethtool_options/ethtool_options.py b/vdsm_hooks/ethtool_options/ethtool_options.py
index fb0e7e2..8558895 100644
--- a/vdsm_hooks/ethtool_options/ethtool_options.py
+++ b/vdsm_hooks/ethtool_options/ethtool_options.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2014 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
index c316990..4d3348f 100644
--- a/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
+++ b/vdsm_hooks/extra_ipv4_addrs/extra_ipv4_addrs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2014 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ipv6/ipv6.py b/vdsm_hooks/ipv6/ipv6.py
index c1465c1..9ba90eb 100644
--- a/vdsm_hooks/ipv6/ipv6.py
+++ b/vdsm_hooks/ipv6/ipv6.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2014 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/macbind/before_vm_start.py b/vdsm_hooks/macbind/before_vm_start.py
index 3cb11d6..21afba5 100644
--- a/vdsm_hooks/macbind/before_vm_start.py
+++ b/vdsm_hooks/macbind/before_vm_start.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
#
# Copyright 2014 Red Hat, Inc.
#
diff --git a/vdsm_hooks/openstacknet/before_device_migrate_destination.py b/vdsm_hooks/openstacknet/before_device_migrate_destination.py
index f9dc5f5..f02d828 100755
--- a/vdsm_hooks/openstacknet/before_device_migrate_destination.py
+++ b/vdsm_hooks/openstacknet/before_device_migrate_destination.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
"""
OpenStack Network Hook (pre device migration)
diff --git a/vdsm_hooks/ovs/ovs_after_get_caps.py b/vdsm_hooks/ovs/ovs_after_get_caps.py
index e11ee99..594e8b6 100755
--- a/vdsm_hooks/ovs/ovs_after_get_caps.py
+++ b/vdsm_hooks/ovs/ovs_after_get_caps.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_after_get_stats.py b/vdsm_hooks/ovs/ovs_after_get_stats.py
index 8b394af..7d90635 100755
--- a/vdsm_hooks/ovs/ovs_after_get_stats.py
+++ b/vdsm_hooks/ovs/ovs_after_get_stats.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_after_network_setup.py b/vdsm_hooks/ovs/ovs_after_network_setup.py
index ee13683..5584979 100755
--- a/vdsm_hooks/ovs/ovs_after_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_after_network_setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_after_network_setup_fail.py b/vdsm_hooks/ovs/ovs_after_network_setup_fail.py
index 7545b96..b4c9a32 100755
--- a/vdsm_hooks/ovs/ovs_after_network_setup_fail.py
+++ b/vdsm_hooks/ovs/ovs_after_network_setup_fail.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_device_create.py b/vdsm_hooks/ovs/ovs_before_device_create.py
index 5d7adfc..8cf42cc 100755
--- a/vdsm_hooks/ovs/ovs_before_device_create.py
+++ b/vdsm_hooks/ovs/ovs_before_device_create.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup.py b/vdsm_hooks/ovs/ovs_before_network_setup.py
index c83613a..8795b92 100755
--- a/vdsm_hooks/ovs/ovs_before_network_setup.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
index d015385..4b2d9df 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py b/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
index 9eb7495..c9ce21b 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_libvirt.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
index 0587fe7..9d2207e 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_mtu.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
index 7bcee58..2abf70e 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ovs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/vdsm_hooks/ovs/ovs_utils.py b/vdsm_hooks/ovs/ovs_utils.py
index 808d793..7ea72e5 100644
--- a/vdsm_hooks/ovs/ovs_utils.py
+++ b/vdsm_hooks/ovs/ovs_utils.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python2
# Copyright 2015 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
--
To view, visit https://gerrit.ovirt.org/68663
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib17ce3292ea02388a8318707bb7ebeeaa811edb5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: check-merged: collect lago logs
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: check-merged: collect lago logs
......................................................................
check-merged: collect lago logs
Change-Id: I69673a9c4684ebeefdb37ccbeb2abed039efe76c
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M automation/check-merged.sh
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/38/69138/1
diff --git a/automation/check-merged.sh b/automation/check-merged.sh
index 2e4df95..facb478 100755
--- a/automation/check-merged.sh
+++ b/automation/check-merged.sh
@@ -120,11 +120,10 @@
lago cleanup
+
cat "$EXPORTS/functional_tests_stdout.$distro.log"
-[[ -e "logs" ]] \
-&& {
- tar cvzf "$EXPORTS/lago-logs.tar.gz" logs
-}
+mkdir "$EXPORTS"/lago-logs
+cp "$PREFIX"/*.log "$EXPORTS"/lago-logs
exit $failed
--
To view, visit https://gerrit.ovirt.org/69138
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I69673a9c4684ebeefdb37ccbeb2abed039efe76c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: pylint: storage.sd.SDManifest: declare special_volumes as th...
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: pylint: storage.sd.SDManifest: declare special_volumes as the classmethod it is
......................................................................
pylint: storage.sd.SDManifest: declare special_volumes as the classmethod it is
Change-Id: I205b03aeccf37986eebd0772799d886e9b750c7a
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M vdsm/storage/sd.py
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/69343/1
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index bc59b3f..36ede36 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -332,6 +332,7 @@
self._domainLock = self._makeDomainLock()
self._external_leases_lock = rwlock.RWLock()
+ @classmethod
def special_volumes(cls, version):
"""
Return the special volumes managed by this storage domain.
--
To view, visit https://gerrit.ovirt.org/69343
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I205b03aeccf37986eebd0772799d886e9b750c7a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: tests_child: drop odd mangling od sys.path
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: tests_child: drop odd mangling od sys.path
......................................................................
tests_child: drop odd mangling od sys.path
The dropped line might have meant something when we had an infra
subpackage. Now it serves nothing.
Change-Id: If527eb0392fed17c69477f780b0fa5e73358bda1
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/tests_child.py
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/26/69326/1
diff --git a/tests/tests_child.py b/tests/tests_child.py
index b69a438..ddfe88f 100755
--- a/tests/tests_child.py
+++ b/tests/tests_child.py
@@ -26,7 +26,6 @@
import time
import threading
-sys.path.insert(0, '../../..')
from vdsm.common import sigutils
--
To view, visit https://gerrit.ovirt.org/69326
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If527eb0392fed17c69477f780b0fa5e73358bda1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: pylint: bindingxmlrpc: exception should inherit from Exception
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: pylint: bindingxmlrpc: exception should inherit from Exception
......................................................................
pylint: bindingxmlrpc: exception should inherit from Exception
Change-Id: Iff8c2a8557a50921f911797c824eaf30898c75ba
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/rpc/bindingxmlrpc.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/69341/1
diff --git a/lib/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py
index d40090f..5490c84 100644
--- a/lib/vdsm/rpc/bindingxmlrpc.py
+++ b/lib/vdsm/rpc/bindingxmlrpc.py
@@ -112,7 +112,7 @@
HEADER_CONTENT_TYPE = 'content-type'
HEADER_CONTENT_RANGE = 'content-range'
- class RequestException():
+ class RequestException(Exception):
def __init__(self, httpStatusCode, errorMessage):
self.httpStatusCode = httpStatusCode
self.errorMessage = errorMessage
--
To view, visit https://gerrit.ovirt.org/69341
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iff8c2a8557a50921f911797c824eaf30898c75ba
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: pylint: hostdevTests: differentiate device object and device...
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: pylint: hostdevTests: differentiate device object and device_name
......................................................................
pylint: hostdevTests: differentiate device object and device_name
Change-Id: I37f87d020806c003b35dfa570907f826b7ca14dc
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M tests/hostdevTests.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/42/69342/1
diff --git a/tests/hostdevTests.py b/tests/hostdevTests.py
index 53ff1c6..86ecd40 100644
--- a/tests/hostdevTests.py
+++ b/tests/hostdevTests.py
@@ -526,15 +526,15 @@
'smp': '8', 'maxVCpus': '160',
'memSize': '1024', 'memGuaranteedSize': '512'}
- @permutations([[device] for device in _PCI_DEVICES + _USB_DEVICES +
- [_SCSI_DEVICES[2]]])
+ @permutations([[device_name] for device_name in _PCI_DEVICES +
+ _USB_DEVICES + [_SCSI_DEVICES[2]]])
def testCreateHostDevice(self, device_name):
dev_spec = {'type': 'hostdev', 'device': device_name}
device = hostdevice.HostDevice(self.conf, self.log, **dev_spec)
self.assertXMLEqual(vmxml.format_xml(device.getXML()),
_DEVICE_XML[device_name] % ('',))
- @permutations([[device] for device in _PCI_DEVICES])
+ @permutations([[device_name] for device_name in _PCI_DEVICES])
def testCreatePCIHostDeviceWithAddress(self, device_name):
dev_spec = {'type': 'hostdev', 'device': device_name, 'address':
self._PCI_ADDRESS}
--
To view, visit https://gerrit.ovirt.org/69342
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I37f87d020806c003b35dfa570907f826b7ca14dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months
Change in vdsm[master]: pylint: panic.panic() accepts a single string arg
by Code Review
From Dan Kenigsberg <danken(a)redhat.com>:
Dan Kenigsberg has uploaded a new change for review.
Change subject: pylint: panic.panic() accepts a single string arg
......................................................................
pylint: panic.panic() accepts a single string arg
Change-Id: I8bd971966705e3281b79ceba6704af573ea45d6c
Signed-off-by: Dan Kenigsberg <danken(a)redhat.com>
---
M lib/vdsm/protocoldetector.py
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/69340/1
diff --git a/lib/vdsm/protocoldetector.py b/lib/vdsm/protocoldetector.py
index dfe5f57..5151d00 100644
--- a/lib/vdsm/protocoldetector.py
+++ b/lib/vdsm/protocoldetector.py
@@ -89,7 +89,7 @@
def handle_close(self, dispatcher):
# We cannot handle this, so the best way is to die loudly.
- panic.panic("Listen socket was closed: %s", dispatcher.socket)
+ panic.panic("Listen socket was closed: %s" % dispatcher.socket)
class _ProtocolDetector(object):
--
To view, visit https://gerrit.ovirt.org/69340
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8bd971966705e3281b79ceba6704af573ea45d6c
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken(a)redhat.com>
6 years, 5 months