Change in vdsm[master]: supervdsm: Move supervdsm module into lib

dkuznets at redhat.com dkuznets at redhat.com
Sun Aug 9 12:37:23 UTC 2015


Dima Kuznetsov has uploaded a new change for review.

Change subject: supervdsm: Move supervdsm module into lib
......................................................................

supervdsm: Move supervdsm module into lib

This patch moves the code for supervdsm proxy into the lib of vdsm, that
way lib code will be able to utilize supervdsm when it is running.

Change-Id: I741309af4b5510d9221da12680637c5dd4568e9d
Signed-off-by: Dima Kuznetsov <dkuznets at redhat.com>
---
M debian/vdsm-python.install
M debian/vdsm.install
M lib/vdsm/Makefile.am
R lib/vdsm/supervdsm.py
M vdsm.spec.in
M vdsm/API.py
M vdsm/Makefile.am
M vdsm/clientIF.py
M vdsm/gluster/api.py
M vdsm/hostdev.py
M vdsm/numaUtils.py
M vdsm/storage/blockSD.py
M vdsm/storage/devicemapper.py
M vdsm/storage/fileSD.py
M vdsm/storage/glusterVolume.py
M vdsm/storage/hba.py
M vdsm/storage/hsm.py
M vdsm/storage/iscsi.py
M vdsm/storage/multipath.py
M vdsm/storage/storageServer.py
M vdsm/supervdsmServer
M vdsm/virt/guestagent.py
M vdsm/virt/vm.py
M vdsm/virt/vmdevices/core.py
24 files changed, 23 insertions(+), 22 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/97/44597/1

diff --git a/debian/vdsm-python.install b/debian/vdsm-python.install
index d9402c3..f4aea24 100644
--- a/debian/vdsm-python.install
+++ b/debian/vdsm-python.install
@@ -30,6 +30,7 @@
 ./usr/lib/python2.7/dist-packages/vdsm/response.py
 ./usr/lib/python2.7/dist-packages/vdsm/schedule.py
 ./usr/lib/python2.7/dist-packages/vdsm/sslutils.py
+./usr/lib/python2.7/dist-packages/vdsm/supervdsm.py
 ./usr/lib/python2.7/dist-packages/vdsm/tool/__init__.py
 ./usr/lib/python2.7/dist-packages/vdsm/tool/dummybr.py
 ./usr/lib/python2.7/dist-packages/vdsm/tool/dump_bonding_defaults.py
diff --git a/debian/vdsm.install b/debian/vdsm.install
index a26c790..b7cc114 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -133,7 +133,6 @@
 ./usr/share/vdsm/storage/threadLocal.py
 ./usr/share/vdsm/storage/threadPool.py
 ./usr/share/vdsm/storage/volume.py
-./usr/share/vdsm/supervdsm.py
 ./usr/share/vdsm/supervdsmServer
 ./usr/share/vdsm/v2v.py
 ./usr/share/vdsm/vdsm
diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am
index 95e236f..02faeb8 100644
--- a/lib/vdsm/Makefile.am
+++ b/lib/vdsm/Makefile.am
@@ -40,6 +40,7 @@
 	response.py \
 	schedule.py \
 	sslutils.py \
+	supervdsm.py \
 	sysctl.py \
 	udevadm.py \
 	utils.py \
diff --git a/vdsm/supervdsm.py b/lib/vdsm/supervdsm.py
similarity index 100%
rename from vdsm/supervdsm.py
rename to lib/vdsm/supervdsm.py
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 0a44346..98ee569 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -805,7 +805,6 @@
 %{_datadir}/%{vdsm_name}/numaUtils.py*
 %{_datadir}/%{vdsm_name}/ppc64HardwareInfo.py*
 %{_datadir}/%{vdsm_name}/protocoldetector.py*
-%{_datadir}/%{vdsm_name}/supervdsm.py*
 %{_datadir}/%{vdsm_name}/supervdsmServer
 %{_datadir}/%{vdsm_name}/v2v.py*
 %{_datadir}/%{vdsm_name}/vdsm
@@ -1067,6 +1066,7 @@
 %{python_sitelib}/%{vdsm_name}/netconfpersistence.py*
 %{python_sitelib}/%{vdsm_name}/schedule.py*
 %{python_sitelib}/%{vdsm_name}/sslutils.py*
+%{python_sitelib}/%{vdsm_name}/supervdsm.py*
 %{python_sitelib}/%{vdsm_name}/sysctl.py*
 %{python_sitelib}/%{vdsm_name}/udevadm.py*
 %{python_sitelib}/%{vdsm_name}/utils.py*
diff --git a/vdsm/API.py b/vdsm/API.py
index 8661db7..2566647 100644
--- a/vdsm/API.py
+++ b/vdsm/API.py
@@ -39,6 +39,7 @@
 from vdsm import netinfo
 from vdsm import constants
 from vdsm import response
+from vdsm import supervdsm
 import storage.misc
 import storage.clusterlock
 import storage.volume
@@ -57,7 +58,6 @@
 from caps import PAGE_SIZE_BYTES
 import v2v
 
-import supervdsm
 
 haClient = None  # Define here to work around pyflakes issue #13
 try:
diff --git a/vdsm/Makefile.am b/vdsm/Makefile.am
index 4c0578e..89c2a87 100644
--- a/vdsm/Makefile.am
+++ b/vdsm/Makefile.am
@@ -41,7 +41,6 @@
 	parted_utils.py \
 	ppc64HardwareInfo.py \
 	protocoldetector.py \
-	supervdsm.py \
 	v2v.py \
 	vdsmDebugPlugin.py \
 	$(NULL)
diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 44a0f96..8f0263d 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -41,9 +41,9 @@
 from vdsm import libvirtconnection
 from vdsm import constants
 from vdsm import utils
+from vdsm import supervdsm
 import caps
 import blkid
-import supervdsm
 from protocoldetector import MultiProtocolAcceptor
 
 from virt import migration
diff --git a/vdsm/gluster/api.py b/vdsm/gluster/api.py
index 781ab77..df612a8 100644
--- a/vdsm/gluster/api.py
+++ b/vdsm/gluster/api.py
@@ -25,10 +25,10 @@
 from functools import wraps
 from vdsm.define import doneCode
 from vdsm import constants, utils
+from vdsm import supervdsm as svdsm
 from pwd import getpwnam
 from storage import mount
 
-import supervdsm as svdsm
 import exception as ge
 from . import makePublic
 from . import safeWrite
diff --git a/vdsm/hostdev.py b/vdsm/hostdev.py
index 01e22fe..133a06d 100644
--- a/vdsm/hostdev.py
+++ b/vdsm/hostdev.py
@@ -22,7 +22,7 @@
 
 import hooks
 from vdsm import libvirtconnection
-import supervdsm
+from vdsm import supervdsm
 
 CAPABILITY_TO_XML_ATTR = {'pci': 'pci',
                           'scsi': 'scsi',
diff --git a/vdsm/numaUtils.py b/vdsm/numaUtils.py
index f6bd0da..10a9254 100644
--- a/vdsm/numaUtils.py
+++ b/vdsm/numaUtils.py
@@ -23,8 +23,9 @@
 import os.path
 import xml.etree.cElementTree as ET
 
+from vdsm import supervdsm
+
 import caps
-import supervdsm
 
 # xml file name -> (last mtime, cached value)
 _libvirt_vcpu_pids_cache = {}
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 127150e..4ed1ea7 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -35,6 +35,8 @@
 from vdsm.config import config
 from vdsm import constants
 from vdsm import utils
+import vdsm.supervdsm as svdsm
+
 import misc
 import fileUtils
 import sd
@@ -50,7 +52,6 @@
 from storage_mailbox import MAILBOX_SIZE
 import resourceManager as rm
 import mount
-import supervdsm as svdsm
 import volume
 
 STORAGE_DOMAIN_TAG = "RHAT_storage_domain"
diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py
index b8dcb39..86da644 100644
--- a/vdsm/storage/devicemapper.py
+++ b/vdsm/storage/devicemapper.py
@@ -24,8 +24,8 @@
 import errno
 import re
 
-from supervdsm import getProxy
 from vdsm.constants import EXT_DMSETUP
+from vdsm.supervdsm import getProxy
 
 DMPATH_PREFIX = "/dev/mapper/"
 
diff --git a/vdsm/storage/fileSD.py b/vdsm/storage/fileSD.py
index 2feb6b5..cf9c281 100644
--- a/vdsm/storage/fileSD.py
+++ b/vdsm/storage/fileSD.py
@@ -36,7 +36,7 @@
 from persistentDict import PersistentDict, DictValidator
 from vdsm import constants
 from vdsm.utils import stripNewLines
-import supervdsm
+from vdsm import supervdsm
 import mount
 
 REMOTE_PATH = "REMOTE_PATH"
diff --git a/vdsm/storage/glusterVolume.py b/vdsm/storage/glusterVolume.py
index 8f701ba..17a3b1c 100644
--- a/vdsm/storage/glusterVolume.py
+++ b/vdsm/storage/glusterVolume.py
@@ -1,7 +1,7 @@
 from volume import VmVolumeInfo
 import fileVolume
 from sdc import sdCache
-import supervdsm as svdsm
+import vdsm.supervdsm as svdsm
 try:
     from gluster.exception import GlusterException
     _glusterEnabled = True
diff --git a/vdsm/storage/hba.py b/vdsm/storage/hba.py
index efd0273..90f8958 100644
--- a/vdsm/storage/hba.py
+++ b/vdsm/storage/hba.py
@@ -26,12 +26,12 @@
 import os
 
 from vdsm import constants
+from vdsm import supervdsm
 from vdsm import utils
 from vdsm.config import config
 from vdsm.infra import zombiereaper
 
 import misc
-import supervdsm
 
 log = logging.getLogger("Storage.HBA")
 
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 10409dd..0806abb 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -71,8 +71,8 @@
 import logUtils
 import mount
 import dispatcher
-import supervdsm
 import storageServer
+from vdsm import supervdsm
 from vdsm import utils
 from vdsm import qemuimg
 
diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py
index 1c38c6b..fce4e9b 100644
--- a/vdsm/storage/iscsi.py
+++ b/vdsm/storage/iscsi.py
@@ -30,6 +30,7 @@
 from collections import namedtuple
 
 import misc
+from vdsm import supervdsm
 from vdsm.password import ProtectedPassword
 from vdsm.config import config
 from vdsm.netinfo import getRouteDeviceTo
@@ -37,7 +38,6 @@
 from threading import RLock
 
 import iscsiadm
-import supervdsm
 
 IscsiPortal = namedtuple("IscsiPortal", "hostname, port")
 IscsiTarget = namedtuple("IscsiTarget", "portal, tpgt, iqn")
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 8d6ba31..ad81d2d 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -30,6 +30,7 @@
 from collections import namedtuple
 
 from vdsm import constants
+from vdsm import supervdsm
 from vdsm import udevadm
 from vdsm import utils
 from vdsm.config import config
@@ -37,7 +38,6 @@
 import hba
 import misc
 import iscsi
-import supervdsm
 import devicemapper
 
 DEV_ISCSI = "iSCSI"
diff --git a/vdsm/storage/storageServer.py b/vdsm/storage/storageServer.py
index c040b51..ef3318a 100644
--- a/vdsm/storage/storageServer.py
+++ b/vdsm/storage/storageServer.py
@@ -32,9 +32,9 @@
 
 from vdsm.compat import pickle
 from vdsm.config import config
+from vdsm import supervdsm
 from vdsm import udevadm
 
-import supervdsm
 import mount
 import fileUtils
 import fileSD
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 119c2ba..e836368 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -57,6 +57,7 @@
 
 from vdsm import utils
 from vdsm import sysctl
+from vdsm.supervdsm import _SuperVdsmManager
 from vdsm.tool import restore_nets
 from parted_utils import getDevicePartedInfo as _getDevicePartedInfo
 
@@ -68,7 +69,6 @@
 from storage.multipath import getScsiSerial as _getScsiSerial
 from storage.iscsi import getDevIscsiInfo as _getdeviSCSIinfo
 from storage.iscsi import readSessionInfo as _readSessionInfo
-from supervdsm import _SuperVdsmManager
 from storage import hba
 from storage import multipath
 from storage.fileUtils import chown, resolveGid, resolveUid
diff --git a/vdsm/virt/guestagent.py b/vdsm/virt/guestagent.py
index b5a5099..aac77be 100644
--- a/vdsm/virt/guestagent.py
+++ b/vdsm/virt/guestagent.py
@@ -26,8 +26,7 @@
 import json
 import unicodedata
 
-# TODO: in future import from ..
-import supervdsm
+from vdsm import supervdsm
 
 from . import vmstatus
 
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 2aa9ce4..572f1c5 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -39,6 +39,7 @@
 from vdsm import netinfo
 from vdsm import qemuimg
 from vdsm import response
+from vdsm import supervdsm
 from vdsm import utils
 from vdsm.compat import pickle
 from vdsm.config import config
@@ -55,7 +56,6 @@
 import hooks
 import hostdev
 import numaUtils
-import supervdsm
 
 # local package imports
 from .domain_descriptor import DomainDescriptor
diff --git a/vdsm/virt/vmdevices/core.py b/vdsm/virt/vmdevices/core.py
index 4e59e89..f9f4ea1 100644
--- a/vdsm/virt/vmdevices/core.py
+++ b/vdsm/virt/vmdevices/core.py
@@ -21,10 +21,10 @@
 import os.path
 
 from vdsm import constants
+from vdsm import supervdsm
 from vdsm import utils
 
 import caps
-import supervdsm
 
 from ..utils import cleanup_guest_socket
 from .. import vmxml


-- 
To view, visit https://gerrit.ovirt.org/44597
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I741309af4b5510d9221da12680637c5dd4568e9d
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dima Kuznetsov <dkuznets at redhat.com>


More information about the vdsm-patches mailing list