Run pylint on upgrade scripts

pylint-build-scan.sh doesn't checked the upgrader's Python files yet.
This patch adds the common and server upgrade scripts to
pylint-build-scan.sh. It also fixes a couple of pylint violations,
mostly missing calls to __init__().

26 files changed, 48 insertions, 45 deletions

diff --git a/base/common/upgrade/10.0.1/01-AddJniJarDir b/base/common/upgrade/10.0.1/01-AddJniJarDir
index 58b634f7f..1419eb9e5 100755
--- a/base/common/upgrade/10.0.1/01-AddJniJarDir
+++ b/base/common/upgrade/10.0.1/01-AddJniJarDir
@@ -28,7 +28,7 @@ import pki.upgrade
 class AddJniJarDir(pki.upgrade.PKIUpgradeScriptlet):
 
     def __init__(self):
-
+        super(AddJniJarDir, self).__init__()
         self.message = 'Add JNI_JAR_DIR into pki.conf'
 
     def upgrade_system(self):
@@ -40,11 +40,11 @@ class AddJniJarDir(pki.upgrade.PKIUpgradeScriptlet):
 
         default_path = default_conf.get('JNI_JAR_DIR')
 
-        file = os.path.join(pki.CONF_DIR, 'pki.conf')
-        self.backup(file)
+        filename = os.path.join(pki.CONF_DIR, 'pki.conf')
+        self.backup(filename)
 
         # read pki.conf
-        conf = pki.PropertyFile(file)
+        conf = pki.PropertyFile(filename)
         conf.read()
 
         # find JNI_JAR_DIR
diff --git a/base/common/upgrade/10.0.3/01-RemoveJniJarDir b/base/common/upgrade/10.0.3/01-RemoveJniJarDir
index 4efbfc6b6..86ff54a60 100755
--- a/base/common/upgrade/10.0.3/01-RemoveJniJarDir
+++ b/base/common/upgrade/10.0.3/01-RemoveJniJarDir
@@ -28,16 +28,16 @@ import pki.upgrade
 class RemoveJniJarDir(pki.upgrade.PKIUpgradeScriptlet):
 
     def __init__(self):
-
+        super(RemoveJniJarDir, self).__init__()
         self.message = 'Remove JNI_JAR_DIR from /etc/pki/pki.conf'
 
     def upgrade_system(self):
 
-        file = os.path.join(pki.CONF_DIR, 'pki.conf')
-        self.backup(file)
+        filename = os.path.join(pki.CONF_DIR, 'pki.conf')
+        self.backup(filename)
 
         # read pki.conf
-        conf = pki.PropertyFile(file)
+        conf = pki.PropertyFile(filename)
         conf.read()
 
         self.update_system_config(conf)
diff --git a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
index 01614d56a..5cf4e581b 100755
--- a/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
+++ b/base/server/upgrade/10.0.1/01-ReplaceRandomNumberGenerator
@@ -21,8 +21,6 @@
 
 import os
 import shutil
-import signal
-import sys
 from lxml import etree
 
 import pki
@@ -32,7 +30,7 @@ import pki.server.upgrade
 class ReplaceRandomNumberGenerator(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(ReplaceRandomNumberGenerator, self).__init__()
         self.message = 'Replace random number generator'
 
         self.context_xml = '/usr/share/pki/%s/webapps/%s/META-INF/context.xml'
diff --git a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
index c70a4263c..5960f1d2d 100755
--- a/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
+++ b/base/server/upgrade/10.0.1/02-CloningInterfaceChanges
@@ -20,7 +20,6 @@
 #
 
 import os
-import sys
 from lxml import etree as ET
 
 import pki
@@ -97,8 +96,10 @@ class CloningInterfaceChanges(pki.server.upgrade.PKIServerUpgradeScriptlet):
         </servlet-mapping>"""
 
     def __init__(self):
-
+        super(CloningInterfaceChanges, self).__init__()
         self.message = 'Change interfaces for cloning'
+        self.doc = None
+        self.root = None
 
     def upgrade_subsystem(self, instance, subsystem):
         web_xml = os.path.join(
diff --git a/base/server/upgrade/10.0.1/03-AddRestServlet b/base/server/upgrade/10.0.1/03-AddRestServlet
index 37304e294..2f375cd42 100755
--- a/base/server/upgrade/10.0.1/03-AddRestServlet
+++ b/base/server/upgrade/10.0.1/03-AddRestServlet
@@ -20,7 +20,6 @@
 #
 
 import os
-import sys
 from lxml import etree as ET
 
 import pki
@@ -41,8 +40,10 @@ class AddRestServlet(pki.server.upgrade.PKIServerUpgradeScriptlet):
         </servlet-mapping> """
 
     def __init__(self):
-
+        super(AddRestServlet, self).__init__()
         self.message = 'Add dummy REST servlet to upgraded Dogtag 9 instances'
+        self.doc = None
+        self.root = None
 
     def upgrade_subsystem(self, instance, subsystem):
         if subsystem.type >= 10:
diff --git a/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator b/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
index 7aee78089..fe954c662 100755
--- a/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
+++ b/base/server/upgrade/10.0.5/01-EnableSessionInAuthenticator
@@ -28,9 +28,8 @@ import pki.server.upgrade
 class EnableSessionInAuthenticator(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(EnableSessionInAuthenticator, self).__init__()
         self.message = 'Enable session in authenticator'
-
         self.parser = etree.XMLParser(remove_blank_text=True)
 
     def upgrade_subsystem(self, instance, subsystem):
diff --git a/base/server/upgrade/10.0.99/01-FixJavaOpts b/base/server/upgrade/10.0.99/01-FixJavaOpts
index d89f7b425..da2ece18a 100755
--- a/base/server/upgrade/10.0.99/01-FixJavaOpts
+++ b/base/server/upgrade/10.0.99/01-FixJavaOpts
@@ -19,7 +19,6 @@
 # All rights reserved.
 #
 
-import os
 import re
 import pki.server.upgrade
 
@@ -27,6 +26,7 @@ import pki.server.upgrade
 class FixJavaOpts(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(FixJavaOpts, self).__init__()
         self.message = 'Fix JAVA_OPTS in tomcat startup'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.0.99/02-RemoveAuthProperties b/base/server/upgrade/10.0.99/02-RemoveAuthProperties
index 83719fc75..b5894fafe 100755
--- a/base/server/upgrade/10.0.99/02-RemoveAuthProperties
+++ b/base/server/upgrade/10.0.99/02-RemoveAuthProperties
@@ -27,6 +27,7 @@ import pki.server.upgrade
 class RemoveAuthProperties(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(RemoveAuthProperties, self).__init__()
         self.message = 'Remove auth.properties'
 
     def upgrade_subsystem(self, instance, subsystem):
diff --git a/base/server/upgrade/10.0.99/03-FixRegistryFile b/base/server/upgrade/10.0.99/03-FixRegistryFile
index 7940e7c46..ae417578a 100755
--- a/base/server/upgrade/10.0.99/03-FixRegistryFile
+++ b/base/server/upgrade/10.0.99/03-FixRegistryFile
@@ -28,6 +28,7 @@ import pki.server.upgrade
 class FixRegistryFile(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(FixRegistryFile, self).__init__()
         self.message = 'Replace PKI_INSTANCE_ID and fix registry file ownership'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.0.99/04-FixLogFileOwnership b/base/server/upgrade/10.0.99/04-FixLogFileOwnership
index e4cb93437..964d50b7d 100755
--- a/base/server/upgrade/10.0.99/04-FixLogFileOwnership
+++ b/base/server/upgrade/10.0.99/04-FixLogFileOwnership
@@ -26,6 +26,7 @@ import pki.server.upgrade
 class FixLogFileOwnership(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(FixLogFileOwnership, self).__init__()
         self.message = 'Fix log file ownership'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
index d2526c531..76dbb23d6 100755
--- a/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.1/01-MoveWebApplicationContextFile
@@ -27,7 +27,7 @@ import pki.server.upgrade
 class MoveWebApplicationContextFile(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(MoveWebApplicationContextFile, self).__init__()
         self.message = 'Move web application context file'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
index d2526c531..76dbb23d6 100755
--- a/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
+++ b/base/server/upgrade/10.1.99/01-MoveWebApplicationContextFile
@@ -27,7 +27,7 @@ import pki.server.upgrade
 class MoveWebApplicationContextFile(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(MoveWebApplicationContextFile, self).__init__()
         self.message = 'Move web application context file'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
index e39acb0e0..b74f9d3ee 100755
--- a/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
+++ b/base/server/upgrade/10.1.99/02-ReplaceJettisonWithJackson
@@ -28,7 +28,7 @@ import pki.server.upgrade
 class ReplaceJettisonWithJackson(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(ReplaceJettisonWithJackson, self).__init__()
         self.message = 'Replace Jettison with Jackson'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
index 63d4a93eb..e9a720eaf 100755
--- a/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
+++ b/base/server/upgrade/10.1.99/03-AddedRESTEasyClient
@@ -28,7 +28,7 @@ import pki.server.upgrade
 class AddedRESTEasyClient(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(AddedRESTEasyClient, self).__init__()
         self.message = 'Added RESTEasy client'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
index bd10b09fe..870fa981c 100755
--- a/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
+++ b/base/server/upgrade/10.1.99/04-ReplaceRESTEasyApplicationClass
@@ -20,7 +20,6 @@
 #
 
 import os
-import sys
 from lxml import etree as ET
 
 import pki
@@ -29,7 +28,7 @@ import pki.server.upgrade
 class ReplaceRESTEasyApplicationClass(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(ReplaceRESTEasyApplicationClass, self).__init__()
         self.message = 'Replace RESTEasy application class'
         self.class_names = {
             'ca': 'org.dogtagpki.server.ca.rest.CAApplication',
diff --git a/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML b/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
index 959cac878..edc27e3f8 100755
--- a/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
+++ b/base/server/upgrade/10.1.99/05-RemoveConfigPathFromWebXML
@@ -28,7 +28,7 @@ import pki.server.upgrade
 class RemoveConfigPathFromWebXML(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(RemoveConfigPathFromWebXML, self).__init__()
         self.message = 'Remove config path from web.xml'
 
     def upgrade_subsystem(self, instance, subsystem):
diff --git a/base/server/upgrade/10.2.1/01-AddTLSRangeSupport b/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
index b5b83f465..e2259245b 100755
--- a/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
+++ b/base/server/upgrade/10.2.1/01-AddTLSRangeSupport
@@ -29,7 +29,7 @@ import pki.server.upgrade
 class AddTLSRangeSupport(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(AddTLSRangeSupport, self).__init__()
         self.message = 'Add TLS Range Support'
 
         self.parser = etree.XMLParser(remove_blank_text=True)
diff --git a/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations b/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
index 2a1ec99d7..8d63a5563 100755
--- a/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
+++ b/base/server/upgrade/10.2.2/01-MoveWebApplicationDeploymentLocations
@@ -21,8 +21,6 @@
 
 import os
 import shutil
-import signal
-import sys
 from lxml import etree
 
 import pki
@@ -32,7 +30,7 @@ import pki.server.upgrade
 class MoveWebApplicationDeploymentLocations(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(MoveWebApplicationDeploymentLocations, self).__init__()
         self.message = 'Move Web application deployment locations'
 
         self.parser = etree.XMLParser(remove_blank_text=True)
@@ -103,7 +101,7 @@ class MoveWebApplicationDeploymentLocations(pki.server.upgrade.PKIServerUpgradeS
         document = etree.parse(context_xml, self.parser)
 
         context = document.getroot()
-        doc_base = context.get('docBase')
+        # doc_base = context.get('docBase')
 
         context.set('docBase', new_webapp)
 
diff --git a/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy b/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
index 7cafa6dcc..6e2731d27 100755
--- a/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
+++ b/base/server/upgrade/10.2.2/02-EnableWebApplicationAutoDeploy
@@ -19,12 +19,7 @@
 # All rights reserved.
 #
 
-import grp
 import os
-import pwd
-import shutil
-import signal
-import sys
 from lxml import etree
 
 import pki
@@ -34,7 +29,7 @@ import pki.server.upgrade
 class EnableWebApplicationAutoDeploy(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(EnableWebApplicationAutoDeploy, self).__init__()
         self.message = 'Enabled Web application auto deploy'
 
         self.parser = etree.XMLParser(remove_blank_text=True)
diff --git a/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2 b/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
index 520711c18..0c66eadaa 100755
--- a/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
+++ b/base/server/upgrade/10.2.2/03-RemoveDependencyOnJackson2
@@ -27,7 +27,7 @@ import pki.server.upgrade
 class RemoveDependencyOnJackson2(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
-
+        super(RemoveDependencyOnJackson2, self).__init__()
         self.message = 'Remove dependency on Jackson 2'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
index 686853c29..3c7f21aaf 100755
--- a/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
+++ b/base/server/upgrade/10.2.3/01-FixInstanceWorkFolderOwnership
@@ -26,10 +26,11 @@ import pki.server.upgrade
 class FixInstanceWorkFolderOwnership(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(FixInstanceWorkFolderOwnership, self).__init__()
         self.message = 'Fix instance work folder ownership'
 
     def upgrade_instance(self, instance):
 
-        dir = os.path.join(instance.base_dir, 'work/Catalina/localhost/pki')
-        if os.path.exists(dir):
-            pki.util.chown(dir, instance.uid, instance.gid)
+        directory = os.path.join(instance.base_dir, 'work/Catalina/localhost/pki')
+        if os.path.exists(directory):
+            pki.util.chown(directory, instance.uid, instance.gid)
diff --git a/base/server/upgrade/10.2.3/02-FixBindPWPrompt b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
index e433c125d..ede12f462 100755
--- a/base/server/upgrade/10.2.3/02-FixBindPWPrompt
+++ b/base/server/upgrade/10.2.3/02-FixBindPWPrompt
@@ -29,6 +29,7 @@ import pki.server.upgrade
 class FixBindPWPrompt(pki.server.upgrade.PKIServerUpgradeScriptlet):
 
     def __init__(self):
+        super(FixBindPWPrompt, self).__init__()
         self.message = 'Fix bindPWPrompt for internalDB'
 
     def upgrade_subsystem(self, instance, subsystem):
diff --git a/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML b/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
index 9988e0eba..dfc6a98a6 100755
--- a/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
+++ b/base/server/upgrade/10.2.4/01-AddMissingOCSPGETServletMappingToWebXML
@@ -20,7 +20,6 @@
 #
 
 import os
-import sys
 from lxml import etree as ET
 
 import pki
@@ -37,8 +36,11 @@ class AddMissingOCSPGETServletMappingToWebXML(pki.server.upgrade.PKIServerUpgrad
        """
 
     def __init__(self):
-
+        super(AddMissingOCSPGETServletMappingToWebXML, self).__init__()
         self.message = 'Add missing OCSP Get Servlet Mapping to upgraded Dogtag 9 instances'
+        self.doc = None
+        self.root = None
+
 
     def upgrade_subsystem(self, instance, subsystem):
         # only affects CA
diff --git a/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass b/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
index 22096e935..2eb381db3 100755
--- a/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
+++ b/base/server/upgrade/10.2.4/02-FixNuxwdogListenerClass
@@ -19,7 +19,6 @@
 # All rights reserved.
 #
 
-import os
 import subprocess
 
 import pki.server.upgrade
@@ -27,6 +26,7 @@ import pki.server.upgrade
 
 class FixNuxwdogListenerClass(pki.server.upgrade.PKIServerUpgradeScriptlet):
     def __init__(self):
+        super(FixNuxwdogListenerClass, self).__init__()
         self.message = 'Fix nuxwdog listener class'
 
     def upgrade_instance(self, instance):
diff --git a/base/server/upgrade/10.2.5/01-AddKraAuditEvents b/base/server/upgrade/10.2.5/01-AddKraAuditEvents
index e662aaded..389bd718e 100644
--- a/base/server/upgrade/10.2.5/01-AddKraAuditEvents
+++ b/base/server/upgrade/10.2.5/01-AddKraAuditEvents
@@ -37,13 +37,14 @@ class AddKraAuditEvents(pki.server.upgrade.PKIServerUpgradeScriptlet):
     ]
 
     def __init__(self):
+        super(AddKraAuditEvents, self).__init__()
         self.message = 'Add new KRA audit events'
 
     def upgrade_subsystem(self, instance, subsystem):
         if subsystem.name == 'kra':
             self.add_new_events(instance, subsystem)
 
-    def add_new_events(self, instance, subsystem):
+    def add_new_events(self, instance, subsystem):  # pylint: disable=W0613
         filename = os.path.join(subsystem.conf_dir, 'CS.cfg')
         self.backup(filename)
 
diff --git a/pylint-build-scan.sh b/pylint-build-scan.sh
index cbaf972f0..55c58d395 100755
--- a/pylint-build-scan.sh
+++ b/pylint-build-scan.sh
@@ -11,7 +11,9 @@ fi
 
 HOME_DIR=$1
 
-PYLINT_RC_FILE_PATH="`cd $2/.. ; pwd`/dogtag.pylintrc"
+SCRIPTPATH="$( cd $(dirname $0) ; pwd -P )"
+
+PYLINT_RC_FILE_PATH="$SCRIPTPATH/dogtag.pylintrc"
 
 PYTHON_PACKAGE_DIR="$HOME_DIR`python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"`"
 
@@ -24,6 +26,8 @@ FILES="$FILES $HOME_DIR/usr/sbin/pkidestroy"
 FILES="$FILES $HOME_DIR/usr/sbin/pki-upgrade"
 FILES="$FILES $HOME_DIR/usr/sbin/pki-server"
 FILES="$FILES $HOME_DIR/usr/sbin/pki-server-upgrade"
+FILES="$FILES $(find $HOME_DIR/usr/share/pki/upgrade -type f)"
+FILES="$FILES $(find $HOME_DIR/usr/share/pki/server/upgrade -type f)"
 
 pylint --rcfile=$PYLINT_RC_FILE_PATH $FILES