Refactored pkiparser.py into PKIConfigParser.dev1

The code in pkiparser.py has been converted into PKIConfigParser
class to facilitate further improvements.

Ticket #399

1 files changed, 5 insertions, 4 deletions

diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn
index 4ea678ef6..3afb8a3c8 100755
--- a/base/deploy/src/pkispawn
+++ b/base/deploy/src/pkispawn
@@ -36,7 +36,7 @@ try:
     import time
     from time import strftime as date
     from pki.deployment import pkiconfig as config
-    from pki.deployment import pkiparser as parse
+    from pki.deployment.pkiparser import PKIConfigParser
     from pki.deployment import pkilogging
     from pki.deployment import pkimessages as log
 except ImportError:
@@ -92,7 +92,8 @@ def main(argv):
     pp = pprint.PrettyPrinter(indent=4)
 
     # Read and process command-line arguments.
-    parse.process_command_line_arguments(argv)
+    parser = PKIConfigParser()
+    parser.process_command_line_arguments(argv)
 
     if not os.path.exists(config.PKI_DEPLOYMENT_SOURCE_ROOT +\
                           "/" + config.pki_subsystem.lower()):
@@ -133,7 +134,7 @@ def main(argv):
         sys.exit(1)
 
     # Read the specified PKI configuration file.
-    rv = parse.read_pki_configuration_file()
+    rv = parser.read_pki_configuration_file()
     if rv != 0:
         config.pki_log.error(PKI_UNABLE_TO_PARSE_1, rv,
                              extra=config.PKI_INDENTATION_LEVEL_0)
@@ -168,7 +169,7 @@ def main(argv):
                          extra=config.PKI_INDENTATION_LEVEL_0)
 
     # Read in the PKI slots configuration file.
-    parse.compose_pki_slots_dictionary()
+    parser.compose_pki_slots_dictionary()
     config.pki_log.debug(log.PKI_DICTIONARY_SLOTS,
                          extra=config.PKI_INDENTATION_LEVEL_0)
     config.pki_log.debug(pp.pformat(config.pki_slots_dict),