Sonar upgrade POC - Reordered functions according to python convention

examples/upgrade/python_upgrader/run_preflight_validations.py

@@ -5,6 +5,25 @@
 from decimal import Decimal
 from datetime import datetime
 
+
+def main(target_version):
+    print("---------------------------------------------------------------------")
+    time = datetime.now().strftime("%a %b %d %H:%M:%S UTC %Y")
+    print(f"Running upgrade preflight validations at {time}")
+    source_version = get_sonar_version()
+    different_version, min_version_validation_passed, max_version_hop_validation_passed = \
+        validate_sonar_version(source_version, target_version)
+    result = {
+        "different_version": different_version,
+        "min_version": min_version_validation_passed,
+        "max_version_hop": max_version_hop_validation_passed
+    }
+    result_json_string = json.dumps(result)
+    # The string "Preflight validations result:" is part of the protocol, if you change it, change its usage
+    print(f"Preflight validations result: {result_json_string}")
+    print("---------------------------------------------------------------------")
+
+
 def get_sonar_version():
     jsonar_file_path = "/etc/sysconfig/jsonar"
     target_key = "VERSION="
@@ -24,27 +43,6 @@ def get_sonar_version():
     return version
 
 
-# For example, if version is the string "4.12.0.10.0", returns the number 4.12
-def extract_major_version(version):
-    second_period_index = version.find(".", version.find(".") + 1)
-    if second_period_index != -1:
-        major_version_str = version[:second_period_index]
-        return Decimal(major_version_str)
-    else:
-        raise Exception(f"Invalid version format: {version}, must be x.x.x.x.x")
-
-
-def validate_min_version(source_major_version):
-    return source_major_version >= 4.10
-
-
-def validate_max_version_hop(source_major_version, target_major_version):
-    # TODO handle when 5.x will be released
-    hop = target_major_version - source_major_version
-    print(f"Version hop: {hop}")
-    return hop <= 0.02
-
-
 def validate_sonar_version(source_version, target_version):
     different_version = source_version != target_version
     if different_version:
@@ -64,22 +62,25 @@ def validate_sonar_version(source_version, target_version):
     return different_version, min_version_validation_passed, max_version_hop_validation_passed
 
 
-def main(target_version):
-    print("---------------------------------------------------------------------")
-    time = datetime.now().strftime("%a %b %d %H:%M:%S UTC %Y")
-    print(f"Running upgrade preflight validations at {time}")
-    source_version = get_sonar_version()
-    different_version, min_version_validation_passed, max_version_hop_validation_passed = \
-        validate_sonar_version(source_version, target_version)
-    result = {
-        "different_version": different_version,
-        "min_version": min_version_validation_passed,
-        "max_version_hop": max_version_hop_validation_passed
-    }
-    result_json_string = json.dumps(result)
-    # The string "Preflight validations result:" is part of the protocol, if you change it, change its usage
-    print(f"Preflight validations result: {result_json_string}")
-    print("---------------------------------------------------------------------")
+# For example, if version is the string "4.12.0.10.0", returns the number 4.12
+def extract_major_version(version):
+    second_period_index = version.find(".", version.find(".") + 1)
+    if second_period_index != -1:
+        major_version_str = version[:second_period_index]
+        return Decimal(major_version_str)
+    else:
+        raise Exception(f"Invalid version format: {version}, must be x.x.x.x.x")
+
+
+def validate_min_version(source_major_version):
+    return source_major_version >= 4.10
+
+
+def validate_max_version_hop(source_major_version, target_major_version):
+    # TODO handle when 5.x will be released
+    hop = target_major_version - source_major_version
+    print(f"Version hop: {hop}")
+    return hop <= 0.02
 
 
 if __name__ == "__main__":