Change in vdsm[master]: storage: move hba.py to vdsm storage lib
ishaby at redhat.com
ishaby at redhat.com
Mon May 2 06:53:55 UTC 2016
Idan Shaby has uploaded a new change for review.
Change subject: storage: move hba.py to vdsm storage lib
......................................................................
storage: move hba.py to vdsm storage lib
This patch moves the module vdsm/storage/hba.py to
lib/vdsm/storage/hba.py.
Change-Id: Ia90ee5509dd03774001fc9a718f77c95e15f1526
Signed-off-by: Idan Shaby <ishaby at redhat.com>
---
M lib/vdsm/storage/Makefile.am
R lib/vdsm/storage/hba.py
M vdsm.spec.in
M vdsm/caps.py
M vdsm/storage/Makefile.am
M vdsm/storage/multipath.py
M vdsm/supervdsmServer
7 files changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/56889/1
diff --git a/lib/vdsm/storage/Makefile.am b/lib/vdsm/storage/Makefile.am
index 8026d90..5197cd9 100644
--- a/lib/vdsm/storage/Makefile.am
+++ b/lib/vdsm/storage/Makefile.am
@@ -30,6 +30,7 @@
exception.py \
fileUtils.py \
fuser.py \
+ hba.py \
misc.py \
mount.py \
persistent.py \
diff --git a/vdsm/storage/hba.py b/lib/vdsm/storage/hba.py
similarity index 97%
rename from vdsm/storage/hba.py
rename to lib/vdsm/storage/hba.py
index 4fcfe61..7aea584 100644
--- a/vdsm/storage/hba.py
+++ b/lib/vdsm/storage/hba.py
@@ -1,5 +1,5 @@
#
-# Copyright 2010-2011 Red Hat, Inc.
+# Copyright 2010-2016 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
@@ -21,6 +21,9 @@
"""
Collect HBA information
"""
+
+from __future__ import absolute_import
+
import glob
import logging
import os
diff --git a/vdsm.spec.in b/vdsm.spec.in
index 99cc0dc..fbb49b3 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -942,7 +942,6 @@
%{_datadir}/%{vdsm_name}/storage/imagetickets.py*
%{_datadir}/%{vdsm_name}/storage/glusterSD.py*
%{_datadir}/%{vdsm_name}/storage/glusterVolume.py*
-%{_datadir}/%{vdsm_name}/storage/hba.py*
%{_datadir}/%{vdsm_name}/storage/hsm.py*
%{_datadir}/%{vdsm_name}/storage/image.py*
%{_datadir}/%{vdsm_name}/storage/imageSharing.py*
@@ -1187,6 +1186,7 @@
%{python_sitelib}/%{vdsm_name}/storage/exception.py*
%{python_sitelib}/%{vdsm_name}/storage/fileUtils.py*
%{python_sitelib}/%{vdsm_name}/storage/fuser.py*
+%{python_sitelib}/%{vdsm_name}/storage/hba.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/caps.py b/vdsm/caps.py
index 66eb245..d16de41 100644
--- a/vdsm/caps.py
+++ b/vdsm/caps.py
@@ -28,6 +28,7 @@
from vdsm.config import config
from vdsm.netinfo import cache as netinfo_cache
+from vdsm.storage import hba
from vdsm import cpuarch
from vdsm import cpuinfo
from vdsm import dsaversion
@@ -40,7 +41,6 @@
from vdsm import supervdsm
from vdsm import host
from vdsm import utils
-import storage.hba
from virt import vmdevices
RNG_SOURCES = {'random': '/dev/random',
@@ -179,7 +179,7 @@
caps['emulatedMachines'] = machinetype.emulated_machines(
cpuarch.effective())
caps['ISCSIInitiatorName'] = _getIscsiIniName()
- caps['HBAInventory'] = storage.hba.HBAInventory()
+ caps['HBAInventory'] = hba.HBAInventory()
caps['vmTypes'] = ['kvm']
caps['memSize'] = str(utils.readMemInfo()['MemTotal'] / 1024)
diff --git a/vdsm/storage/Makefile.am b/vdsm/storage/Makefile.am
index 141a35c..ddb858b 100644
--- a/vdsm/storage/Makefile.am
+++ b/vdsm/storage/Makefile.am
@@ -33,7 +33,6 @@
imagetickets.py \
glusterSD.py \
glusterVolume.py \
- hba.py \
hsm.py \
image.py \
imageSharing.py \
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index b522309..77c54a7 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -36,9 +36,9 @@
from vdsm import utils
from vdsm.config import config
from vdsm.storage import devicemapper
+from vdsm.storage import hba
from vdsm.storage import misc
-import hba
import iscsi
DEV_ISCSI = "iSCSI"
diff --git a/vdsm/supervdsmServer b/vdsm/supervdsmServer
index 6b2f1af..714fe0f 100755
--- a/vdsm/supervdsmServer
+++ b/vdsm/supervdsmServer
@@ -56,6 +56,7 @@
from vdsm import utils
from vdsm import sysctl
from vdsm.storage import fuser
+from vdsm.storage import hba
from vdsm.storage import mount
from vdsm.storage.devicemapper import _removeMapping, _getPathsStatus
from vdsm.storage.fileUtils import chown, resolveGid, resolveUid
@@ -67,7 +68,6 @@
from storage.multipath import getScsiSerial as _getScsiSerial
from storage.iscsi import getDevIscsiInfo as _getdeviSCSIinfo
from storage.iscsi import readSessionInfo as _readSessionInfo
-from storage import hba
from storage import multipath
from vdsm.constants import METADATA_GROUP, \
VDSM_USER, GLUSTER_MGMT_ENABLED
--
To view, visit https://gerrit.ovirt.org/56889
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia90ee5509dd03774001fc9a718f77c95e15f1526
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