Clean up PKISubsystem.update_system_cert()

The code that configures the nickname and tokenname params in
PKISubsystem.update_system_cert() has been removed since it has
been done by PKIDeployer.init_system_cert_params(). The method
has also been renamed to store_system_cert_request().

base/server/python/pki/server/cli/subsystem.py

@@ -1281,8 +1281,8 @@ def execute(self, argv):
         else:
             logger.warning('Certificate request not found')
 
-        # store cert data and request in CS.cfg
-        subsystem.update_system_cert(system_cert)
+        # store cert request
+        subsystem.store_system_cert_request(system_cert)
         subsystem.save()
 
         self.print_message('Updated "%s" subsystem certificate' % cert_id)

base/server/python/pki/server/deployment/__init__.py

@@ -3326,6 +3326,9 @@ def setup_system_cert(self, nssdb, subsystem, tag, system_cert, request):
         system_cert['token'] = request.systemCert.token
         system_cert['request'] = request.systemCert.request
 
+        logger.info('Storing cert request for %s', tag)
+        subsystem.store_system_cert_request(system_cert)
+
         if request.systemCert.type == 'remote':
 
             # Issue subordinate CA signing cert using remote CA signing cert.
@@ -3380,9 +3383,6 @@ def setup_system_cert(self, nssdb, subsystem, tag, system_cert, request):
         cert_obj = x509.load_pem_x509_certificate(cert_pem, backend=default_backend())
         logger.info('- serial: %s', hex(cert_obj.serial_number))
 
-        logger.info('Storing cert and request for %s', tag)
-        subsystem.update_system_cert(system_cert)
-
         if cert_info:
             logger.info('Reusing existing %s cert in NSS database', tag)
             return

base/server/python/pki/server/instance.py

@@ -679,11 +679,11 @@ def cert_update_config(self, cert_id, cert):
         :rtype: None
         :raises pki.server.PKIServerException
         """
-        # store cert data and request in CS.cfg
+        # store cert request
         if cert_id == 'sslserver' or cert_id == 'subsystem':
             # Update for all subsystems
             for subsystem in self.get_subsystems():
-                subsystem.update_system_cert(cert)
+                subsystem.store_system_cert_request(cert)
                 subsystem.save()
         else:
             # Extract subsystem_name from cert_id
@@ -693,7 +693,7 @@ def cert_update_config(self, cert_id, cert):
             subsystem = self.get_subsystem(subsystem_name)
 
             if subsystem:
-                subsystem.update_system_cert(cert)
+                subsystem.store_system_cert_request(cert)
                 subsystem.save()
             else:
                 raise pki.server.PKIServerException(

base/server/python/pki/server/subsystem.py

@@ -378,10 +378,8 @@ def get_nssdb_cert_info(self, tag):
         finally:
             nssdb.close()
 
-    def update_system_cert(self, cert):
+    def store_system_cert_request(self, cert):
         tag = cert['id']
-        self.config['%s.%s.nickname' % (self.name, tag)] = cert.get('nickname')
-        self.config['%s.%s.tokenname' % (self.name, tag)] = cert.get('token')
 
         csr_data = cert.get('request')
         csr_pem = pki.nssdb.convert_csr(csr_data, 'base64', 'pem')