Revert "Fix for module level import not at top of file"
This reverts commit 47375aa789dcb11ba969895f61dfb12a773e2164.
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
Change-Id: Icc40562b861262d8fb72d68b43654334985eea4d
diff --git a/bin/generate_inventory b/bin/generate_inventory
index 80f725e..3654682 100755
--- a/bin/generate_inventory
+++ b/bin/generate_inventory
@@ -3,9 +3,6 @@
Generate an inventory variable file containing a list of properties
fields from the YAML phosphor-dbus-interfaces repository.
"""
-
-from gen_print import *
-
import sys
import os
import yaml
@@ -13,6 +10,7 @@
lib_path = sys.path[0] + "/../lib"
sys.path.insert(0, lib_path)
+from gen_print import *
# This list will be longer when more development codes are available.
inventory_items = ['fru', 'core', 'fan', 'fan_wc', 'gpu']
diff --git a/bin/generate_testsuite_info.py b/bin/generate_testsuite_info.py
index 6392145..7cafd1e 100755
--- a/bin/generate_testsuite_info.py
+++ b/bin/generate_testsuite_info.py
@@ -5,15 +5,14 @@
Refer to https://robot-framework.readthedocs.io/en/3.0.1/autodoc/robot.parsing.html
"""
+import sys
+import os
+from robot.parsing.model import TestData
+sys.path.append(os.path.join(os.path.dirname(__file__), "../lib"))
+
from gen_arg import *
from gen_print import *
from gen_valid import *
-from robot.parsing.model import TestData
-
-import sys
-import os
-
-sys.path.append(os.path.join(os.path.dirname(__file__), "../lib"))
# Set exit_on_error for gen_valid functions.
set_exit_on_error(True)
diff --git a/bin/obmc_ser_num b/bin/obmc_ser_num
index 8d86099..ba620c8 100755
--- a/bin/obmc_ser_num
+++ b/bin/obmc_ser_num
@@ -4,10 +4,6 @@
This program will get the system serial number from an OBMC machine and print it to stdout.
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-
import sys
import os
import requests
@@ -15,6 +11,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/print_ffdc_functions b/bin/print_ffdc_functions
index 325fa06..dd46bc6 100755
--- a/bin/print_ffdc_functions
+++ b/bin/print_ffdc_functions
@@ -4,16 +4,16 @@
See help text for details.
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-from openbmc_ffdc_list import *
-
import sys
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+from openbmc_ffdc_list import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/prop_call.py b/bin/prop_call.py
index e167fa5..15cff57 100755
--- a/bin/prop_call.py
+++ b/bin/prop_call.py
@@ -16,18 +16,18 @@
my_program --test_mode=y --quiet=n file1 file2 file3
"""
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-from gen_misc import *
-from gen_cmd import *
-
import sys
import os
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+from gen_misc import *
+from gen_cmd import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/validate_plug_ins.py b/bin/validate_plug_ins.py
index 78e65e5..a202d2e 100755
--- a/bin/validate_plug_ins.py
+++ b/bin/validate_plug_ins.py
@@ -1,18 +1,12 @@
#!/usr/bin/env python3
-
-from gen_print import *
-from gen_arg import *
-from gen_plug_in import *
-
import sys
-import os
-
try:
import __builtin__
except ImportError:
import builtins as __builtin__
+import os
# python puts the program's directory path in sys.path[0]. In other words, the user ordinarily has no way
# to override python's choice of a module from its own dir. We want to have that ability in our environment.
@@ -23,6 +17,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_print import *
+from gen_arg import *
+from gen_plug_in import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/bin/websocket_monitor.py b/bin/websocket_monitor.py
index 712b0ee..846ccd5 100755
--- a/bin/websocket_monitor.py
+++ b/bin/websocket_monitor.py
@@ -4,10 +4,6 @@
See help text for details.
"""
-from gen_print import *
-from gen_arg import *
-from gen_valid import *
-
import json
import sys
import websocket
@@ -18,6 +14,10 @@
save_path_0 = sys.path[0]
del sys.path[0]
+from gen_print import *
+from gen_arg import *
+from gen_valid import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)
diff --git a/ffdc/collect_ffdc.py b/ffdc/collect_ffdc.py
index ca232f1..c1c9495 100644
--- a/ffdc/collect_ffdc.py
+++ b/ffdc/collect_ffdc.py
@@ -4,8 +4,6 @@
CLI FFDC Collector.
"""
-from ffdc_collector import ffdc_collector
-
import os
import sys
import click
@@ -14,13 +12,14 @@
# Absolute path to openbmc-test-automation/ffdc
abs_path = os.path.abspath(os.path.dirname(sys.argv[0]))
full_path = abs_path.split('ffdc')[0]
-
sys.path.append(full_path)
# Walk path and append to sys.path
for root, dirs, files in os.walk(full_path):
for found_dir in dirs:
sys.path.append(os.path.join(root, found_dir))
+from ffdc_collector import ffdc_collector
+
@click.command(context_settings=dict(help_option_names=['-h', '--help']))
@click.option('-r', '--remote',
diff --git a/ffdc/ffdc_collector.py b/ffdc/ffdc_collector.py
index 9afd0ad..27b088c 100644
--- a/ffdc/ffdc_collector.py
+++ b/ffdc/ffdc_collector.py
@@ -4,10 +4,6 @@
See class prolog below for details.
"""
-from ssh_utility import SSHRemoteclient
-from telnet_utility import TelnetRemoteclient
-from errno import EACCES, EPERM
-
import os
import re
import sys
@@ -16,6 +12,7 @@
import time
import logging
import platform
+from errno import EACCES, EPERM
import subprocess
script_dir = os.path.dirname(os.path.abspath(__file__))
@@ -25,6 +22,8 @@
for dir in dirs:
sys.path.append(os.path.join(root, dir))
+from ssh_utility import SSHRemoteclient
+from telnet_utility import TelnetRemoteclient
r"""
User define plugins python functions.
diff --git a/ffdc/plugins/scp_execution.py b/ffdc/plugins/scp_execution.py
index 9754c02..0aca54c 100644
--- a/ffdc/plugins/scp_execution.py
+++ b/ffdc/plugins/scp_execution.py
@@ -1,25 +1,23 @@
#!/usr/bin/env python3
-# ssh_utility is in ../lib
-from ssh_utility import SSHRemoteclient
-
import os
import sys
# ---------Set sys.path for pluqin execution---------------------------------------
# Absolute path to this plugin
abs_path = os.path.abspath(os.path.dirname(sys.argv[0]))
-
# full_path to plugins parent directory
full_path = abs_path.split('plugins')[0]
sys.path.append(full_path)
-
# Walk path and append to sys.path
for root, dirs, files in os.walk(full_path):
for found_dir in dirs:
sys.path.append(os.path.join(root, found_dir))
+# ssh_utility is in ../lib
+from ssh_utility import SSHRemoteclient
+
def scp_remote_file(hostname,
username,
diff --git a/ffdc/plugins/ssh_execution.py b/ffdc/plugins/ssh_execution.py
index db06596..087d887 100644
--- a/ffdc/plugins/ssh_execution.py
+++ b/ffdc/plugins/ssh_execution.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
-from ssh_utility import SSHRemoteclient
-
import os
import sys
@@ -18,6 +16,7 @@
sys.path.append(os.path.join(root, found_dir))
# ssh_utility is in ../lib
+from ssh_utility import SSHRemoteclient
def ssh_execute_cmd(hostname,
diff --git a/ffdc/plugins/telnet_execution.py b/ffdc/plugins/telnet_execution.py
index 726d3a6..7cfd78b 100644
--- a/ffdc/plugins/telnet_execution.py
+++ b/ffdc/plugins/telnet_execution.py
@@ -1,8 +1,6 @@
#!/usr/bin/env python3
-from telnet_utility import TelnetRemoteclient
-
import os
import sys
@@ -17,6 +15,8 @@
for found_dir in dirs:
sys.path.append(os.path.join(root, found_dir))
+from telnet_utility import TelnetRemoteclient
+
def telnet_execute_cmd(hostname,
username,
diff --git a/lib/code_update_utils.py b/lib/code_update_utils.py
index 5d69db6..e8ee562 100644
--- a/lib/code_update_utils.py
+++ b/lib/code_update_utils.py
@@ -4,24 +4,24 @@
This module provides utilities for code updates.
"""
-from robot.libraries.BuiltIn import BuiltIn
-
-import bmc_ssh_utils as bsu
-import gen_robot_keyword as keyword
-import gen_print as gp
-import variables as var
-
import os
import re
import sys
import tarfile
import time
import collections
+from robot.libraries.BuiltIn import BuiltIn
robot_pgm_dir_path = os.path.dirname(__file__) + os.sep
repo_data_path = re.sub('/lib', '/data', robot_pgm_dir_path)
sys.path.append(repo_data_path)
+import bmc_ssh_utils as bsu
+import gen_robot_keyword as keyword
+import gen_print as gp
+import variables as var
+from robot.libraries.BuiltIn import BuiltIn
+
def get_bmc_firmware(image_type, sw_dict):
r"""
diff --git a/lib/dump_utils.py b/lib/dump_utils.py
index 7c65df9..d0b0108 100755
--- a/lib/dump_utils.py
+++ b/lib/dump_utils.py
@@ -10,16 +10,14 @@
import bmc_ssh_utils as bsu
import var_funcs as vf
import os
+from robot.libraries.BuiltIn import BuiltIn
import sys
import os
import imp
-import variables as var
-
-from robot.libraries.BuiltIn import BuiltIn
-
base_path = os.path.dirname(os.path.dirname(
imp.find_module("gen_robot_print")[1])) + os.sep
sys.path.append(base_path + "data/")
+import variables as var
def get_dump_dict(quiet=None):
diff --git a/lib/ffdc_cli_robot_script.py b/lib/ffdc_cli_robot_script.py
index eb2cb2e..013e4ab 100644
--- a/lib/ffdc_cli_robot_script.py
+++ b/lib/ffdc_cli_robot_script.py
@@ -4,13 +4,12 @@
import sys
+sys.path.append(__file__.split(__file__.split("/")[-1])[0] + "../ffdc")
from ffdc_collector import ffdc_collector
from ssh_utility import SSHRemoteclient
from robot.libraries.BuiltIn import BuiltIn as robotBuildIn
-sys.path.append(__file__.split(__file__.split("/")[-1])[0] + "../ffdc")
-
# (Sub) String constants used for input dictionary key search
HOST = "HOST"
USER = "USERNAME"
diff --git a/lib/gen_robot_ssh.py b/lib/gen_robot_ssh.py
index b0cd049..ab68415 100755
--- a/lib/gen_robot_ssh.py
+++ b/lib/gen_robot_ssh.py
@@ -16,13 +16,10 @@
import gen_print as gp
import func_timer as ft
-
+func_timer = ft.func_timer_class()
from robot.libraries.BuiltIn import BuiltIn
from SSHLibrary import SSHLibrary
-
-func_timer = ft.func_timer_class()
-
sshlib = SSHLibrary()
diff --git a/lib/ipmi_utils.py b/lib/ipmi_utils.py
index b2a1b2b..f8cc9be 100644
--- a/lib/ipmi_utils.py
+++ b/lib/ipmi_utils.py
@@ -14,10 +14,9 @@
import var_funcs as vf
import ipmi_client as ic
import tempfile
-import json
-from robot.libraries.BuiltIn import BuiltIn
-
gru.my_import_resource("ipmi_client.robot")
+from robot.libraries.BuiltIn import BuiltIn
+import json
def get_sol_info():
diff --git a/lib/logging_utils.py b/lib/logging_utils.py
index 0cdbea9..e621d5e 100644
--- a/lib/logging_utils.py
+++ b/lib/logging_utils.py
@@ -5,17 +5,15 @@
"""
import gen_print as gp
-import variables as var
-import gen_robot_utils as gru
import sys
import os
import imp
-
-from robot.libraries.BuiltIn import BuiltIn
-
base_path = os.path.dirname(os.path.dirname(
imp.find_module("gen_robot_print")[1])) + os.sep
sys.path.append(base_path + "data/")
+import variables as var
+from robot.libraries.BuiltIn import BuiltIn
+import gen_robot_utils as gru
gru.my_import_resource("logging_utils.robot")
diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 79358a6..0dc245d 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -33,12 +33,12 @@
import gen_plug_in_utils as gpu
import pel_utils as pel
import logging_utils as log
-import run_keyword as rk
base_path = os.path.dirname(os.path.dirname(
imp.find_module("gen_robot_print")[1])) +\
os.sep
sys.path.append(base_path + "extended/")
+import run_keyword as rk
# Setting master_pid correctly influences the behavior of plug-ins like
# DB_Logging
diff --git a/lib/pel_utils.py b/lib/pel_utils.py
index b06124c..d361a4e 100644
--- a/lib/pel_utils.py
+++ b/lib/pel_utils.py
@@ -6,8 +6,6 @@
import func_args as fa
import bmc_ssh_utils as bsu
-import pel_variables
-
import json
import os
import sys
@@ -16,6 +14,8 @@
base_path = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
sys.path.append(base_path + "/data/")
+import pel_variables
+
class peltool_exception(Exception):
r"""
diff --git a/lib/state_map.py b/lib/state_map.py
index f8353de..5d72b5a 100644
--- a/lib/state_map.py
+++ b/lib/state_map.py
@@ -6,10 +6,6 @@
- Defines Valid states of the system
"""
-
-import gen_robot_keyword as keyword
-import variables as var
-
import os
import re
import sys
@@ -20,6 +16,8 @@
repo_data_dir_path = re.sub('/lib', '/data', robot_pgm_dir_path)
sys.path.append(repo_data_dir_path)
+import gen_robot_keyword as keyword
+import variables as var
BuiltIn().import_resource("state_manager.robot")
BuiltIn().import_resource("rest_client.robot")
diff --git a/syslib/utils_os.py b/syslib/utils_os.py
index fe97de5..2026d95 100755
--- a/syslib/utils_os.py
+++ b/syslib/utils_os.py
@@ -4,14 +4,14 @@
This file contains utilities associated with the host OS.
"""
-import bmc_ssh_utils
-import var_funcs
-
import sys
import os
sys.path.append(os.path.join(os.path.dirname(__file__), "../lib"))
+import bmc_ssh_utils
+import var_funcs
+
def get_os_release_info(default_cmd="cat /etc/os-release"):
r"""
diff --git a/tools/ct_metrics/gen_csv_results.py b/tools/ct_metrics/gen_csv_results.py
index 3ad9d67..342fe69 100755
--- a/tools/ct_metrics/gen_csv_results.py
+++ b/tools/ct_metrics/gen_csv_results.py
@@ -14,20 +14,19 @@
import re
import stat
import datetime
-
from robot.api import ExecutionResult
from robot.result.visitor import ResultVisitor
from xml.etree import ElementTree
-from gen_arg import *
-from gen_print import *
-from gen_valid import *
-
# Remove the python library path to restore with local project path later.
save_path_0 = sys.path[0]
del sys.path[0]
sys.path.append(os.path.join(os.path.dirname(__file__), "../../lib"))
+from gen_arg import *
+from gen_print import *
+from gen_valid import *
+
# Restore sys.path[0].
sys.path.insert(0, save_path_0)