align to bmc class usage.

Author: RSabounds

python/understack-workflows/understack_workflows/main/get_raid_devices.py

@@ -1,32 +1,31 @@
 import argparse
 import json
-import logging
 import logging.config
+import logging
 import os
 
 import sushy
 
-from understack_workflows.bmc_password_standard import standard_password
-from understack_workflows.helpers import credential
+from understack_workflows.bmc import Bmc
+from understack_workflows.bmc import bmc_for_ip_address
 from understack_workflows.helpers import setup_logger
 
 logger = setup_logger(__name__)
 
 log_config = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "loggers": {
-        "__main__": {"level": "INFO"},
-        "sushy.main": {"level": "INFO"},
-        "sushy.resources.base": {"level": "INFO"},
-        "sushy.connector": {"level": "INFO"},
-        "urllib3.connectionpool": {"level": "INFO"},
-    },
+  'version': 1,
+  'disable_existing_loggers': False,
+  'loggers': {
+    "__main__": {'level': 'INFO'},
+    "sushy.main": {'level': 'INFO'},
+    "sushy.resources.base": {'level': 'INFO'},
+    "sushy.connector": {'level': 'INFO'},
+    "urllib3.connectionpool": {'level': 'INFO'},
+  }
 }
 
 logging.config.dictConfig(log_config)
 
-
 def main():
     """Export RAID details for a BMC using Sushy.
 
@@ -41,9 +40,11 @@ def main():
     args = argument_parser().parse_args()
 
     ip_address = args.ip_address
+    password = args.password or None
     logger.debug("%s starting for ip_address=%s", __file__, ip_address)
 
-    client = client_for_ip_address(ip_address=ip_address)
+    bmc = bmc_for_ip_address(ip_address=ip_address, password=password)
+    client = bmc.sushy()
 
     # argo workflows captures stdout as the results which we can use
     # to return the device UUID
@@ -56,7 +57,7 @@ def argument_parser():
         prog=os.path.basename(__file__), description="Gather RAID Device info."
     )
     parser.add_argument("--ip-address", type=str, required=True, help="BMC IP")
-    parser.add_argument("--password", type=str, required=False, help="Custom Password")
+    parser.add_argument("--password", type=str, required=False, help="Password", default=None)
     return parser
 
 
@@ -74,26 +75,5 @@ def parse_controller_details(client) -> dict:
     return result
 
 
-def client_for_ip_address(
-    ip_address: str, username: str = "root", password: str | None = None
-) -> sushy.Sushy:
-    """Retreive a Sushy session for BMC return as client object.
-
-    If no password is supplied then we use a conventional BMC standard one
-    which is derived from the IP address and the BMC_MASTER secret key.
-
-    If no username is supplied then the username "root" is used.
-    """
-    if password is None:
-        bmc_master = os.getenv("BMC_MASTER") or credential("bmc_master", "key")
-        password = standard_password(ip_address, bmc_master)
-
-    base_url = "https://" + ip_address
-    client = sushy.Sushy(
-        base_url=base_url, username=username, password=password, verify=False
-    )
-    return client
-
-
 if __name__ == "__main__":
     main()