summaryrefslogtreecommitdiffstats
path: root/base/deploy/src/pkispawn
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-11-13 21:54:56 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-11-27 14:01:55 -0500
commit066667d374226e1ed9da5b2c5ba71ae41a3ffa25 (patch)
tree20ea2627cdd7455d19bc1d9ae2e81939adfe5ee7 /base/deploy/src/pkispawn
parent4e69c7f03e43c2b85fb6a19f33dbedb07b156258 (diff)
downloadpki-066667d374226e1ed9da5b2c5ba71ae41a3ffa25.tar.gz
pki-066667d374226e1ed9da5b2c5ba71ae41a3ffa25.tar.xz
pki-066667d374226e1ed9da5b2c5ba71ae41a3ffa25.zip
Refactored pkiparser.py into PKIConfigParser.
The code in pkiparser.py has been converted into PKIConfigParser class to facilitate further improvements. Ticket #399
Diffstat (limited to 'base/deploy/src/pkispawn')
-rwxr-xr-xbase/deploy/src/pkispawn11
1 files changed, 6 insertions, 5 deletions
diff --git a/base/deploy/src/pkispawn b/base/deploy/src/pkispawn
index f0543ce4d..fbb6b8e26 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()):
@@ -120,7 +121,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)
@@ -155,14 +156,14 @@ 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),
extra=config.PKI_INDENTATION_LEVEL_0)
# Combine the various sectional dictionaries into a PKI master dictionary
- parse.compose_pki_master_dictionary()
+ parser.compose_pki_master_dictionary()
config.pki_master_dict['pki_spawn_log'] = config.pki_log_dir + "/" +\
config.pki_log_name
config.pki_log.debug(log.PKI_DICTIONARY_MASTER,