Replace pki_subsystem with PKIDeployer.subsystem_type

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

@@ -1009,12 +1009,12 @@ def verify_subsystem_exists(self):
 
         logger.error(
             log.PKI_SUBSYSTEM_DOES_NOT_EXIST_2,
-            self.mdict['pki_subsystem'],
+            self.subsystem_type,
             self.mdict['pki_instance_name'])
 
         raise Exception(
             log.PKI_SUBSYSTEM_DOES_NOT_EXIST_2 % (
-                self.mdict['pki_subsystem'],
+                self.subsystem_type,
                 self.mdict['pki_instance_name']))
 
     def verify_subsystem_does_not_exist(self):
@@ -1028,7 +1028,7 @@ def verify_subsystem_does_not_exist(self):
 
         raise Exception(
             log.PKI_SUBSYSTEM_ALREADY_EXISTS_2 % (
-                self.mdict['pki_subsystem'],
+                self.subsystem_type,
                 self.mdict['pki_instance_name']))
 
     def init_subsystem(self, subsystem):
@@ -2422,7 +2422,7 @@ def get_install_token(self):
         logger.info('Getting install token')
 
         hostname = self.mdict['pki_hostname']
-        subsystem = self.mdict['pki_subsystem']
+        subsystem = self.subsystem_type
 
         sd_client = pki.system.SecurityDomainClient(self.sd_connection)
         install_token = sd_client.get_install_token(hostname, subsystem)
@@ -4652,7 +4652,7 @@ def finalize_subsystem(self, subsystem):
 
     def store_config(self):
 
-        subsystem = self.instance.get_subsystem(self.mdict['pki_subsystem'].lower())
+        subsystem = self.instance.get_subsystem(self.subsystem_type.lower())
 
         # Store user's deployment.cfg into
         # /etc/sysconfig/pki/tomcat/<instance>/<subsystem>/deployment.cfg
@@ -4677,7 +4677,7 @@ def store_config(self):
 
     def store_manifest(self):
 
-        subsystem = self.instance.get_subsystem(self.mdict['pki_subsystem'].lower())
+        subsystem = self.instance.get_subsystem(self.subsystem_type.lower())
 
         # Store installation manifest into
         # /etc/sysconfig/pki/tomcat/<instance>/<subsystem>/manifest

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

@@ -463,7 +463,7 @@ def __init__(self, deployer):
         self.subordinate = config.str2bool(self.mdict['pki_subordinate'])
 
         # set useful 'string' object variables for this class
-        self.subsystem = self.mdict['pki_subsystem']
+        self.subsystem = deployer.subsystem_type
 
     def confirm_external(self):
         # ALWAYS defined via 'pkiparser.py'

base/server/python/pki/server/deployment/scriptlets/configuration.py

@@ -51,7 +51,7 @@ def spawn(self, deployer):
         instance = self.instance
         instance.load()
 
-        subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())
+        subsystem = instance.get_subsystem(deployer.subsystem_type.lower())
 
         deployer.configure_subsystem(subsystem)
         subsystem.save()

base/server/python/pki/server/deployment/scriptlets/finalization.py

@@ -48,15 +48,15 @@ def spawn(self, deployer):
         instance = self.instance
         instance.load()
 
-        subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())
+        subsystem = instance.get_subsystem(deployer.subsystem_type.lower())
 
         if config.str2bool(deployer.mdict['pki_backup_keys']):
 
             # by default store the backup file in the NSS databases directory
             if not deployer.mdict['pki_backup_file']:
                 deployer.mdict['pki_backup_file'] = \
                     instance.nssdb_dir + '/' + \
-                    deployer.mdict['pki_subsystem'].lower() + '_backup_keys.p12'
+                    deployer.subsystem_type.lower() + '_backup_keys.p12'
 
             logger.info('Backing up keys into %s', deployer.mdict['pki_backup_file'])
             deployer.backup_keys(subsystem)
@@ -96,7 +96,7 @@ def spawn(self, deployer):
 
         # Log final process messages
         logger.info(log.PKISPAWN_END_MESSAGE_2,
-                    deployer.mdict['pki_subsystem'],
+                    deployer.subsystem_type,
                     instance.name)
 
     def destroy(self, deployer):
@@ -120,5 +120,5 @@ def destroy(self, deployer):
             instance.disable()
 
         logger.info(log.PKIDESTROY_END_MESSAGE_2,
-                    deployer.mdict['pki_subsystem'],
+                    deployer.subsystem_type,
                     instance.name)

base/server/python/pki/server/deployment/scriptlets/initialization.py

@@ -119,7 +119,7 @@ def spawn(self, deployer):
         instance = self.instance
 
         logger.info(log.PKISPAWN_BEGIN_MESSAGE_2,
-                    deployer.mdict['pki_subsystem'],
+                    deployer.subsystem_type,
                     instance.name)
 
         instance.load()
@@ -179,14 +179,14 @@ def destroy(self, deployer):
         instance = self.instance
 
         logger.info(log.PKIDESTROY_BEGIN_MESSAGE_2,
-                    deployer.mdict['pki_subsystem'],
+                    deployer.subsystem_type,
                     instance.name)
 
         logger.info('Initialization')
 
         instance.load()
 
-        subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())
+        subsystem = instance.get_subsystem(deployer.subsystem_type.lower())
 
         try:
             # verify that this type of "subsystem" currently EXISTS

base/server/python/pki/server/deployment/scriptlets/keygen.py

@@ -40,8 +40,7 @@ def spawn(self, deployer):
         instance = self.instance
         instance.load()
 
-        subsystem = instance.get_subsystem(
-            deployer.mdict['pki_subsystem'].lower())
+        subsystem = instance.get_subsystem(deployer.subsystem_type.lower())
 
         external = deployer.configuration_file.external
         standalone = deployer.configuration_file.standalone

base/server/python/pki/server/deployment/scriptlets/security_databases.py

@@ -47,7 +47,7 @@ def spawn(self, deployer):
         instance = self.instance
         instance.load()
 
-        subsystem = instance.get_subsystem(deployer.mdict['pki_subsystem'].lower())
+        subsystem = instance.get_subsystem(deployer.subsystem_type.lower())
 
         if config.str2bool(deployer.mdict['pki_use_pss_rsa_signing_algorithm']):
             deployer.update_rsa_pss_algorithms(subsystem)

base/server/python/pki/server/deployment/scriptlets/subsystem_layout.py

@@ -44,7 +44,7 @@ def spawn(self, deployer):
             logger.info('Skipping subsystem creation')
             return
 
-        logger.info('Creating %s subsystem', deployer.mdict['pki_subsystem'])
+        logger.info('Creating %s subsystem', deployer.subsystem_type)
 
         # If pki_one_time_pin is not specified, generate a new one
         if 'pki_one_time_pin' not in deployer.mdict:
@@ -96,7 +96,7 @@ def spawn(self, deployer):
             pki_source_registry_cfg,
             pki_target_registry_cfg)
 
-        if deployer.mdict['pki_subsystem'] == "CA":
+        if deployer.subsystem_type == "CA":
 
             # Copy /usr/share/pki/ca/emails
             # to /etc/pki/<instance>/ca/emails
@@ -278,7 +278,7 @@ def spawn(self, deployer):
                 pki_target_proxy_conf,
                 params=deployer.mdict)
 
-        elif deployer.mdict['pki_subsystem'] == "TPS":
+        elif deployer.subsystem_type == "TPS":
 
             # Copy /usr/share/pki/<subsystem>/conf/phoneHome.xml
             # to /etc/pki/<instance>/<subsystem>/phoneHome.xml
@@ -332,14 +332,14 @@ def spawn(self, deployer):
     def destroy(self, deployer):
 
         instance = self.instance
-        subsystem_name = deployer.mdict['pki_subsystem'].lower()
+        subsystem_name = deployer.subsystem_type.lower()
 
         logger.info('Undeploying /%s web application', subsystem_name)
 
         subsystem = instance.get_subsystem(subsystem_name)
         subsystem.disable(force=deployer.force)
 
-        logger.info('Removing %s subsystem', deployer.mdict['pki_subsystem'])
+        logger.info('Removing %s subsystem', deployer.subsystem_type)
 
         instance.remove_subsystem(subsystem)