Change in vdsm[master]: storage: move iscsiadm.py to vdsm storage lib

ishaby at redhat.com ishaby at redhat.com
Mon May 2 06:53:56 UTC 2016


Idan Shaby has uploaded a new change for review.

Change subject: storage: move iscsiadm.py to vdsm storage lib
......................................................................

storage: move iscsiadm.py to vdsm storage lib

This patch moves the module vdsm/storage/iscsiadm.py to
lib/vdsm/storage/iscsiadm.py.

Change-Id: Ib7b584bbe7ded887cf3cf6d64553bdaad26b96b7
Signed-off-by: Idan Shaby <ishaby at redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/iscsiadm.py
M tests/iscsiTests.py
M vdsm.spec.in
M vdsm/storage/Makefile.am
M vdsm/storage/iscsi.py
6 files changed, 6 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/56894/1

diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 4a14487..67c0d62 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -33,6 +33,7 @@
 	hba.py \
 	imageSharing.py \
 	imagetickets.py \
+	iscsiadm.py \
 	misc.py \
 	mount.py \
 	persistent.py \
diff --git a/vdsm/storage/iscsiadm.py b/lib/vdsm/storage/iscsiadm.py
similarity index 99%
rename from vdsm/storage/iscsiadm.py
rename to lib/vdsm/storage/iscsiadm.py
index 52a0083..30f4c3b 100644
--- a/vdsm/storage/iscsiadm.py
+++ b/lib/vdsm/storage/iscsiadm.py
@@ -18,6 +18,8 @@
 # Refer to the README and COPYING files for full details of the license
 #
 
+from __future__ import absolute_import
+
 import re
 
 from collections import namedtuple
diff --git a/tests/iscsiTests.py b/tests/iscsiTests.py
index 58ad50b..73aac95 100644
--- a/tests/iscsiTests.py
+++ b/tests/iscsiTests.py
@@ -8,9 +8,9 @@
 from vdsm import commands
 from vdsm import utils
 from vdsm.password import ProtectedPassword
+from vdsm.storage import iscsiadm
 
 from storage import iscsi
-from storage import iscsiadm
 
 
 def fake_rescan(timeout):
diff --git a/vdsm.spec.in b/vdsm.spec.in
index b5722ff..0d1c991 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -943,7 +943,6 @@
 %{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
 %{_datadir}/%{vdsm_name}/storage/hsm.py*
 %{_datadir}/%{vdsm_name}/storage/image.py*
-%{_datadir}/%{vdsm_name}/storage/iscsiadm.py*
 %{_datadir}/%{vdsm_name}/storage/iscsi.py*
 %{_datadir}/%{vdsm_name}/storage/localFsSD.py*
 %{_datadir}/%{vdsm_name}/storage/lvm.env
@@ -1187,6 +1186,7 @@
 %{python_sitelib}/%{vdsm_name}/storage/hba.py*
 %{python_sitelib}/%{vdsm_name}/storage/imageSharing.py*
 %{python_sitelib}/%{vdsm_name}/storage/imagetickets.py*
+%{python_sitelib}/%{vdsm_name}/storage/iscsiadm.py*
 %{python_sitelib}/%{vdsm_name}/storage/misc.py*
 %{python_sitelib}/%{vdsm_name}/storage/mount.py*
 %{python_sitelib}/%{vdsm_name}/storage/persistent.py*
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index c0a072f..babbc03 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -34,7 +34,6 @@
 	glusterVolume.py \
 	hsm.py \
 	image.py \
-	iscsiadm.py \
 	iscsi.py \
 	localFsSD.py \
 	lvm.py \
diff --git a/vdsm/storage/iscsi.py b/vdsm/storage/iscsi.py
index 31e0fe1..1045303 100644
--- a/vdsm/storage/iscsi.py
+++ b/vdsm/storage/iscsi.py
@@ -33,11 +33,10 @@
 from vdsm.password import ProtectedPassword
 from vdsm.config import config
 from vdsm.storage import devicemapper
+from vdsm.storage import iscsiadm
 from vdsm.storage import misc
 from vdsm.netinfo.routes import getRouteDeviceTo
 from threading import RLock
-
-import iscsiadm
 
 IscsiPortal = namedtuple("IscsiPortal", "hostname, port")
 IscsiTarget = namedtuple("IscsiTarget", "portal, tpgt, iqn")


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7b584bbe7ded887cf3cf6d64553bdaad26b96b7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Idan Shaby <ishaby at redhat.com>


More information about the vdsm-patches mailing list