Vinzenz Feenstra has uploaded a new change for review.
Change subject: Move virt things into vdsm/virt ......................................................................
Move virt things into vdsm/virt
Change-Id: Ibdfaefbe8837d2059674fdc4dc83fca431d76f8d Signed-off-by: Vinzenz Feenstra vfeenstr@redhat.com --- M configure.ac M tests/guestIFTests.py M tests/vmTests.py M vdsm.spec.in M vdsm/API.py M vdsm/Makefile.am M vdsm/clientIF.py A vdsm/virt/Makefile.am A vdsm/virt/__init__.py R vdsm/virt/guestIF.py R vdsm/virt/sampling.py R vdsm/virt/vm.py R vdsm/virt/vmChannels.py R vdsm/virt/vmstatus.py 14 files changed, 45 insertions(+), 16 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/21792/1
diff --git a/configure.ac b/configure.ac index 4ba4a9e..6d72726 100644 --- a/configure.ac +++ b/configure.ac @@ -273,6 +273,7 @@ vdsm/storage/imageRepository/Makefile vdsm/storage/protect/Makefile vdsm/storage/vdsm-lvm.rules + vdsm/virt/Makefile vdsm_api/Makefile vdsm_hooks/Makefile vdsm_hooks/checkimages/Makefile diff --git a/tests/guestIFTests.py b/tests/guestIFTests.py index 94efe92..1a6e6d2 100644 --- a/tests/guestIFTests.py +++ b/tests/guestIFTests.py @@ -20,7 +20,7 @@ # import logging from collections import namedtuple -import guestIF +from virt import guestIF import json
from testrunner import VdsmTestCase as TestCaseBase diff --git a/tests/vmTests.py b/tests/vmTests.py index 1f69f0a..b7ec102 100644 --- a/tests/vmTests.py +++ b/tests/vmTests.py @@ -22,7 +22,7 @@ import tempfile import xml.etree.ElementTree as ET
-import vm +from virt import vm from vdsm import constants from testrunner import VdsmTestCase as TestCaseBase import caps diff --git a/vdsm.spec.in b/vdsm.spec.in index ca02046..1d2f87b 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -832,6 +832,7 @@ %dir %{_datadir}/%{vdsm_name}/netconf %dir %{_datadir}/%{vdsm_name}/storage %dir %{_datadir}/%{vdsm_name}/storage/imageRepository +%dir %{_datadir}/%{vdsm_name}/virt %{_datadir}/%{vdsm_name}/alignmentScan.py* %{_datadir}/%{vdsm_name}/blkid.py* %{_datadir}/%{vdsm_name}/caps.py* @@ -850,7 +851,8 @@ %{_datadir}/%{vdsm_name}/sourceRouteThread.py* %{_datadir}/%{vdsm_name}/supervdsm.py* %{_datadir}/%{vdsm_name}/supervdsmServer -%{_datadir}/%{vdsm_name}/vmChannels.py* +%{_datadir}/%{vdsm_name}/virt/__init__.py* +%{_datadir}/%{vdsm_name}/virt/vmChannels.py* %{_datadir}/%{vdsm_name}/vmstatus.py* %{_datadir}/%{vdsm_name}/tc.py* %{_datadir}/%{vdsm_name}/vdsm @@ -874,7 +876,7 @@ %{_sysconfdir}/sudoers.d/50_vdsm %{_sysconfdir}/cron.hourly/vdsm-logrotate %{_sysconfdir}/cron.d/vdsm-libvirt-logrotate -%{_datadir}/%{vdsm_name}/guestIF.py* +%{_datadir}/%{vdsm_name}/virt/guestIF.py* %{_datadir}/%{vdsm_name}/logUtils.py* %{_datadir}/%{vdsm_name}/dsaversion.py* %{_libexecdir}/%{vdsm_name}/curl-img-wrap @@ -992,7 +994,7 @@ %{_datadir}/%{vdsm_name}/neterrors.py* %{_datadir}/%{vdsm_name}/netmodels.py* %{_datadir}/%{vdsm_name}/respawn -%{_datadir}/%{vdsm_name}/sampling.py* +%{_datadir}/%{vdsm_name}/virt/sampling.py* %{_datadir}/%{vdsm_name}/set-conf-item %if 0%{?with_gluster} %dir %{_datadir}/%{vdsm_name}/gluster diff --git a/vdsm/API.py b/vdsm/API.py index 9b722a2..a998e71 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -40,8 +40,8 @@ import storage.volume import storage.sd import storage.image -import vm -import vmstatus +from virt import vm +from virt import vmstatus from vdsm.define import doneCode, errCode, Kbytes, Mbytes import caps from vdsm.config import config diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am index 2dc0876..45ea118 100644 --- a/vdsm/Makefile.am +++ b/vdsm/Makefile.am @@ -18,7 +18,7 @@ # Refer to the README and COPYING files for full details of the license #
-SUBDIRS = netconf sos storage gluster +SUBDIRS = netconf sos storage gluster virt
include $(top_srcdir)/build-aux/Makefile.subs
@@ -32,7 +32,6 @@ configNetwork.py \ debugPluginClient.py \ dmidecodeUtil.py \ - guestIF.py \ hooking.py \ hooks.py \ kaxmlrpclib.py \ @@ -51,9 +50,6 @@ supervdsm.py \ tc.py \ vdsmDebugPlugin.py \ - vmChannels.py \ - vm.py \ - vmstatus.py \ $(NULL)
dist_vdsmexec_SCRIPTS = \ diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index f65e556..f8266e3 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -35,16 +35,16 @@ from vdsm.define import doneCode, errCode import libvirt from vdsm import libvirtconnection -import vm +from virt import vm from vdsm import constants from vdsm import utils from netconf import ifcfg import caps -from vmChannels import Listener -from vm import Vm +from virt.vmChannels import Listener +from virt.vm import Vm import blkid import supervdsm -import sampling +from virt import sampling import vmstatus try: import gluster.api as gapi diff --git a/vdsm/virt/Makefile.am b/vdsm/virt/Makefile.am new file mode 100644 index 0000000..4b4f21b --- /dev/null +++ b/vdsm/virt/Makefile.am @@ -0,0 +1,30 @@ +# +# Copyright 2013 Red Hat, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# +# Refer to the README and COPYING files for full details of the license +# + +include $(top_srcdir)/build-aux/Makefile.subs + +vdsm_virtdir = $(vdsmdir)/virt +dist_vdsm_virt_PYTHON = \ + guestIF.py \ + sampling.py \ + vm.py \ + vmChannels.py \ + vmstatus.py \ + $(NULL) diff --git a/vdsm/virt/__init__.py b/vdsm/virt/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/vdsm/virt/__init__.py diff --git a/vdsm/guestIF.py b/vdsm/virt/guestIF.py similarity index 100% rename from vdsm/guestIF.py rename to vdsm/virt/guestIF.py diff --git a/vdsm/sampling.py b/vdsm/virt/sampling.py similarity index 100% rename from vdsm/sampling.py rename to vdsm/virt/sampling.py diff --git a/vdsm/vm.py b/vdsm/virt/vm.py similarity index 100% rename from vdsm/vm.py rename to vdsm/virt/vm.py diff --git a/vdsm/vmChannels.py b/vdsm/virt/vmChannels.py similarity index 100% rename from vdsm/vmChannels.py rename to vdsm/virt/vmChannels.py diff --git a/vdsm/vmstatus.py b/vdsm/virt/vmstatus.py similarity index 100% rename from vdsm/vmstatus.py rename to vdsm/virt/vmstatus.py