diff options
Diffstat (limited to 'base/common')
3 files changed, 54 insertions, 30 deletions
diff --git a/base/common/python/pki/system.py b/base/common/python/pki/system.py index 1151c78fa..7607578df 100644 --- a/base/common/python/pki/system.py +++ b/base/common/python/pki/system.py @@ -271,9 +271,28 @@ class SystemConfigClient(object): """ headers = {'Content-type': 'application/json', 'Accept': 'application/json'} - response = self.connection.post('/rest/installer/configure', data, - headers) - return response.json() + self.connection.post('/rest/installer/configure', data, + headers) + + def createCertificates(self): + """ + Contacts the server and invokes the Java configuration REST API to + create certificates. + """ + headers = {'Content-type': 'application/json', + 'Accept': 'application/json'} + self.connection.post('/rest/installer/createCertificates', None, + headers) + + def backupKeys(self): + """ + Contacts the server and invokes the Java configuration REST API to + backup keys. + """ + headers = {'Content-type': 'application/json', + 'Accept': 'application/json'} + self.connection.post('/rest/installer/backupKeys', None, + headers) def createUsers(self): """ @@ -282,7 +301,7 @@ class SystemConfigClient(object): """ headers = {'Content-type': 'application/json', 'Accept': 'application/json'} - self.connection.post('/rest/installer/finalize', None, + self.connection.post('/rest/installer/createUsers', None, headers) def configureSecurityDomain(self): @@ -292,10 +311,10 @@ class SystemConfigClient(object): """ headers = {'Content-type': 'application/json', 'Accept': 'application/json'} - self.connection.post('/rest/installer/finalize', None, + self.connection.post('/rest/installer/configureSecurityDomain', None, headers) - def finalize(self): + def finalizeConfiguration(self): """ Contacts the server and invokes the Java configuration REST API to finalize subsystem configuration. @@ -304,7 +323,19 @@ class SystemConfigClient(object): """ headers = {'Content-type': 'application/json', 'Accept': 'application/json'} - response = self.connection.post('/rest/installer/finalize', None, + self.connection.post('/rest/installer/finalizeConfiguration', None, + headers) + + def getConfigurationResult(self): + """ + Contacts the server and invokes the Java configuration REST API to + get configuration result. + + :return: ConfigurationResponse -- response from configuration servlet. + """ + headers = {'Content-type': 'application/json', + 'Accept': 'application/json'} + response = self.connection.post('/rest/installer/result', None, headers) return response.json() diff --git a/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java b/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java index e967914ce..6fa82dd3b 100644 --- a/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java +++ b/base/common/src/com/netscape/certsrv/system/ConfigurationResponse.java @@ -26,10 +26,10 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import netscape.security.x509.X509CertImpl; - import com.netscape.certsrv.apps.CMS; +import netscape.security.x509.X509CertImpl; + /** * @author alee * @@ -44,9 +44,6 @@ public class ConfigurationResponse { @XmlElement protected SystemCertData adminCert; - @XmlElement - protected String status; - public ConfigurationResponse() { systemCerts = new ArrayList<SystemCertData>(); adminCert = new SystemCertData(); @@ -80,22 +77,6 @@ public class ConfigurationResponse { this.adminCert = adminCert; } - /** - * @return the status - */ - public String getStatus() { - return status; - } - - /** - * @param status the status to set - */ - public void setStatus(String status) { - this.status = status; - } - - - public void setAdminCert(X509CertImpl x509CertImpl) throws CertificateEncodingException { adminCert.setCert(CMS.BtoA(x509CertImpl.getEncoded())); } diff --git a/base/common/src/com/netscape/certsrv/system/SystemConfigResource.java b/base/common/src/com/netscape/certsrv/system/SystemConfigResource.java index 3ad8abf96..4835843c5 100644 --- a/base/common/src/com/netscape/certsrv/system/SystemConfigResource.java +++ b/base/common/src/com/netscape/certsrv/system/SystemConfigResource.java @@ -32,6 +32,14 @@ public interface SystemConfigResource { public ConfigurationResponse configure(ConfigurationRequest data) throws Exception; @POST + @Path("createCertificates") + public void createCertificates() throws Exception; + + @POST + @Path("backupKeys") + public void backupKeys() throws Exception; + + @POST @Path("createUsers") public void createUsers() throws Exception; @@ -40,6 +48,10 @@ public interface SystemConfigResource { public void configureSecurityDomain() throws Exception; @POST - @Path("finalize") - public ConfigurationResponse finalizeConfiguration() throws Exception; + @Path("finalizeConfiguration") + public void finalizeConfiguration() throws Exception; + + @POST + @Path("result") + public ConfigurationResponse getConfigurationResponse() throws Exception; } |