summaryrefslogtreecommitdiffstats
path: root/base/deploy/src
diff options
context:
space:
mode:
authorEndi Sukma Dewata <edewata@redhat.com>2012-07-19 01:51:50 -0500
committerEndi Sukma Dewata <edewata@redhat.com>2012-07-30 11:21:45 -0500
commitc4636a5b56bd3e0f18fb3afd0b930729d58ce1f6 (patch)
tree57452b5a630dc4c3deda724f992180e7ba4cafeb /base/deploy/src
parent70681bc83ccc25639da1b87940661b2649044629 (diff)
downloadpki-c4636a5b56bd3e0f18fb3afd0b930729d58ce1f6.tar.gz
pki-c4636a5b56bd3e0f18fb3afd0b930729d58ce1f6.tar.xz
pki-c4636a5b56bd3e0f18fb3afd0b930729d58ce1f6.zip
Added ClientConfig.
A new ClientConfig class has been added to encapsulate client configuration parameters. These parameters include server URI, certificate database, certificate nickname, and password. Ticket #107
Diffstat (limited to 'base/deploy/src')
-rw-r--r--base/deploy/src/scriptlets/configuration.jy10
-rw-r--r--base/deploy/src/scriptlets/pkijython.py6
-rw-r--r--base/deploy/src/scriptlets/pkiparser.py2
3 files changed, 13 insertions, 5 deletions
diff --git a/base/deploy/src/scriptlets/configuration.jy b/base/deploy/src/scriptlets/configuration.jy
index 2e72f4060..0746d40fc 100644
--- a/base/deploy/src/scriptlets/configuration.jy
+++ b/base/deploy/src/scriptlets/configuration.jy
@@ -16,6 +16,10 @@ import pkimessages as log
from java.lang import System as javasystem
+# PKI Java Imports
+from com.netscape.cms.client.cli import ClientConfig
+
+
def main(argv):
rv = 0
@@ -71,9 +75,13 @@ def main(argv):
master['pki_dry_run_flag'],
master['pki_jython_log_level'])
+ # Setup connection parameters
+ client_config = ClientConfig()
+ client_config.setServerURI(master['pki_jython_base_uri'])
+
# Establish REST Client
client = jyutil.rest_client.initialize(
- master['pki_jython_base_uri'],
+ client_config,
master['pki_dry_run_flag'],
master['pki_jython_log_level'])
diff --git a/base/deploy/src/scriptlets/pkijython.py b/base/deploy/src/scriptlets/pkijython.py
index cb1c1d918..ffd8884cd 100644
--- a/base/deploy/src/scriptlets/pkijython.py
+++ b/base/deploy/src/scriptlets/pkijython.py
@@ -271,15 +271,15 @@ class security_databases:
class rest_client:
client = None
- def initialize(self, base_uri, pki_dry_run_flag, log_level):
+ def initialize(self, client_config, pki_dry_run_flag, log_level):
try:
if log_level >= config.PKI_JYTHON_INFO_LOG_LEVEL:
print "%s %s '%s'" %\
(log.PKI_JYTHON_INDENTATION_2,
log.PKI_JYTHON_INITIALIZING_REST_CLIENT,
- base_uri)
+ client_config.serverURI)
if not pki_dry_run_flag:
- self.client = ConfigurationRESTClient(base_uri, None)
+ self.client = ConfigurationRESTClient(client_config)
return self.client
except URISyntaxException, e:
e.printStackTrace()
diff --git a/base/deploy/src/scriptlets/pkiparser.py b/base/deploy/src/scriptlets/pkiparser.py
index 7f27d8940..6e1404180 100644
--- a/base/deploy/src/scriptlets/pkiparser.py
+++ b/base/deploy/src/scriptlets/pkiparser.py
@@ -1506,7 +1506,7 @@ def compose_pki_master_dictionary():
config.pki_master_dict['pki_jython_base_uri'] =\
"https" + "://" + config.pki_master_dict['pki_hostname'] + ":" +\
config.pki_master_dict['pki_https_port'] + "/" +\
- config.pki_master_dict['pki_subsystem'].lower() + "/" + "pki"
+ config.pki_master_dict['pki_subsystem'].lower()
# Jython scriptlet
# 'Security Domain' Configuration name/value pairs
# 'Subsystem Name' Configuration name/value pairs