Updating to version 2.3.3

rdmc-pyinstaller-mac.spec

@@ -39,6 +39,8 @@ def getData():
 
 	return datalist
 
+compileall.compile_dir('.', force=True, quiet=True)
+
 a = Analysis(['.//src//rdmc.py'],
              pathex=[],
              binaries=None,

src/extensions/BIOS COMMANDS/BiosDefaultsCommand.py

@@ -19,9 +19,9 @@
 
 import sys
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                                                     InvalidCommandLineErrorOPTS
 
 class BiosDefaultsCommand(RdmcCommandBase):
@@ -55,6 +55,10 @@ def run(self, line):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.defaultsvalidation(options)
 
         sys.stdout.write(u'Resetting the currently logged in server\'s BIOS' \
@@ -201,3 +205,11 @@ def definearguments(self, customparser):
                                                                 "defaults.",
             default=False
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/BIOS COMMANDS/BootOrderCommand.py

@@ -21,9 +21,9 @@
 import ast
 import copy
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                     InvalidCommandLineErrorOPTS, BootOrderMissingEntriesError,\
                     InvalidOrNothingChangedSettingsError
 
@@ -81,6 +81,9 @@ def run(self, line):
                 raise InvalidCommandLineErrorOPTS("")
 
         if len(args) < 2:
+            if options.encode and options.user and options.password:
+                options.user = Encryption.decode_credentials(options.user)
+                options.password = Encryption.decode_credentials(options.password)
             self.bootordervalidation(options)
         else:
             raise InvalidCommandLineError("Invalid number of parameters." \
@@ -595,3 +598,11 @@ def definearguments(self, customparser):
             " descriptions regarding the reboot flag, run help reboot.",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/BIOS COMMANDS/IscsiConfigCommand.py

@@ -21,12 +21,12 @@
 import sys
 import json
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 
 import redfish.ris
 
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                 InvalidCommandLineErrorOPTS, NicMissingOrConfigurationError,\
                 BootOrderMissingEntriesError
 
@@ -83,6 +83,10 @@ def run(self, line):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.iscsiconfigurationvalidation(options)
 
         if self.typepath.defs.biospath[-1] == '/':
@@ -798,3 +802,11 @@ def definearguments(self, customparser):
             " descriptions regarding the reboot flag, run help reboot.",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/BIOS COMMANDS/PendingChangesCommand.py

@@ -21,12 +21,12 @@
 import copy
 import json
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 
 import jsondiff
 
 from rdmc_base_classes import RdmcCommandBase, HARDCODEDLIST
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                             InvalidCommandLineErrorOPTS, UI
 
 class PendingChangesCommand(RdmcCommandBase):
@@ -62,6 +62,11 @@ def run(self, line):
         if args:
             raise InvalidCommandLineError("Pending command does not take any " \
                                                                 "arguments.")
+
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.pendingvalidation(options)
 
         self.pendingfunction()
@@ -216,3 +221,11 @@ def definearguments(self, customparser):
             help="""Use the provided iLO password to log in.""",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/BIOS COMMANDS/ResultsCommand.py

@@ -19,9 +19,9 @@
 
 import sys
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                                                     InvalidCommandLineErrorOPTS
 
 class ResultsCommand(RdmcCommandBase):
@@ -57,6 +57,11 @@ def run(self, line):
         if args:
             raise InvalidCommandLineError("Results command does not take any " \
                                                                 "arguments.")
+
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.resultsvalidation(options)
         results = {}
         if self.typepath.defs.biospath[-1] == '/':
@@ -234,3 +239,11 @@ def definearguments(self, customparser):
             help="""Use the provided iLO password to log in.""",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/BIOS COMMANDS/SetPasswordCommand.py

@@ -20,9 +20,9 @@
 import sys
 import getpass
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineError, \
+from rdmc_helper import ReturnCodes, InvalidCommandLineError, Encryption,\
                     InvalidCommandLineErrorOPTS
 
 class SetPasswordCommand(RdmcCommandBase):
@@ -65,6 +65,10 @@ def run(self, line):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.setpasswordvalidation(options)
 
         if not args:
@@ -227,3 +231,11 @@ def definearguments(self, customparser):
             help="""Use this flag to set power on password instead""",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/COMMANDS/CommitCommand.py

@@ -19,8 +19,8 @@
 
 import sys
 
-from optparse import OptionParser
-from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS, \
+from optparse import OptionParser, SUPPRESS_HELP
+from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS, Encryption, \
                         NoChangesFoundOrMadeError, NoCurrentSessionEstablished
 
 from rdmc_base_classes import RdmcCommandBase
@@ -52,6 +52,11 @@ def commitfunction(self, options=None):
         :param options: command line options
         :type options: list.
         """
+
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.commitvalidation(options)
 
         sys.stdout.write(u"Committing changes...\n")
@@ -147,3 +152,11 @@ def definearguments(self, customparser):
             " command to execute.",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/COMMANDS/GetCommand.py

@@ -17,13 +17,13 @@
 # -*- coding: utf-8 -*-
 """ Get Command for RDMC """
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 from collections import (OrderedDict)
 import collections
 
 import redfish.ris
 
-from rdmc_helper import ReturnCodes, \
+from rdmc_helper import ReturnCodes, Encryption, \
                     InvalidCommandLineErrorOPTS, UI, \
                     NoContentsFoundForOperationError
 
@@ -64,6 +64,10 @@ def run(self, line):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.getvalidation(options)
 
         multiargs = False
@@ -521,3 +525,11 @@ def definearguments(self, customparser):
             "is configurable with the selected type(s).",
             default=False
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/COMMANDS/InfoCommand.py

@@ -19,11 +19,11 @@
 
 import sys
 
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 
 import redfish.ris
 
-from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS, UI,\
+from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS, UI, Encryption, \
                                                     InfoMissingEntriesError
 
 from rdmc_base_classes import RdmcCommandBase, HARDCODEDLIST
@@ -66,6 +66,10 @@ def run(self, line, autotest=False):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.infovalidation(options)
 
         if args:
@@ -303,3 +307,11 @@ def definearguments(self, customparser):
             "retrieval due to difference in schema versions.",
             default=None
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )

src/extensions/COMMANDS/ListCommand.py

@@ -16,12 +16,12 @@
 
 # -*- coding: utf-8 -*-
 """ List Command for RDMC """
-from optparse import OptionParser
+from optparse import OptionParser, SUPPRESS_HELP
 
 import redfish.ris
 
 from rdmc_base_classes import RdmcCommandBase
-from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS,\
+from rdmc_helper import ReturnCodes, InvalidCommandLineErrorOPTS, Encryption, \
                                 NoContentsFoundForOperationError
 
 class ListCommand(RdmcCommandBase):
@@ -59,6 +59,10 @@ def run(self, line):
             else:
                 raise InvalidCommandLineErrorOPTS("")
 
+        if options.encode and options.user and options.password:
+            options.user = Encryption.decode_credentials(options.user)
+            options.password = Encryption.decode_credentials(options.password)
+
         self.listvalidation(options)
 
         if args:
@@ -246,3 +250,11 @@ def definearguments(self, customparser):
             " there.  ",
             default=None,
         )
+        customparser.add_option(
+            '-e',
+            '--enc',
+            dest='encode',
+            action='store_true',
+            help=SUPPRESS_HELP,
+            default=False,
+        )