Change in vdsm[master]: vdsm: changed relative imports to absolute imports

igoihman at redhat.com igoihman at redhat.com
Tue Apr 26 09:38:37 UTC 2016


Irit Goihman has uploaded a new change for review.

Change subject: vdsm: changed relative imports to absolute imports
......................................................................

vdsm: changed relative imports to absolute imports

Change-Id: Ibf42bbe589b1e18b789ad8e3137d320e3a3966a7
Signed-off-by: Irit Goihman <igoihman at redhat.com>
---
M lib/vdsm/tool/configurators/__init__.py
M lib/vdsm/tool/configurators/certificates.py
M lib/vdsm/tool/configurators/libvirt.py
M lib/vdsm/tool/configurators/multipath.py
M lib/vdsm/tool/configurators/passwd.py
M lib/vdsm/tool/configurators/sanlock.py
M lib/vdsm/tool/configurators/sebool.py
7 files changed, 19 insertions(+), 19 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/07/56607/1

diff --git a/lib/vdsm/tool/configurators/__init__.py b/lib/vdsm/tool/configurators/__init__.py
index 08dcf3d..ca2aac0 100644
--- a/lib/vdsm/tool/configurators/__init__.py
+++ b/lib/vdsm/tool/configurators/__init__.py
@@ -19,7 +19,7 @@
 #
 
 from __future__ import absolute_import
-from .. import UsageError
+from vdsm.tool import UsageError
 
 
 class InvalidConfig(UsageError):
diff --git a/lib/vdsm/tool/configurators/certificates.py b/lib/vdsm/tool/configurators/certificates.py
index e5b373a..bdb686a 100644
--- a/lib/vdsm/tool/configurators/certificates.py
+++ b/lib/vdsm/tool/configurators/certificates.py
@@ -23,10 +23,10 @@
 from vdsm.config import config
 
 from . import YES, NO
-from .. validate_ovirt_certs import validate_ovirt_certs
-from ... constants import P_VDSM_EXEC, SYSCONF_PATH
-from ... commands import execCmd
-from ... utils import isOvirtNode
+from vdsm.tool.validate_ovirt_certs import validate_ovirt_certs
+from vdsm.constants import P_VDSM_EXEC, SYSCONF_PATH
+from vdsm.commands import execCmd
+from vdsm.utils import isOvirtNode
 
 PKI_DIR = os.path.join(SYSCONF_PATH, 'pki/vdsm')
 CA_FILE = os.path.join(PKI_DIR, 'certs/cacert.pem')
diff --git a/lib/vdsm/tool/configurators/libvirt.py b/lib/vdsm/tool/configurators/libvirt.py
index 97a74dd..400f433 100644
--- a/lib/vdsm/tool/configurators/libvirt.py
+++ b/lib/vdsm/tool/configurators/libvirt.py
@@ -26,10 +26,10 @@
 
 from . import InvalidRun, NO, MAYBE
 from . certificates import CA_FILE, CERT_FILE, KEY_FILE
-from .. configfile import ConfigFile, ParserWrapper
-from .. validate_ovirt_certs import validate_ovirt_certs
-from ... import utils
-from ... import constants
+from vdsm.tool.configfile import ConfigFile, ParserWrapper
+from vdsm.tool.validate_ovirt_certs import validate_ovirt_certs
+from vdsm import utils
+from vdsm import constants
 
 if utils.isOvirtNode():
     from ovirt.node.utils.fs import Config as NodeCfg
diff --git a/lib/vdsm/tool/configurators/multipath.py b/lib/vdsm/tool/configurators/multipath.py
index c7ea437..00ec558 100644
--- a/lib/vdsm/tool/configurators/multipath.py
+++ b/lib/vdsm/tool/configurators/multipath.py
@@ -26,10 +26,10 @@
 import time
 
 from . import YES, NO
-from .. import service
-from ... import commands
-from ... import utils
-from ... import constants
+from vdsm.tool import service
+from vdsm import commands
+from vdsm import utils
+from vdsm import constants
 
 
 _CONF_FILE = "/etc/multipath.conf"
diff --git a/lib/vdsm/tool/configurators/passwd.py b/lib/vdsm/tool/configurators/passwd.py
index b24fdb2..62830df 100644
--- a/lib/vdsm/tool/configurators/passwd.py
+++ b/lib/vdsm/tool/configurators/passwd.py
@@ -18,9 +18,9 @@
 #
 
 from __future__ import absolute_import
-from ... import constants
-from ... import commands
-from ... import utils
+from vdsm import constants
+from vdsm import commands
+from vdsm import utils
 
 
 from . import YES, NO
diff --git a/lib/vdsm/tool/configurators/sanlock.py b/lib/vdsm/tool/configurators/sanlock.py
index 02dae1d..959fcc6 100644
--- a/lib/vdsm/tool/configurators/sanlock.py
+++ b/lib/vdsm/tool/configurators/sanlock.py
@@ -23,8 +23,8 @@
 import pwd
 
 from . import YES, NO, MAYBE, InvalidConfig
-from ... import commands
-from ... import constants
+from vdsm import commands
+from vdsm import constants
 
 SANLOCK_GROUPS = (constants.QEMU_PROCESS_GROUP, constants.VDSM_GROUP)
 
diff --git a/lib/vdsm/tool/configurators/sebool.py b/lib/vdsm/tool/configurators/sebool.py
index 4172767..2bb1572 100644
--- a/lib/vdsm/tool/configurators/sebool.py
+++ b/lib/vdsm/tool/configurators/sebool.py
@@ -19,7 +19,7 @@
 
 from __future__ import absolute_import
 from . import YES, NO, MAYBE
-from ... import utils
+from vdsm import utils
 
 
 SEBOOL_ENABLED = "on"


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf42bbe589b1e18b789ad8e3137d320e3a3966a7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Irit Goihman <igoihman at redhat.com>


More information about the vdsm-patches mailing list