From cde24d187a61778ca3ddaca77e3bc7c2a0dfe6ee Mon Sep 17 00:00:00 2001
From: Nathan Denny <ndenny@purdue.edu>
Date: Tue, 25 Feb 2025 17:28:31 -0500
Subject: [PATCH] attempting some further debugging and improvement.

---
 bin/bastion.py             | 13 ++++++++-----
 lib/Bastion/CARP.py        |  2 +-
 lib/Bastion/Vaults/HPSS.py |  2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/bin/bastion.py b/bin/bastion.py
index 407b9c1..04e01b2 100755
--- a/bin/bastion.py
+++ b/bin/bastion.py
@@ -11,7 +11,7 @@
 from ruamel.yaml.scalarstring import PreservedScalarString
 
 logger = logging.getLogger()
-logging.basicConfig(level = logging.DEBUG)
+logging.basicConfig(level = logging.WARN)
 
 
 BIN_PATH = pathlib.Path(sys.argv[0]).absolute().parent
@@ -208,6 +208,7 @@ def run(self):
 		#-- scan through the menu of idioms and associated methods
 		#-- attempt to match the command line arguments with an idiom 
 		action = self.do_help  #-- default is to show the help.
+		request = Request("help", ID = self.session, context = opts)
 		for entry in menu:
 			idioms = entry[:-1]
 			method = entry[-1]
@@ -684,7 +685,9 @@ def do_export_zones_provisioned(self, request):
 		export zones provisioned {vault} {site}
 		* lists all zones provisioned in the given vault for the named site
 		"""
+		print(request.args[0])
 		vault     = self.vault( request.args[0] )
+		print(vault.name)
 		site_name = request.args[1]
 
 		zone_names = vault.zones(site_name)
@@ -771,7 +774,6 @@ def do_export_assets_declared(self, request):
 	#↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑
 	#-- END "export" operations     |
 	#--------------------------------
-
 	def do_refresh_keytab(self, request):
 		"""
 		refresh keytab {vault}
@@ -803,14 +805,15 @@ def do_refresh_keytab(self, request):
 
 if __name__ == '__main__':
 	app = App().configured()
-	if sys.argv[1:] != ['shell']:
-		app.run( )
-	else:
+	argdex = dict(enumerate(sys.argv))
+	if argdex.get(1, None) == 'shell':
 		if os.environ.get('BASTION_SITE', None) == 'rusina':
 			rusina      = app.site('rusina')
 			soundscapes = rusina.zone('soundscapes')
 			asset       = soundscapes['HackathonData']
 			vault       = app.vault(asset.policy.vault)
+	else:
+		app.run( )
 
 #-- does a full, level 0 backup
 #bastion backup site {site}
diff --git a/lib/Bastion/CARP.py b/lib/Bastion/CARP.py
index a2f9daf..480e4e1 100644
--- a/lib/Bastion/CARP.py
+++ b/lib/Bastion/CARP.py
@@ -341,7 +341,7 @@ def __init__(self, request, *args, **kwargs):
 
 		tracer = ''.join( traceback.format_exception(errobj) )
 
-		Report.__init__(self, request, status, errobj, body = tracer)
+		Report.__init__(self, request, status, errobj, report = tracer)
 
 
 
diff --git a/lib/Bastion/Vaults/HPSS.py b/lib/Bastion/Vaults/HPSS.py
index 29ae992..67906ab 100644
--- a/lib/Bastion/Vaults/HPSS.py
+++ b/lib/Bastion/Vaults/HPSS.py
@@ -321,7 +321,7 @@ def lsx(self, path = None):
 
 
 class Vault(isVault):
-	PROTOCOL = 'HTAR'
+	PROTOCOL = 'HSI'
 
 	def __init__(self, name, **kwargs):
 		isVault.__init__(self, name, **kwargs)