diff --git a/controllerconfig/controllerconfig/controllerconfig/common/exceptions.py b/controllerconfig/controllerconfig/controllerconfig/common/exceptions.py index b42526bff3..0d861c8a84 100644 --- a/controllerconfig/controllerconfig/controllerconfig/common/exceptions.py +++ b/controllerconfig/controllerconfig/controllerconfig/common/exceptions.py @@ -22,19 +22,19 @@ class ConfigError(Exception): class ValidateFail(ConfigError): """Validation of data failed.""" - pass + pass # pylint: disable=unnecessary-pass class UpgradeFail(ConfigError): """Upgrade error.""" - pass + pass # pylint: disable=unnecessary-pass class KeystoneFail(ConfigError): """Keystone error.""" - pass + pass # pylint: disable=unnecessary-pass class TidyStorageFail(ConfigError): """Tidy storage error.""" - pass + pass # pylint: disable=unnecessary-pass diff --git a/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py b/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py index 8122216957..47afcb79e4 100755 --- a/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py +++ b/controllerconfig/controllerconfig/controllerconfig/common/rest_api_utils.py @@ -35,7 +35,7 @@ def rest_api_request(token, method, api_cmd, api_cmd_headers=None, if api_cmd_payload is not None: request_info.add_header("Content-type", "application/json") - request_info.add_data(api_cmd_payload) + request_info.data = api_cmd_payload request = urlrequest.urlopen(request_info) response = request.read() @@ -94,7 +94,7 @@ def get_token(auth_url, auth_project, auth_user, auth_password, "domain": {"name": project_domain} }}}}) - request_info.add_data(payload) + request_info.data = payload request = urlrequest.urlopen(request_info) # Identity API v3 returns token id in X-Subject-Token diff --git a/controllerconfig/controllerconfig/controllerconfig/utils.py b/controllerconfig/controllerconfig/controllerconfig/utils.py index 85b87603cc..f10eeaf593 100644 --- a/controllerconfig/controllerconfig/controllerconfig/utils.py +++ b/controllerconfig/controllerconfig/controllerconfig/utils.py @@ -62,7 +62,7 @@ def check_sm_service(service, state): try: output = subprocess.check_output(["sm-query", "service", service], universal_newlines=True) - return state in output + return state in output # pylint: disable=unsupported-membership-test except subprocess.CalledProcessError: return False @@ -324,7 +324,7 @@ def is_ssh_parent(): try: cmd_output = subprocess.check_output(command, shell=True, universal_newlines=True) - if "ssh" in cmd_output: + if "ssh" in cmd_output: # pylint: disable=unsupported-membership-test return True else: return False diff --git a/controllerconfig/controllerconfig/test-requirements.txt b/controllerconfig/controllerconfig/test-requirements.txt index f765a19c88..de056a464e 100644 --- a/controllerconfig/controllerconfig/test-requirements.txt +++ b/controllerconfig/controllerconfig/test-requirements.txt @@ -1,5 +1,4 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 -pylint <=1.9.3;python_version<'3.0' pytest mockproc>= 0.3.1 # BSD coverage>=3.6 @@ -8,3 +7,6 @@ os-testr>=0.8.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 testresources>=0.2.4 # Apache-2.0/BSD testrepository>=0.0.18 # Apache-2.0/BSD +isort<5;python_version>="3.0" +pylint<2.1.0;python_version<"3.0" # GPLv2 +pylint<2.4.0;python_version>="3.0" # GPLv2 diff --git a/controllerconfig/controllerconfig/tox.ini b/controllerconfig/controllerconfig/tox.ini index 0a89eb4841..2ff0bf9be4 100644 --- a/controllerconfig/controllerconfig/tox.ini +++ b/controllerconfig/controllerconfig/tox.ini @@ -45,12 +45,14 @@ commands = stestr slowest [testenv:pylint] -basepython = python2.7 +basepython = python3 deps = {[testenv]deps} + pylint + commands = pylint {posargs} controllerconfig --rcfile=./pylint.rc --extension-pkg-whitelist=netifaces [testenv:flake8] -basepython = python2.7 +basepython = python3 deps = -r{toxinidir}/test-requirements.txt commands = flake8 {posargs} @@ -67,7 +69,7 @@ ignore = H101,H102,H104,H306,H401,H404,H405 exclude = build [testenv:cover] -basepython = python2.7 +basepython = python3 deps = {[testenv]deps} commands = diff --git a/controllerconfig/controllerconfig/upgrade-scripts/10-sysinv-adjust-partitions.py b/controllerconfig/controllerconfig/upgrade-scripts/10-sysinv-adjust-partitions.py index 8c6adf48a3..da2616829e 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/10-sysinv-adjust-partitions.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/10-sysinv-adjust-partitions.py @@ -34,7 +34,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/45-sysinv-remove-identity-shared-service.py b/controllerconfig/controllerconfig/upgrade-scripts/45-sysinv-remove-identity-shared-service.py index f403952f67..37c981e479 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/45-sysinv-remove-identity-shared-service.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/45-sysinv-remove-identity-shared-service.py @@ -35,7 +35,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/50-dcmanager-subcloud-status-migration.py b/controllerconfig/controllerconfig/upgrade-scripts/50-dcmanager-subcloud-status-migration.py index 9a9644331c..967c045a16 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/50-dcmanager-subcloud-status-migration.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/50-dcmanager-subcloud-status-migration.py @@ -41,7 +41,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/55-armada-helm-upgrade.py b/controllerconfig/controllerconfig/upgrade-scripts/55-armada-helm-upgrade.py index d49df86ea5..db8809a875 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/55-armada-helm-upgrade.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/55-armada-helm-upgrade.py @@ -31,7 +31,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/60-helm-releases-data-migration.py b/controllerconfig/controllerconfig/upgrade-scripts/60-helm-releases-data-migration.py index 1c8007384f..49b1c1040c 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/60-helm-releases-data-migration.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/60-helm-releases-data-migration.py @@ -40,7 +40,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/75-deployment-ns-upgrade.py b/controllerconfig/controllerconfig/upgrade-scripts/75-deployment-ns-upgrade.py index 96f4e1ed4c..e0a8b4d42f 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/75-deployment-ns-upgrade.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/75-deployment-ns-upgrade.py @@ -30,7 +30,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/80-dc-cert-upgrade.py b/controllerconfig/controllerconfig/upgrade-scripts/80-dc-cert-upgrade.py index ec0ca8d515..57899731f9 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/80-dc-cert-upgrade.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/80-dc-cert-upgrade.py @@ -31,7 +31,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/85-update-sc-admin-endpoint-cert.py b/controllerconfig/controllerconfig/upgrade-scripts/85-update-sc-admin-endpoint-cert.py index e893fe4786..925f1d5ef5 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/85-update-sc-admin-endpoint-cert.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/85-update-sc-admin-endpoint-cert.py @@ -51,7 +51,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/95-apply-mandatory-psp-policies.py b/controllerconfig/controllerconfig/upgrade-scripts/95-apply-mandatory-psp-policies.py index 47168f724f..4b6146d209 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/95-apply-mandatory-psp-policies.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/95-apply-mandatory-psp-policies.py @@ -28,7 +28,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/96-delete-snmp-records.py b/controllerconfig/controllerconfig/upgrade-scripts/96-delete-snmp-records.py index 12fd8576eb..17acd2122d 100644 --- a/controllerconfig/controllerconfig/upgrade-scripts/96-delete-snmp-records.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/96-delete-snmp-records.py @@ -30,7 +30,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1 diff --git a/controllerconfig/controllerconfig/upgrade-scripts/97-reset-config-target.py b/controllerconfig/controllerconfig/upgrade-scripts/97-reset-config-target.py index a16f5d3dd4..3df20302eb 100755 --- a/controllerconfig/controllerconfig/upgrade-scripts/97-reset-config-target.py +++ b/controllerconfig/controllerconfig/upgrade-scripts/97-reset-config-target.py @@ -31,7 +31,7 @@ def main(): elif arg == 3: action = sys.argv[arg] else: - print ("Invalid option %s." % sys.argv[arg]) + print("Invalid option %s." % sys.argv[arg]) return 1 arg += 1