Move PKIServerFactory into pki.server

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

@@ -2056,3 +2056,52 @@ def __init__(self, message, exception=None,
 
         self.instance = instance
         self.subsystem = subsystem
+
+
+class PKIServerFactory(object):
+
+    @classmethod
+    def create(cls, name):
+        '''
+        This method creates PKIServer object based on the
+        optional service type specified in the service name.
+        The default type is 'pki-tomcatd'.
+
+        :param name: Server name in this format: [<type>@]<name>[.service]
+        '''
+
+        if name.endswith('.service'):
+            name = name[0:-8]
+
+        parts = name.split('@')
+
+        if len(parts) == 1:  # no type
+            instance_type = 'pki-tomcatd'
+            instance_name = name
+
+        else:  # with type
+            instance_type = parts[0]
+            instance_name = parts[1]
+
+        sysconfig_file = os.path.join('/etc/sysconfig', instance_name)
+
+        if os.path.isfile(sysconfig_file):
+
+            with open(sysconfig_file, encoding='utf-8') as f:
+                nuxwdog_status = re.search('^USE_NUXWDOG=\"(.*)\"', f.read(), re.MULTILINE)
+
+                # Check if the regex was matched and then check if nuxwdog is enabled.
+                if nuxwdog_status and nuxwdog_status.group(1) == "true":
+                    instance_type += '-nuxwdog'
+
+        logger.info('Loading instance type: %s', instance_type)
+
+        if instance_type == 'tomcat':
+            return pki.server.PKIServer(instance_name)
+
+        if instance_type.startswith('pki-tomcatd'):
+            module = __import__('pki.server.instance', fromlist=['PKIInstance'])
+            clazz = getattr(module, 'PKIInstance')
+            return clazz(instance_name, instance_type=instance_type)
+
+        raise Exception('Unsupported instance type: %s' % instance_type)

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

@@ -52,7 +52,6 @@
 import pki.server.cli.tps
 import pki.server.cli.upgrade
 import pki.server.cli.webapp
-import pki.server.instance
 import pki.util
 
 logger = logging.getLogger(__name__)
@@ -369,7 +368,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not force and instance.exists():
             logger.error('Instance already exists: %s', instance_name)
@@ -439,7 +438,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not force and not instance.exists():
             logger.error('Invalid instance: %s', instance_name)
@@ -495,7 +494,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance: %s', instance_name)
@@ -567,7 +566,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance: %s', instance_name)
@@ -641,7 +640,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance: %s', instance_name)
@@ -715,7 +714,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance: %s', instance_name)
@@ -797,7 +796,7 @@ def execute(self, argv):
         if len(args) > 0:
             instance_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance: %s', instance_name)

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

@@ -15,7 +15,6 @@
 
 import pki.cli
 import pki.server
-import pki.server.instance
 import pki.server.cli.subsystem
 
 # TODO: auto-populate this map from /usr/share/pki/acme/database
@@ -124,7 +123,7 @@ def execute(self, argv):
         if len(args) > 0:
             name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -206,7 +205,7 @@ def execute(self, argv):
         if len(args) > 0:
             name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -285,7 +284,7 @@ def execute(self, argv):
         if len(args) > 0:
             name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -374,7 +373,7 @@ def execute(self, argv):
         if len(args) > 0:
             name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -445,7 +444,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -528,7 +527,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -636,7 +635,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -768,7 +767,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -972,7 +971,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -1091,7 +1090,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -1273,7 +1272,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)
@@ -1415,7 +1414,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             raise Exception('Invalid instance: %s' % instance_name)

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

@@ -30,7 +30,6 @@
 import tempfile
 
 import pki.cli
-import pki.server.instance
 
 logger = logging.getLogger(__name__)
 
@@ -136,7 +135,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -264,7 +263,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -387,7 +386,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -475,7 +474,7 @@ def execute(self, argv):
 
         event_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -550,7 +549,7 @@ def execute(self, argv):
             raise getopt.GetoptError("Too many arguments specified.")
         event_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -644,7 +643,7 @@ def execute(self, argv):
 
         event_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -722,7 +721,7 @@ def execute(self, argv):
 
         event_name = args[0]
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -803,7 +802,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)
@@ -880,7 +879,7 @@ def execute(self, argv):
                 self.print_help()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
             sys.exit(1)

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

@@ -27,7 +27,6 @@
 import sys
 
 import pki.cli
-import pki.server.instance
 
 logger = logging.getLogger(__name__)
 
@@ -88,7 +87,7 @@ def execute(self, argv):
                 self.usage()
                 sys.exit(1)
 
-        instance = pki.server.instance.PKIServerFactory.create(instance_name)
+        instance = pki.server.PKIServerFactory.create(instance_name)
 
         if not instance.exists():
             logger.error('Invalid instance %s.', instance_name)
@@ -168,7 +167,7 @@ def execute(self, argv):
             else:
 
                 # load banner from instance
-                instance = pki.server.instance.PKIServerFactory.create(instance_name)
+                instance = pki.server.PKIServerFactory.create(instance_name)
 
                 if not instance.exists():
                     logger.error('Invalid instance %s.', instance_name)