summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Grover <agrover@redhat.com>2013-07-30 17:30:58 -0700
committerAndy Grover <agrover@redhat.com>2013-07-30 17:41:54 -0700
commit63cc27f5dc524dbf4ae60e4137500861b0b90f1f (patch)
tree0a026ec7e9f3a5e0d3c6a1ca4f819f6b60b73dfa
parent13255ea287280dd1f67c7d983ff503d5510a3df8 (diff)
downloadrtslib-fb-63cc27f5dc524dbf4ae60e4137500861b0b90f1f.tar.gz
Change StorageObject.all() to not take a path parameter
We have cls.configfs_dir that we can use. Signed-off-by: Andy Grover <agrover@redhat.com>
-rw-r--r--rtslib/root.py2
-rw-r--r--rtslib/tcm.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/rtslib/root.py b/rtslib/root.py
index 7effe54..e371cf4 100644
--- a/rtslib/root.py
+++ b/rtslib/root.py
@@ -77,7 +77,7 @@ class RTSRoot(CFSNode):
def _list_storage_objects(self):
self._check_self()
- for so in StorageObject.all(self.path):
+ for so in StorageObject.all():
yield so
def _list_tpgs(self):
diff --git a/rtslib/tcm.py b/rtslib/tcm.py
index 7938548..5a63e11 100644
--- a/rtslib/tcm.py
+++ b/rtslib/tcm.py
@@ -96,8 +96,8 @@ class StorageObject(CFSNode):
fwrite(self.path + "/pr/res_aptpl_metadata", ",".join(res))
@classmethod
- def all(cls, path):
- for so_dir in glob.glob("%s/core/*_*/*" % path):
+ def all(cls):
+ for so_dir in glob.glob("%s/core/*_*/*" % cls.configfs_dir):
if os.path.isdir(so_dir):
yield cls.so_from_path(so_dir)