move flush_file and index classes to cli directory

LLNL · Jul 22, 2021 · 987f0fa · 987f0fa
1 parent 6731804
commit 987f0fa
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/scripts/pyfe/pyfe/cli/README.md b/scripts/pyfe/pyfe/cli/README.md
@@ -0,0 +1,2 @@
+# Wrappers for SCR command line interface
+The classes in this directory provide python interfaces around SCR command line tools.
diff --git a/scripts/pyfe/pyfe/cli/__init__.py b/scripts/pyfe/pyfe/cli/__init__.py
@@ -0,0 +1,2 @@
+from .scr_index import SCRIndex
+from .scr_flush_file import SCRFlushFile
diff --git a/scripts/pyfe/pyfe/flush_file.py → scripts/pyfe/pyfe/cli/scr_flush_file.py b/scripts/pyfe/pyfe/flush_file.py → scripts/pyfe/pyfe/cli/scr_flush_file.py
@@ -4,7 +4,7 @@
 
 from pyfe.scr_common import runproc
 
-class FlushFile:
+class SCRFlushFile:
   def __init__(self, bindir, prefix):
     self.bindir = bindir # path to SCR bin directory
     self.prefix = prefix # path to SCR_PREFIX

diff --git a/scripts/pyfe/pyfe/index.py → scripts/pyfe/pyfe/cli/scr_index.py b/scripts/pyfe/pyfe/index.py → scripts/pyfe/pyfe/cli/scr_index.py
@@ -4,7 +4,7 @@
 
 from pyfe.scr_common import runproc
 
-class Index:
+class SCRIndex:
   def __init__(self, bindir, prefix):
     self.bindir = bindir # path to SCR bin directory
     self.prefix = prefix # path to SCR_PREFIX

diff --git a/scripts/pyfe/pyfe/postrun.py b/scripts/pyfe/pyfe/postrun.py
@@ -14,8 +14,7 @@
 from pyfe.scr_scavenge import scr_scavenge
 from pyfe.list_down_nodes import list_down_nodes
 from pyfe.scr_glob_hosts import scr_glob_hosts
-from pyfe.flush_file import FlushFile
-from pyfe.index import Index
+from pyfe.cli import SCRIndex, SCRFlushFile
 
 def postrun(prefix_dir=None,scr_env=None,verbose=False):
   if scr_env is None or scr_env.resmgr is None:
@@ -43,8 +42,8 @@ def postrun(prefix_dir=None,scr_env=None,verbose=False):
   if pardir=='':
     return 1
 
-  scr_flush_file = FlushFile(bindir, pardir)
-  scr_index      = Index(bindir, pardir)
+  scr_index      = SCRIndex(bindir, pardir)
+  scr_flush_file = SCRFlushFile(bindir, pardir)
 
   # all parameters checked out, start normal output
   print('scr_postrun: Started: '+str(datetime.now()))