Merge "Cleanup tox alphabetical imports in nfv"

nfv/nfv-client/nfv_client/openstack/objects.py

@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import re
-import iso8601
 import datetime
+import iso8601
+import re
 
 
 class Token(object):

nfv/nfv-client/nfv_client/sw_update/__init__.py

@@ -2,17 +2,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_client.sw_update._sw_update import STRATEGY_NAME_SW_PATCH  # noqa: F401
+from nfv_client.sw_update._sw_update import abort_strategy  # noqa: F401
-from nfv_client.sw_update._sw_update import STRATEGY_NAME_SW_UPGRADE  # noqa: F401
-from nfv_client.sw_update._sw_update import APPLY_TYPE_SERIAL  # noqa: F401
-from nfv_client.sw_update._sw_update import APPLY_TYPE_PARALLEL  # noqa: F401
-from nfv_client.sw_update._sw_update import APPLY_TYPE_IGNORE  # noqa: F401
-from nfv_client.sw_update._sw_update import INSTANCE_ACTION_MIGRATE  # noqa: F401
-from nfv_client.sw_update._sw_update import INSTANCE_ACTION_STOP_START  # noqa: F401
-from nfv_client.sw_update._sw_update import ALARM_RESTRICTIONS_STRICT  # noqa: F401
 from nfv_client.sw_update._sw_update import ALARM_RESTRICTIONS_RELAXED  # noqa: F401
+from nfv_client.sw_update._sw_update import ALARM_RESTRICTIONS_STRICT  # noqa: F401
+from nfv_client.sw_update._sw_update import apply_strategy  # noqa: F401
+from nfv_client.sw_update._sw_update import APPLY_TYPE_IGNORE  # noqa: F401
+from nfv_client.sw_update._sw_update import APPLY_TYPE_PARALLEL  # noqa: F401
+from nfv_client.sw_update._sw_update import APPLY_TYPE_SERIAL  # noqa: F401
 from nfv_client.sw_update._sw_update import create_strategy  # noqa: F401
 from nfv_client.sw_update._sw_update import delete_strategy  # noqa: F401
-from nfv_client.sw_update._sw_update import apply_strategy  # noqa: F401
+from nfv_client.sw_update._sw_update import INSTANCE_ACTION_MIGRATE  # noqa: F401
-from nfv_client.sw_update._sw_update import abort_strategy  # noqa: F401
+from nfv_client.sw_update._sw_update import INSTANCE_ACTION_STOP_START  # noqa: F401
 from nfv_client.sw_update._sw_update import show_strategy  # noqa: F401
+from nfv_client.sw_update._sw_update import STRATEGY_NAME_SW_PATCH  # noqa: F401
+from nfv_client.sw_update._sw_update import STRATEGY_NAME_SW_UPGRADE  # noqa: F401

nfv/nfv-common/nfv_common/alarm/__init__.py

@@ -4,14 +4,14 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 from nfv_common.alarm.objects.v1 import ALARM_CONTEXT  # noqa: F401
-from nfv_common.alarm.objects.v1 import ALARM_TYPE  # noqa: F401
 from nfv_common.alarm.objects.v1 import ALARM_EVENT_TYPE  # noqa: F401
 from nfv_common.alarm.objects.v1 import ALARM_PROBABLE_CAUSE  # noqa: F401
 from nfv_common.alarm.objects.v1 import ALARM_SEVERITY  # noqa: F401
 from nfv_common.alarm.objects.v1 import ALARM_TREND_INDICATION  # noqa: F401
+from nfv_common.alarm.objects.v1 import ALARM_TYPE  # noqa: F401
+from nfv_common.alarm.objects.v1 import AlarmData  # noqa: F401
 from nfv_common.alarm.objects.v1 import AlarmStateData  # noqa: F401
 from nfv_common.alarm.objects.v1 import AlarmThresholdData  # noqa: F401
-from nfv_common.alarm.objects.v1 import AlarmData  # noqa: F401
 
 from nfv_common.alarm._alarm_module import alarm_clear  # noqa: F401
 from nfv_common.alarm._alarm_module import alarm_finalize  # noqa: F401

nfv/nfv-common/nfv_common/alarm/_alarm_thread.py

@@ -9,6 +9,7 @@ import six
 from nfv_common import debug
 from nfv_common import thread
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 from nfv_common.helpers import Singleton
 

nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py

@@ -3,12 +3,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_CONTEXT  # noqa: F401
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_EVENT_TYPE  # noqa: F401
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_TYPE  # noqa: F401
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_PROBABLE_CAUSE  # noqa: F401
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_SEVERITY  # noqa: F401
-from nfv_common.alarm.objects.v1._alarm_defs import ALARM_TREND_INDICATION  # noqa: F401
 from nfv_common.alarm.objects.v1._alarm_data import AlarmData  # noqa: F401
 from nfv_common.alarm.objects.v1._alarm_data import AlarmStateData  # noqa: F401
 from nfv_common.alarm.objects.v1._alarm_data import AlarmThresholdData  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_CONTEXT  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_EVENT_TYPE  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_PROBABLE_CAUSE  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_SEVERITY  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_TREND_INDICATION  # noqa: F401
+from nfv_common.alarm.objects.v1._alarm_defs import ALARM_TYPE  # noqa: F401

nfv/nfv-common/nfv_common/catalog/model/_defs.py

@@ -4,6 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import six
+
 from nfv_common.helpers import Constant
 from nfv_common.helpers import Singleton
 

nfv/nfv-common/nfv_common/debug/__init__.py

@@ -3,12 +3,12 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 from nfv_common.debug._debug_defs import DEBUG_LEVEL  # noqa: F401
-from nfv_common.debug._debug_log import debug_trace  # noqa: F401
-from nfv_common.debug._debug_log import debug_get_logger  # noqa: F401
 from nfv_common.debug._debug_log import debug_dump_loggers  # noqa: F401
-from nfv_common.debug._debug_module import debug_register_config_change_callback  # noqa: F401
+from nfv_common.debug._debug_log import debug_get_logger  # noqa: F401
+from nfv_common.debug._debug_log import debug_trace  # noqa: F401
 from nfv_common.debug._debug_module import debug_deregister_config_change_callback  # noqa: F401
-from nfv_common.debug._debug_module import debug_get_config  # noqa: F401
-from nfv_common.debug._debug_module import debug_reload_config  # noqa: F401
-from nfv_common.debug._debug_module import debug_initialize  # noqa: F401
 from nfv_common.debug._debug_module import debug_finalize  # noqa: F401
+from nfv_common.debug._debug_module import debug_get_config  # noqa: F401
+from nfv_common.debug._debug_module import debug_initialize  # noqa: F401
+from nfv_common.debug._debug_module import debug_register_config_change_callback  # noqa: F401
+from nfv_common.debug._debug_module import debug_reload_config  # noqa: F401

nfv/nfv-common/nfv_common/debug/_debug_log.py

@@ -12,8 +12,8 @@ import six
 import sys
 
 from nfv_common.debug._debug_defs import DEBUG_LEVEL
-from nfv_common.debug._debug_thread import DebugLoggingThread
 from nfv_common.debug._debug_module import Debug
+from nfv_common.debug._debug_thread import DebugLoggingThread
 
 _debug_loggers = {}
 

nfv/nfv-common/nfv_common/debug/_debug_module.py

@@ -8,8 +8,8 @@ import sys
 
 from nfv_common.helpers import Singleton
 
-from nfv_common.debug._debug_defs import DEBUG_LEVEL
 from nfv_common.debug._debug_config import DebugConfig
+from nfv_common.debug._debug_defs import DEBUG_LEVEL
 from nfv_common.debug._debug_thread import DebugLoggingThread
 
 

nfv/nfv-common/nfv_common/event_log/__init__.py

@@ -3,15 +3,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.event_log.objects.v1 import EVENT_ID  # noqa: F401
+from nfv_common.event_log._event_log_module import event_log  # noqa: F401
+from nfv_common.event_log._event_log_module import event_log_finalize  # noqa: F401
+from nfv_common.event_log._event_log_module import event_log_initialize  # noqa: F401
+from nfv_common.event_log._event_log_module import event_log_subsystem_sane  # noqa: F401
 from nfv_common.event_log.objects.v1 import EVENT_CONTEXT  # noqa: F401
-from nfv_common.event_log.objects.v1 import EVENT_TYPE  # noqa: F401
+from nfv_common.event_log.objects.v1 import EVENT_ID  # noqa: F401
 from nfv_common.event_log.objects.v1 import EVENT_IMPORTANCE  # noqa: F401
 from nfv_common.event_log.objects.v1 import EVENT_INITIATED_BY  # noqa: F401
+from nfv_common.event_log.objects.v1 import EVENT_TYPE  # noqa: F401
+from nfv_common.event_log.objects.v1 import EventLogData  # noqa: F401
 from nfv_common.event_log.objects.v1 import EventLogStateData  # noqa: F401
 from nfv_common.event_log.objects.v1 import EventLogThresholdData  # noqa: F401
-from nfv_common.event_log.objects.v1 import EventLogData  # noqa: F401
-from nfv_common.event_log._event_log_module import event_log  # noqa: F401
-from nfv_common.event_log._event_log_module import event_log_subsystem_sane  # noqa: F401
-from nfv_common.event_log._event_log_module import event_log_initialize  # noqa: F401
-from nfv_common.event_log._event_log_module import event_log_finalize  # noqa: F401

nfv/nfv-common/nfv_common/event_log/_event_log_thread.py

@@ -7,6 +7,7 @@ import six
 
 from nfv_common import debug
 from nfv_common import thread
+
 from nfv_common.helpers import Singleton
 
 from nfv_common.event_log._event_log_handlers import EventLogHandlers

nfv/nfv-common/nfv_common/event_log/objects/v1/__init__.py

@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.event_log.objects.v1._event_log_defs import EVENT_ID  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_data import EventLogData  # noqa: F401
-from nfv_common.event_log.objects.v1._event_log_defs import EVENT_CONTEXT  # noqa: F401
-from nfv_common.event_log.objects.v1._event_log_defs import EVENT_TYPE  # noqa: F401
-from nfv_common.event_log.objects.v1._event_log_defs import EVENT_IMPORTANCE  # noqa: F401
-from nfv_common.event_log.objects.v1._event_log_defs import EVENT_INITIATED_BY  # noqa: F401
 from nfv_common.event_log.objects.v1._event_log_data import EventLogStateData  # noqa: F401
 from nfv_common.event_log.objects.v1._event_log_data import EventLogThresholdData  # noqa: F401
-from nfv_common.event_log.objects.v1._event_log_data import EventLogData  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_defs import EVENT_CONTEXT  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_defs import EVENT_ID  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_defs import EVENT_IMPORTANCE  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_defs import EVENT_INITIATED_BY  # noqa: F401
+from nfv_common.event_log.objects.v1._event_log_defs import EVENT_TYPE  # noqa: F401

nfv/nfv-common/nfv_common/forensic/__init__.py

@@ -3,22 +3,22 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.forensic._evidence import evidence_from_files  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_start_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_stop_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_pause_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_unpause_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_suspend_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_resume_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_reboot_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_rebuild_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_live_migrate_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_cold_migrate_success  # noqa: F401
 from nfv_common.forensic._analysis import analysis_instance_cold_migrate_confirm_success  # noqa: F401
 from nfv_common.forensic._analysis import analysis_instance_cold_migrate_revert_success  # noqa: F401
-from nfv_common.forensic._analysis import analysis_instance_resize_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_cold_migrate_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_live_migrate_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_pause_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_reboot_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_rebuild_success  # noqa: F401
 from nfv_common.forensic._analysis import analysis_instance_resize_confirm_success  # noqa: F401
 from nfv_common.forensic._analysis import analysis_instance_resize_revert_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_resize_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_resume_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_start_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_stop_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_suspend_success  # noqa: F401
+from nfv_common.forensic._analysis import analysis_instance_unpause_success  # noqa: F401
 from nfv_common.forensic._analysis import analysis_stdout  # noqa: F401
-from nfv_common.forensic._forensic_module import forensic_initialize  # noqa: F401
+from nfv_common.forensic._evidence import evidence_from_files  # noqa: F401
 from nfv_common.forensic._forensic_module import forensic_finalize  # noqa: F401
+from nfv_common.forensic._forensic_module import forensic_initialize  # noqa: F401

nfv/nfv-common/nfv_common/helpers.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import socket
-import select
 import errno
 import functools
+import select
+import socket
 
 
 def syscall_retry_on_interrupt(func, *args):

nfv/nfv-common/nfv_common/histogram.py

@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import math
 import array
 import datetime
+import math
 
 from nfv_common import debug
 

nfv/nfv-common/nfv_common/profiler.py

@@ -8,8 +8,8 @@ from nfv_common import debug
 DLOG = debug.debug_get_logger('nfv_common.profiler')
 
 try:
-    import objgraph
     import guppy
+    import objgraph
     memory_profiling = guppy.hpy()
 
 except ImportError:

nfv/nfv-common/nfv_common/schedule/__init__.py

@@ -3,6 +3,6 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+from nfv_common.schedule._schedule_module import schedule_finalize  # noqa: F401
 from nfv_common.schedule._schedule_module import schedule_function_call  # noqa: F401
 from nfv_common.schedule._schedule_module import schedule_initialize  # noqa: F401
-from nfv_common.schedule._schedule_module import schedule_finalize  # noqa: F401

nfv/nfv-common/nfv_common/schedule/_schedule_module.py

@@ -6,6 +6,7 @@
 import socket
 
 from nfv_common import selobj
+
 from nfv_common.helpers import coroutine
 
 _send_socket = None

nfv/nfv-common/nfv_common/selectable.py

@@ -3,8 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import socket
 import multiprocessing
+import socket
+
 from six.moves import queue as threading_queue
 
 

nfv/nfv-common/nfv_common/selobj/__init__.py

@@ -3,12 +3,12 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.selobj._selobj_module import selobj_add_read_obj  # noqa: F401
-from nfv_common.selobj._selobj_module import selobj_del_read_obj  # noqa: F401
-from nfv_common.selobj._selobj_module import selobj_add_write_obj  # noqa: F401
-from nfv_common.selobj._selobj_module import selobj_del_write_obj  # noqa: F401
 from nfv_common.selobj._selobj_module import selobj_add_error_callback  # noqa: F401
+from nfv_common.selobj._selobj_module import selobj_add_read_obj  # noqa: F401
+from nfv_common.selobj._selobj_module import selobj_add_write_obj  # noqa: F401
 from nfv_common.selobj._selobj_module import selobj_del_error_callback  # noqa: F401
+from nfv_common.selobj._selobj_module import selobj_del_read_obj  # noqa: F401
+from nfv_common.selobj._selobj_module import selobj_del_write_obj  # noqa: F401
 from nfv_common.selobj._selobj_module import selobj_dispatch  # noqa: F401
-from nfv_common.selobj._selobj_module import selobj_initialize  # noqa: F401
 from nfv_common.selobj._selobj_module import selobj_finalize  # noqa: F401
+from nfv_common.selobj._selobj_module import selobj_initialize  # noqa: F401

nfv/nfv-common/nfv_common/state_machine/__init__.py

@@ -4,10 +4,10 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 from nfv_common.state_machine._state import State  # noqa: F401
-from nfv_common.state_machine._state_task import StateTask  # noqa: F401
-from nfv_common.state_machine._state_task_work import StateTaskWork  # noqa: F401
-from nfv_common.state_machine._state_task_result import STATE_TASK_RESULT  # noqa: F401
-from nfv_common.state_machine._state_task_result import state_task_result_update  # noqa: F401
-from nfv_common.state_machine._state_task_work_result import STATE_TASK_WORK_RESULT  # noqa: F401
 from nfv_common.state_machine._state_exception import StateException  # noqa: F401
 from nfv_common.state_machine._state_machine import StateMachine  # noqa: F401
+from nfv_common.state_machine._state_task import StateTask  # noqa: F401
+from nfv_common.state_machine._state_task_result import STATE_TASK_RESULT  # noqa: F401
+from nfv_common.state_machine._state_task_result import state_task_result_update  # noqa: F401
+from nfv_common.state_machine._state_task_work import StateTaskWork  # noqa: F401
+from nfv_common.state_machine._state_task_work_result import STATE_TASK_WORK_RESULT  # noqa: F401

nfv/nfv-common/nfv_common/state_machine/_state_task.py

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 from nfv_common import debug
-from nfv_common import timers
 from nfv_common.helpers import coroutine
+from nfv_common import timers
 
 from nfv_common.state_machine._state_task_result import STATE_TASK_RESULT
 from nfv_common.state_machine._state_task_result import state_task_result_update

nfv/nfv-common/nfv_common/strategy/__init__.py

@@ -3,15 +3,15 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.strategy._strategy_defs import STRATEGY_APPLY_TYPE  # noqa: F401
+from nfv_common.strategy._strategy import Strategy  # noqa: F401
-from nfv_common.strategy._strategy_defs import STRATEGY_STATE  # noqa: F401
-from nfv_common.strategy._strategy_defs import STRATEGY_PHASE  # noqa: F401
 from nfv_common.strategy._strategy_defs import STRATEGY_ALARM_RESTRICTION_TYPES  # noqa: F401
-from nfv_common.strategy._strategy_result import STRATEGY_RESULT  # noqa: F401
+from nfv_common.strategy._strategy_defs import STRATEGY_APPLY_TYPE  # noqa: F401
+from nfv_common.strategy._strategy_defs import STRATEGY_PHASE  # noqa: F401
+from nfv_common.strategy._strategy_defs import STRATEGY_STATE  # noqa: F401
+from nfv_common.strategy._strategy_phase import StrategyPhase  # noqa: F401
 from nfv_common.strategy._strategy_result import STRATEGY_PHASE_RESULT  # noqa: F401
+from nfv_common.strategy._strategy_result import STRATEGY_RESULT  # noqa: F401
 from nfv_common.strategy._strategy_result import STRATEGY_STAGE_RESULT  # noqa: F401
 from nfv_common.strategy._strategy_result import STRATEGY_STEP_RESULT  # noqa: F401
-from nfv_common.strategy._strategy_step import StrategyStep  # noqa: F401
 from nfv_common.strategy._strategy_stage import StrategyStage  # noqa: F401
-from nfv_common.strategy._strategy_phase import StrategyPhase  # noqa: F401
+from nfv_common.strategy._strategy_step import StrategyStep  # noqa: F401
-from nfv_common.strategy._strategy import Strategy  # noqa: F401

nfv/nfv-common/nfv_common/strategy/_strategy.py

@@ -9,9 +9,9 @@ from nfv_common import debug
 
 from nfv_common.strategy._strategy_defs import STRATEGY_PHASE
 from nfv_common.strategy._strategy_defs import STRATEGY_STATE
+from nfv_common.strategy._strategy_phase import StrategyPhase
 from nfv_common.strategy._strategy_result import STRATEGY_RESULT
 from nfv_common.strategy._strategy_result import strategy_result_update
-from nfv_common.strategy._strategy_phase import StrategyPhase
 
 DLOG = debug.debug_get_logger('nfv_common.strategy')
 

nfv/nfv-common/nfv_common/strategy/_strategy_phase.py

@@ -9,13 +9,14 @@ from datetime import datetime
 
 from nfv_common import debug
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 
 from nfv_common.strategy._strategy_defs import STRATEGY_PHASE
 from nfv_common.strategy._strategy_result import STRATEGY_PHASE_RESULT
+from nfv_common.strategy._strategy_result import strategy_phase_result_update
 from nfv_common.strategy._strategy_result import STRATEGY_STAGE_RESULT
 from nfv_common.strategy._strategy_result import STRATEGY_STEP_RESULT
-from nfv_common.strategy._strategy_result import strategy_phase_result_update
 
 DLOG = debug.debug_get_logger('nfv_common.strategy.phase')
 

nfv/nfv-common/nfv_common/strategy/_strategy_stage.py

@@ -3,17 +3,17 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import weakref
-
 from datetime import datetime
+import weakref
 
 from nfv_common import debug
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 
 from nfv_common.strategy._strategy_result import STRATEGY_STAGE_RESULT
-from nfv_common.strategy._strategy_result import STRATEGY_STEP_RESULT
 from nfv_common.strategy._strategy_result import strategy_stage_result_update
+from nfv_common.strategy._strategy_result import STRATEGY_STEP_RESULT
 
 DLOG = debug.debug_get_logger('nfv_common.strategy.stage')
 
@@ -199,8 +199,8 @@ class StrategyStage(object):
         """
         Stage Save
         """
-        import os
         import inspect
+        import os
 
         if self.phase is not None:
             self.phase.stage_save()

nfv/nfv-common/nfv_common/tasks/__init__.py

@@ -3,8 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.tasks._task import TASK_PRIORITY  # noqa: F401
 from nfv_common.tasks._task import Task  # noqa: F401
+from nfv_common.tasks._task import TASK_PRIORITY  # noqa: F401
 from nfv_common.tasks._task_future import TaskFuture  # noqa: F401
 from nfv_common.tasks._task_scheduler import TaskScheduler  # noqa: F401
 from nfv_common.tasks._task_worker_pool import TaskWorkerPool  # noqa: F401

nfv/nfv-common/nfv_common/tasks/_task_scheduler.py

@@ -11,8 +11,8 @@ from nfv_common import histogram
 from nfv_common import selectable
 from nfv_common import selobj
 from nfv_common import timers
-from nfv_common.helpers import coroutine
 
+from nfv_common.helpers import coroutine
 from nfv_common.tasks._task import Task
 from nfv_common.tasks._task import TASK_PRIORITY
 from nfv_common.tasks._task_future import TaskFuture

nfv/nfv-common/nfv_common/tasks/_task_work.py

@@ -6,6 +6,7 @@
 from nfv_common import debug
 from nfv_common import exceptions
 from nfv_common import timers
+
 from nfv_common.helpers import Result
 
 DLOG = debug.debug_get_logger('nfv_common.tasks.task_work')

nfv/nfv-common/nfv_common/tasks/unit_test.py

@@ -9,10 +9,10 @@ from nfv_common import config
 from nfv_common import debug
 from nfv_common import selobj
 from nfv_common import timers
-from nfv_common.helpers import coroutine
 
-from nfv_common.tasks._task_worker_pool import TaskWorkerPool
+from nfv_common.helpers import coroutine
 from nfv_common.tasks._task_scheduler import TaskScheduler
+from nfv_common.tasks._task_worker_pool import TaskWorkerPool
 
 DLOG = debug.debug_get_logger('unit_test', debug_level=debug.DEBUG_LEVEL.INFO)
 

nfv/nfv-common/nfv_common/tcp/_tcp_connection.py

@@ -3,14 +3,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import hmac
-import hashlib
 import base64
-
-import struct
-import socket
-import select
 import errno
+import hashlib
+import hmac
+import select
+import socket
+import struct
 
 from nfv_common import debug
 from nfv_common import timers

nfv/nfv-common/nfv_common/tcp/_tcp_server.py

@@ -5,6 +5,7 @@
 #
 from nfv_common import debug
 from nfv_common import selobj
+
 from nfv_common.helpers import coroutine
 
 from nfv_common.tcp._tcp_connection import TCPConnection

nfv/nfv-common/nfv_common/tcp/unit_test.py

@@ -10,8 +10,8 @@ from nfv_common import debug
 from nfv_common import selobj
 from nfv_common import timers
 
-from nfv_common.tcp._tcp_server import TCPServer
 from nfv_common.tcp._tcp_connection import TCPConnection
+from nfv_common.tcp._tcp_server import TCPServer
 
 
 def message_handler(client_connection, msg):

nfv/nfv-common/nfv_common/thread/_thread.py

@@ -4,14 +4,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import ctypes
+from multiprocessing import Process
 import signal
 import sys
-from multiprocessing import Process
 
 from nfv_common import debug
 from nfv_common import selectable
 from nfv_common import selobj
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 
 from nfv_common.thread._thread_progress_marker import ThreadProgressMarker

nfv/nfv-common/nfv_common/timers/__init__.py

@@ -3,13 +3,13 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common.timers._timestamp import get_monotonic_timestamp_in_ms  # noqa: F401
 from nfv_common.timers._timer_module import interval_timer  # noqa: F401
 from nfv_common.timers._timer_module import timers_create_timer  # noqa: F401
 from nfv_common.timers._timer_module import timers_delete_timer  # noqa: F401
-from nfv_common.timers._timer_module import timers_reschedule_timer  # noqa: F401
-from nfv_common.timers._timer_module import timers_scheduling_on_time  # noqa: F401
-from nfv_common.timers._timer_module import timers_schedule  # noqa: F401
-from nfv_common.timers._timer_module import timers_register_interval_timers  # noqa: F401
-from nfv_common.timers._timer_module import timers_initialize  # noqa: F401
 from nfv_common.timers._timer_module import timers_finalize  # noqa: F401
+from nfv_common.timers._timer_module import timers_initialize  # noqa: F401
+from nfv_common.timers._timer_module import timers_register_interval_timers  # noqa: F401
+from nfv_common.timers._timer_module import timers_reschedule_timer  # noqa: F401
+from nfv_common.timers._timer_module import timers_schedule  # noqa: F401
+from nfv_common.timers._timer_module import timers_scheduling_on_time  # noqa: F401
+from nfv_common.timers._timestamp import get_monotonic_timestamp_in_ms  # noqa: F401

nfv/nfv-debug-tools/histogram_analysis/Histogram.py

@@ -38,10 +38,10 @@
 #
 ################################################################################
 
-import os
-import glob
-from subprocess import call
 from collections import defaultdict
+import glob
+import os
+from subprocess import call
 
 dir = os.path.dirname(__file__)
 csvDir = os.path.join(dir, 'csv/')

nfv/nfv-debug-tools/histogram_analysis/plotter.py

@@ -39,16 +39,16 @@
 #
 ################################################################################
 
-import os
+from builtins import input
 import csv
-import sys
+from glob import iglob
-import time
+import os
 import plotly
 import plotly.graph_objs as go
 from plotly import tools
-from glob import iglob
 import subprocess
-from builtins import input
+import sys
+import time
 
 dir = os.path.dirname(__file__)
 fig = plotly.graph_objs.graph_objs.Figure

nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py

@@ -8,8 +8,8 @@ from fm_api import fm_api
 
 from nfv_common import debug
 
-import nfv_common.alarm.objects.v1 as alarm_objects_v1
 import nfv_common.alarm.handlers.v1 as alarm_handlers_v1
+import nfv_common.alarm.objects.v1 as alarm_objects_v1
 
 from nfv_plugins.alarm_handlers import config
 

nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py

@@ -10,8 +10,8 @@ from fm_api import fm_api
 
 from nfv_common import debug
 
-import nfv_common.event_log.objects.v1 as event_log_objects_v1
 import nfv_common.event_log.handlers.v1 as event_log_handlers_v1
+import nfv_common.event_log.objects.v1 as event_log_objects_v1
 
 from nfv_plugins.event_log_handlers import config
 

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py

@@ -4,9 +4,9 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 
-from six.moves import http_client as httplib
 import kubernetes
 from kubernetes.client.rest import ApiException
+from six.moves import http_client as httplib
 
 from nfv_common import debug
 from nfv_common.helpers import Result

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py

@@ -10,9 +10,11 @@ from nfv_common import debug
 from nfv_vim import nfvi
 
 from nfv_plugins.nfvi_plugins import config
+
+from nfv_plugins.nfvi_plugins.openstack import cinder
 from nfv_plugins.nfvi_plugins.openstack import exceptions
 from nfv_plugins.nfvi_plugins.openstack import openstack
-from nfv_plugins.nfvi_plugins.openstack import cinder
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.block_storage_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py

@@ -4,14 +4,15 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import collections
-from six.moves import http_client as httplib
 import json
 import six
+from six.moves import http_client as httplib
 import socket
 import uuid
 
 from nfv_common import debug
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 from nfv_common.helpers import Object
 
@@ -19,11 +20,12 @@ from nfv_vim import nfvi
 from nfv_vim.nfvi.objects import v1 as nfvi_objs
 
 from nfv_plugins.nfvi_plugins import config
-from nfv_plugins.nfvi_plugins.openstack import rpc_listener
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import nova
+from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import rest_api
+from nfv_plugins.nfvi_plugins.openstack import rpc_listener
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.compute_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py

@@ -11,10 +11,11 @@ from nfv_common import debug
 from nfv_vim import nfvi
 
 from nfv_plugins.nfvi_plugins import config
-from nfv_plugins.nfvi_plugins.openstack import rest_api
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import guest
+from nfv_plugins.nfvi_plugins.openstack import openstack
+from nfv_plugins.nfvi_plugins.openstack import rest_api
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.guest_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py

@@ -3,17 +3,18 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import uuid
 from six.moves import http_client as httplib
+import uuid
 
 from nfv_common import debug
 
 from nfv_vim import nfvi
 
 from nfv_plugins.nfvi_plugins import config
+
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import keystone
+from nfv_plugins.nfvi_plugins.openstack import openstack
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.identity_api')
 

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py

@@ -12,8 +12,9 @@ from nfv_vim.nfvi.objects import v1 as nfvi_objs
 
 from nfv_plugins.nfvi_plugins import config
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import glance
+from nfv_plugins.nfvi_plugins.openstack import openstack
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.image_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py

@@ -4,8 +4,8 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 import json
-from six.moves import http_client as httplib
 import os
+from six.moves import http_client as httplib
 
 from nfv_common import debug
 from nfv_common import tcp
@@ -13,13 +13,16 @@ from nfv_common import tcp
 from nfv_vim import nfvi
 
 from nfv_plugins.nfvi_plugins import config
+
 from nfv_plugins.nfvi_plugins.clients import kubernetes_client
-from nfv_plugins.nfvi_plugins.openstack import rest_api
+
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
-from nfv_plugins.nfvi_plugins.openstack import sysinv
 from nfv_plugins.nfvi_plugins.openstack import fm
 from nfv_plugins.nfvi_plugins.openstack import mtc
+from nfv_plugins.nfvi_plugins.openstack import openstack
+from nfv_plugins.nfvi_plugins.openstack import rest_api
+from nfv_plugins.nfvi_plugins.openstack import sysinv
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.infrastructure_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py

@@ -11,8 +11,9 @@ from nfv_vim import nfvi
 
 from nfv_plugins.nfvi_plugins import config
 from nfv_plugins.nfvi_plugins.openstack import exceptions
-from nfv_plugins.nfvi_plugins.openstack import openstack
 from nfv_plugins.nfvi_plugins.openstack import neutron
+from nfv_plugins.nfvi_plugins.openstack import openstack
+
 from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.network_api')

nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rpc_listener.py

@@ -5,6 +5,7 @@
 #
 import threading
 import time
+
 from kombu.connection import Connection
 from kombu import Consumer
 from kombu import exceptions
@@ -14,6 +15,7 @@ from kombu import Queue
 from nfv_common import debug
 from nfv_common import selectable
 from nfv_common import selobj
+
 from nfv_common.helpers import coroutine
 
 DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.rpc')

nfv/nfv-tests/nfv_scenario_tests/main.py

@@ -75,11 +75,11 @@ def process_do_setup(loads_dir, setup_data):
     """
     Test - Process Do Setup
     """
-    from nfv_plugins.nfvi_plugins.openstack import openstack
-    from nfv_plugins.nfvi_plugins.openstack import nova
     from nfv_plugins.nfvi_plugins.openstack import cinder
     from nfv_plugins.nfvi_plugins.openstack import glance
     from nfv_plugins.nfvi_plugins.openstack import neutron
+    from nfv_plugins.nfvi_plugins.openstack import nova
+    from nfv_plugins.nfvi_plugins.openstack import openstack
 
     directory = openstack.get_directory(config,
                                         openstack.SERVICE_CATEGORY.OPENSTACK)
@@ -487,11 +487,11 @@ def process_do_teardown(setup_data):
     """
     Test - Process Do Teardown
     """
-    from nfv_plugins.nfvi_plugins.openstack import openstack
-    from nfv_plugins.nfvi_plugins.openstack import nova
     from nfv_plugins.nfvi_plugins.openstack import cinder
     from nfv_plugins.nfvi_plugins.openstack import glance
     from nfv_plugins.nfvi_plugins.openstack import neutron
+    from nfv_plugins.nfvi_plugins.openstack import nova
+    from nfv_plugins.nfvi_plugins.openstack import openstack
 
     directory = openstack.get_directory(config,
                                         openstack.SERVICE_CATEGORY.OPENSTACK)

nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py

@@ -3,20 +3,20 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from tests._test_instances import TestInstanceStart  # noqa: F401
+from tests._test_hosts import TestHostLock  # noqa: F401
-from tests._test_instances import TestInstanceStop  # noqa: F401
+from tests._test_hosts import TestHostUnlock  # noqa: F401
-from tests._test_instances import TestInstancePause  # noqa: F401
-from tests._test_instances import TestInstanceUnpause  # noqa: F401
-from tests._test_instances import TestInstanceSuspend  # noqa: F401
-from tests._test_instances import TestInstanceResume  # noqa: F401
-from tests._test_instances import TestInstanceReboot  # noqa: F401
-from tests._test_instances import TestInstanceRebuild  # noqa: F401
-from tests._test_instances import TestInstanceLiveMigrate  # noqa: F401
 from tests._test_instances import TestInstanceColdMigrate  # noqa: F401
 from tests._test_instances import TestInstanceColdMigrateConfirm  # noqa: F401
 from tests._test_instances import TestInstanceColdMigrateRevert  # noqa: F401
+from tests._test_instances import TestInstanceLiveMigrate  # noqa: F401
+from tests._test_instances import TestInstancePause  # noqa: F401
+from tests._test_instances import TestInstanceReboot  # noqa: F401
+from tests._test_instances import TestInstanceRebuild  # noqa: F401
 from tests._test_instances import TestInstanceResize  # noqa: F401
 from tests._test_instances import TestInstanceResizeConfirm  # noqa: F401
 from tests._test_instances import TestInstanceResizeRevert  # noqa: F401
-from tests._test_hosts import TestHostLock  # noqa: F401
+from tests._test_instances import TestInstanceResume  # noqa: F401
-from tests._test_hosts import TestHostUnlock  # noqa: F401
+from tests._test_instances import TestInstanceStart  # noqa: F401
+from tests._test_instances import TestInstanceStop  # noqa: F401
+from tests._test_instances import TestInstanceSuspend  # noqa: F401
+from tests._test_instances import TestInstanceUnpause  # noqa: F401

nfv/nfv-tests/nfv_scenario_tests/tests/_hosts.py

@@ -8,8 +8,8 @@ from nfv_vim.nfvi.objects.v1 import HOST_ADMIN_STATE
 from nfv_vim.nfvi.objects.v1 import HOST_OPER_STATE
 
 from nfv_plugins.nfvi_plugins import config
-from nfv_plugins.nfvi_plugins.openstack import sysinv
 from nfv_plugins.nfvi_plugins.openstack import openstack
+from nfv_plugins.nfvi_plugins.openstack import sysinv
 
 DLOG = debug.debug_get_logger('nfv_tests.instances')
 

nfv/nfv-tests/nfv_scenario_tests/tests/_instances.py

@@ -3,8 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common import forensic
 from nfv_common import debug
+from nfv_common import forensic
 
 from nfv_plugins.nfvi_plugins import config
 from nfv_plugins.nfvi_plugins.openstack import nova

nfv/nfv-tests/nfv_scenario_tests/tests/_test_base.py

@@ -3,8 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import time
 import datetime
+import time
 import traceback
 
 from nfv_common import debug

nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py

@@ -11,10 +11,10 @@ import time
 from nfv_common import debug
 
 from nfv_plugins.nfvi_plugins import config
-from nfv_plugins.nfvi_plugins.openstack import nova
-from nfv_plugins.nfvi_plugins.openstack import sysinv
 from nfv_plugins.nfvi_plugins.openstack import fm
+from nfv_plugins.nfvi_plugins.openstack import nova
 from nfv_plugins.nfvi_plugins.openstack import openstack
+from nfv_plugins.nfvi_plugins.openstack import sysinv
 
 from tests import _hosts
 from tests import _instances

nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py

@@ -14,8 +14,8 @@ from nfv_vim import nfvi
 from nfv_vim import objects
 
 from nfv_vim.objects import HOST_PERSONALITY
-from nfv_vim.objects import SW_UPDATE_APPLY_TYPE
 from nfv_vim.objects import SW_UPDATE_ALARM_RESTRICTION
+from nfv_vim.objects import SW_UPDATE_APPLY_TYPE
 from nfv_vim.objects import SW_UPDATE_INSTANCE_ACTION
 from nfv_vim.objects import SwPatch
 from nfv_vim.strategy._strategy import strategy_rebuild_from_dict

nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py

@@ -14,19 +14,19 @@ from nfv_vim import host_fsm
 from nfv_vim import nfvi
 from nfv_vim import objects
 
-from nfv_vim.objects import SW_UPDATE_APPLY_TYPE
-from nfv_vim.objects import SW_UPDATE_ALARM_RESTRICTION
-from nfv_vim.objects import HOST_PERSONALITY
 from nfv_vim.objects import HOST_NAME
+from nfv_vim.objects import HOST_PERSONALITY
+from nfv_vim.objects import SW_UPDATE_ALARM_RESTRICTION
+from nfv_vim.objects import SW_UPDATE_APPLY_TYPE
 from nfv_vim.objects import SwUpgrade
-from nfv_vim.tables._table import Table
-from nfv_vim.tables._host_table import HostTable
-from nfv_vim.tables._host_group_table import HostGroupTable
-from nfv_vim.tables._host_aggregate_table import HostAggregateTable
-from nfv_vim.tables._instance_table import InstanceTable
-from nfv_vim.tables._instance_group_table import InstanceGroupTable
-from nfv_vim.strategy._strategy import SwUpgradeStrategy
 from nfv_vim.strategy._strategy import strategy_rebuild_from_dict
+from nfv_vim.strategy._strategy import SwUpgradeStrategy
+from nfv_vim.tables._host_aggregate_table import HostAggregateTable
+from nfv_vim.tables._host_group_table import HostGroupTable
+from nfv_vim.tables._host_table import HostTable
+from nfv_vim.tables._instance_group_table import InstanceGroupTable
+from nfv_vim.tables._instance_table import InstanceTable
+from nfv_vim.tables._table import Table
 
 from nfv_vim.nfvi.objects.v1 import UPGRADE_STATE
 

nfv/nfv-tools/nfv_tools/forensic.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import sys
-import codecs
 import argparse
+import codecs
 import datetime
+import sys
 
 from nfv_common import config
 from nfv_common import forensic

nfv/nfv-tools/nfv_tools/notify.py

@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import sys
+import argparse
 import json
 import socket
+import sys
 import syslog
-import argparse
 
 from nfv_common import tcp
 

nfv/nfv-vim/nfv_vim/alarm/__init__.py

@@ -5,14 +5,14 @@
 #
 from nfv_common.alarm import *  # noqa: F401,F403
 
-from nfv_vim.alarm._general import raise_general_alarm  # noqa: F401
 from nfv_vim.alarm._general import clear_general_alarm  # noqa: F401
-from nfv_vim.alarm._host import host_raise_alarm  # noqa: F401
+from nfv_vim.alarm._general import raise_general_alarm  # noqa: F401
 from nfv_vim.alarm._host import host_clear_alarm  # noqa: F401
-from nfv_vim.alarm._instance import instance_raise_alarm  # noqa: F401
+from nfv_vim.alarm._host import host_raise_alarm  # noqa: F401
 from nfv_vim.alarm._instance import instance_clear_alarm  # noqa: F401
 from nfv_vim.alarm._instance import instance_manage_alarms  # noqa: F401
-from nfv_vim.alarm._instance_group import raise_instance_group_policy_alarm  # noqa: F401
+from nfv_vim.alarm._instance import instance_raise_alarm  # noqa: F401
 from nfv_vim.alarm._instance_group import clear_instance_group_alarm  # noqa: F401
-from nfv_vim.alarm._sw_update import raise_sw_update_alarm  # noqa: F401
+from nfv_vim.alarm._instance_group import raise_instance_group_policy_alarm  # noqa: F401
 from nfv_vim.alarm._sw_update import clear_sw_update_alarm  # noqa: F401
+from nfv_vim.alarm._sw_update import raise_sw_update_alarm  # noqa: F401

nfv/nfv-vim/nfv_vim/api/_application.py

@@ -5,9 +5,9 @@
 #
 import pecan
 
-from nfv_vim.api import acl
 from nfv_vim.api import _config
 from nfv_vim.api import _hooks
+from nfv_vim.api import acl
 
 
 def get_pecan_config():

nfv/nfv-vim/nfv_vim/api/_hooks.py

@@ -7,6 +7,7 @@ from pecan import hooks
 
 from nfv_common import config
 from nfv_common import tcp
+
 from nfv_common.helpers import Object
 
 

nfv/nfv-vim/nfv_vim/api/controllers/root.py

@@ -9,8 +9,8 @@ from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
-from nfv_vim.api.controllers.v1 import APIController
 from nfv_vim.api._link import Link
+from nfv_vim.api.controllers.v1 import APIController
 
 
 class Root(wsme_types.Base):

nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py

@@ -9,10 +9,10 @@ from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
+from nfv_vim.api._link import Link
 from nfv_vim.api.controllers.v1 import openstack
 from nfv_vim.api.controllers.v1 import orchestration
 from nfv_vim.api.controllers.v1 import virtualised_resources
-from nfv_vim.api._link import Link
 
 
 class APIVersion(wsme_types.Base):

nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py

@@ -9,8 +9,8 @@ from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
-from nfv_vim.api.controllers.v1.openstack._heat_api import HeatAPI
 from nfv_vim.api._link import Link
+from nfv_vim.api.controllers.v1.openstack._heat_api import HeatAPI
 
 
 class OpenStackDescription(wsme_types.Base):

nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_heat_api.py

@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-import pecan
-import inspect
 import functools
+import inspect
+import pecan
 import webob
 
 from nfv_common import debug

nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py

@@ -9,9 +9,9 @@ from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
+from nfv_vim.api._link import Link
 from nfv_vim.api.controllers.v1.orchestration.sw_update import SwPatchAPI
 from nfv_vim.api.controllers.v1.orchestration.sw_update import SwUpgradeAPI
-from nfv_vim.api._link import Link
 
 
 class OrchestrationDescription(wsme_types.Base):

nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py

@@ -10,8 +10,8 @@ from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
 from nfv_common import debug
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_strategy import SwPatchStrategyAPI
 from nfv_vim.api._link import Link
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_strategy import SwPatchStrategyAPI
 
 DLOG = debug.debug_get_logger('nfv_vim.api.sw_patch')
 

nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import json
 import pecan
 from pecan import rest
+from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
@@ -15,16 +15,16 @@ from nfv_common import validate
 
 from nfv_vim import rpc
 
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_APPLY_TYPE
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_NAME
 from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_ACTION
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_INSTANCE_ACTION
 from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_ALARM_RESTRICTION_TYPES
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateApplyTypes
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_APPLY_TYPE
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateNames
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_INSTANCE_ACTION
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SW_UPDATE_NAME
 from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateActions
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateInstanceActionTypes
 from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateAlarmRestrictionTypes
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateApplyTypes
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateInstanceActionTypes
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_defs import SwUpdateNames
 
 
 DLOG = debug.debug_get_logger('nfv_vim.api.sw_update.strategy')

nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py

@@ -10,8 +10,8 @@ from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
 from nfv_common import debug
-from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_strategy import SwUpgradeStrategyAPI
 from nfv_vim.api._link import Link
+from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_update_strategy import SwUpgradeStrategyAPI
 
 DLOG = debug.debug_get_logger('nfv_vim.api.sw_upgrade')
 

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py

@@ -2,9 +2,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import json
 import pecan
+from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py

@@ -9,11 +9,11 @@ from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
+from nfv_vim.api._link import Link
 from nfv_vim.api.controllers.v1.virtualised_resources._computes_api import ComputesAPI
 from nfv_vim.api.controllers.v1.virtualised_resources._image_api import ImageAPI
 from nfv_vim.api.controllers.v1.virtualised_resources._networks_api import NetworksAPI
 from nfv_vim.api.controllers.v1.virtualised_resources._volume_api import VolumeAPI
-from nfv_vim.api._link import Link
 
 
 class VirtualisedResourcesDescription(wsme_types.Base):

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import json
 import pecan
 from pecan import rest
+from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py

@@ -2,23 +2,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import pecan
+from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 
 from nfv_common import debug
 
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkResourceClass
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkResourceType
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkSubnetType
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkSubnetResourceType
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkType
 from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_allocate
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_delete
 from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_get
 from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_get_all
 from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_update
-from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import network_delete
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkResourceType
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkSubnetResourceType
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkSubnetType
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_middleware import NetworkType
+from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkResourceClass
 
 DLOG = debug.debug_get_logger('nfv_vim.api.virtualised_network')
 

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py

@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import pecan
+from six.moves import http_client as httplib
 
 from nfv_common import debug
 from nfv_vim import rpc

nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py

@@ -3,9 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from six.moves import http_client as httplib
 import json
 import pecan
+from six.moves import http_client as httplib
 from wsme import types as wsme_types
 import wsmeext.pecan as wsme_pecan
 

nfv/nfv-vim/nfv_vim/api/openstack/__init__.py

@@ -5,10 +5,10 @@
 #
 from nfv_vim.api.openstack._config import CONF  # noqa: F401
 from nfv_vim.api.openstack._config import config_load  # noqa: F401
+from nfv_vim.api.openstack._openstack import get_directory  # noqa: F401
+from nfv_vim.api.openstack._openstack import get_token  # noqa: F401
 from nfv_vim.api.openstack._openstack import OPENSTACK_SERVICE  # noqa: F401
 from nfv_vim.api.openstack._openstack import PLATFORM_SERVICE  # noqa: F401
 from nfv_vim.api.openstack._openstack import SERVICE_CATEGORY  # noqa: F401
-from nfv_vim.api.openstack._openstack import get_directory  # noqa: F401
-from nfv_vim.api.openstack._openstack import get_token  # noqa: F401
 from nfv_vim.api.openstack._openstack import validate_token  # noqa: F401
 from nfv_vim.api.openstack._rest_api import rest_api_request  # noqa: F401

nfv/nfv-vim/nfv_vim/audits/__init__.py

@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.audits._audits_module import audits_initialize  # noqa: F401
 from nfv_vim.audits._audits_module import audits_finalize  # noqa: F401
+from nfv_vim.audits._audits_module import audits_initialize  # noqa: F401

nfv/nfv-vim/nfv_vim/audits/_audits_module.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.audits._vim_nfvi_audits import vim_nfvi_audits_initialize
-from nfv_vim.audits._vim_nfvi_audits import vim_nfvi_audits_finalize
-from nfv_vim.audits._vim_alarm_audits import vim_alarm_audits_initialize
 from nfv_vim.audits._vim_alarm_audits import vim_alarm_audits_finalize
+from nfv_vim.audits._vim_alarm_audits import vim_alarm_audits_initialize
+from nfv_vim.audits._vim_nfvi_audits import vim_nfvi_audits_finalize
+from nfv_vim.audits._vim_nfvi_audits import vim_nfvi_audits_initialize
 
 
 def audits_initialize():

nfv/nfv-vim/nfv_vim/audits/_vim_alarm_audits.py

@@ -3,8 +3,8 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_common import timers
 from nfv_common import debug
+from nfv_common import timers
 
 from nfv_vim import alarm
 from nfv_vim import tables

nfv/nfv-vim/nfv_vim/audits/_vim_nfvi_audits.py

@@ -5,9 +5,10 @@
 #
 import collections
 
-from nfv_common import timers
-from nfv_common import histogram
 from nfv_common import debug
+from nfv_common import histogram
+from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 
 from nfv_vim import directors

nfv/nfv-vim/nfv_vim/database/__init__.py

@@ -3,56 +3,56 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.database._database_identity_module import database_tenant_add  # noqa: F401
-from nfv_vim.database._database_identity_module import database_tenant_delete  # noqa: F401
-from nfv_vim.database._database_identity_module import database_tenant_get_list  # noqa: F401
-from nfv_vim.database._database_image_module import database_image_add  # noqa: F401
-from nfv_vim.database._database_image_module import database_image_delete  # noqa: F401
-from nfv_vim.database._database_image_module import database_image_get_list  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_add  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_delete  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_get_list  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_snapshot_add  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_snapshot_delete  # noqa: F401
 from nfv_vim.database._database_block_storage_module import database_volume_snapshot_get_list  # noqa: F401
-from nfv_vim.database._database_network_module import database_subnet_add  # noqa: F401
+from nfv_vim.database._database_compute_module import database_host_aggregate_add  # noqa: F401
-from nfv_vim.database._database_network_module import database_subnet_delete  # noqa: F401
+from nfv_vim.database._database_compute_module import database_host_aggregate_delete  # noqa: F401
-from nfv_vim.database._database_network_module import database_subnet_get_list  # noqa: F401
+from nfv_vim.database._database_compute_module import database_host_aggregate_get_list  # noqa: F401
-from nfv_vim.database._database_network_module import database_network_add  # noqa: F401
-from nfv_vim.database._database_network_module import database_network_delete  # noqa: F401
-from nfv_vim.database._database_network_module import database_network_get_list  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_system_add  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_system_delete  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_system_get_list  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_add  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_delete  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_get_list  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_group_add  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_group_delete  # noqa: F401
-from nfv_vim.database._database_infrastructure_module import database_host_group_get_list  # noqa: F401
-from nfv_vim.database._database_compute_module import database_service_host_add  # noqa: F401
-from nfv_vim.database._database_compute_module import database_service_host_delete  # noqa: F401
-from nfv_vim.database._database_compute_module import database_service_host_get_list  # noqa: F401
 from nfv_vim.database._database_compute_module import database_hypervisor_add  # noqa: F401
 from nfv_vim.database._database_compute_module import database_hypervisor_delete  # noqa: F401
 from nfv_vim.database._database_compute_module import database_hypervisor_get_list  # noqa: F401
-from nfv_vim.database._database_compute_module import database_instance_type_add  # noqa: F401
-from nfv_vim.database._database_compute_module import database_instance_type_delete  # noqa: F401
-from nfv_vim.database._database_compute_module import database_instance_type_get_list  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_add  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_delete  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_get_list  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_group_add  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_group_delete  # noqa: F401
 from nfv_vim.database._database_compute_module import database_instance_group_get_list  # noqa: F401
-from nfv_vim.database._database_compute_module import database_host_aggregate_add  # noqa: F401
+from nfv_vim.database._database_compute_module import database_instance_type_add  # noqa: F401
-from nfv_vim.database._database_compute_module import database_host_aggregate_delete  # noqa: F401
+from nfv_vim.database._database_compute_module import database_instance_type_delete  # noqa: F401
-from nfv_vim.database._database_compute_module import database_host_aggregate_get_list  # noqa: F401
+from nfv_vim.database._database_compute_module import database_instance_type_get_list  # noqa: F401
+from nfv_vim.database._database_compute_module import database_service_host_add  # noqa: F401
+from nfv_vim.database._database_compute_module import database_service_host_delete  # noqa: F401
+from nfv_vim.database._database_compute_module import database_service_host_get_list  # noqa: F401
+from nfv_vim.database._database_identity_module import database_tenant_add  # noqa: F401
+from nfv_vim.database._database_identity_module import database_tenant_delete  # noqa: F401
+from nfv_vim.database._database_identity_module import database_tenant_get_list  # noqa: F401
+from nfv_vim.database._database_image_module import database_image_add  # noqa: F401
+from nfv_vim.database._database_image_module import database_image_delete  # noqa: F401
+from nfv_vim.database._database_image_module import database_image_get_list  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_add  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_delete  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_get_list  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_group_add  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_group_delete  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_host_group_get_list  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_system_add  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_system_delete  # noqa: F401
+from nfv_vim.database._database_infrastructure_module import database_system_get_list  # noqa: F401
+from nfv_vim.database._database_module import database_dump_data  # noqa: F401
+from nfv_vim.database._database_module import database_finalize  # noqa: F401
+from nfv_vim.database._database_module import database_initialize  # noqa: F401
+from nfv_vim.database._database_module import database_load_data  # noqa: F401
+from nfv_vim.database._database_module import database_migrate_data  # noqa: F401
+from nfv_vim.database._database_network_module import database_network_add  # noqa: F401
+from nfv_vim.database._database_network_module import database_network_delete  # noqa: F401
+from nfv_vim.database._database_network_module import database_network_get_list  # noqa: F401
+from nfv_vim.database._database_network_module import database_subnet_add  # noqa: F401
+from nfv_vim.database._database_network_module import database_subnet_delete  # noqa: F401
+from nfv_vim.database._database_network_module import database_subnet_get_list  # noqa: F401
 from nfv_vim.database._database_sw_update import database_sw_update_add  # noqa: F401
 from nfv_vim.database._database_sw_update import database_sw_update_delete  # noqa: F401
 from nfv_vim.database._database_sw_update import database_sw_update_get_list  # noqa: F401
-from nfv_vim.database._database_module import database_migrate_data  # noqa: F401
-from nfv_vim.database._database_module import database_dump_data  # noqa: F401
-from nfv_vim.database._database_module import database_load_data  # noqa: F401
-from nfv_vim.database._database_module import database_initialize  # noqa: F401
-from nfv_vim.database._database_module import database_finalize  # noqa: F401

nfv/nfv-vim/nfv_vim/database/_database.py

@@ -7,21 +7,21 @@ import errno
 import json
 import os
 
-from sqlalchemy.engine import Engine
 from sqlalchemy import create_engine
+from sqlalchemy.engine import Engine
 from sqlalchemy import event
 from sqlalchemy import MetaData
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import sessionmaker
 
-from nfv_common import timers
-from nfv_common import histogram
 from nfv_common.helpers import coroutine
+from nfv_common import histogram
+from nfv_common import timers
 
-from nfv_vim.database.model import Base
-from nfv_vim.database.model import lookup_class_by_table
 from nfv_vim.database._database_migrate import migrate_tables
 from nfv_vim.database._database_upgrades import upgrade_table_row_data
+from nfv_vim.database.model import Base
+from nfv_vim.database.model import lookup_class_by_table
 
 _db_version = 1
 _db_name = 'vim_db_v%s' % _db_version

nfv/nfv-vim/nfv_vim/database/_database_block_storage_module.py

@@ -9,6 +9,7 @@ from nfv_vim import nfvi
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_compute_module.py

@@ -9,6 +9,7 @@ from nfv_vim import nfvi
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_identity_module.py

@@ -6,6 +6,7 @@
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_image_module.py

@@ -9,6 +9,7 @@ from nfv_vim import nfvi
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py

@@ -9,6 +9,7 @@ from nfv_vim import nfvi
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_network_module.py

@@ -8,6 +8,7 @@ import json
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/_database_sw_update.py

@@ -8,6 +8,7 @@ import json
 from nfv_vim import objects
 
 from nfv_vim.database import model
+
 from nfv_vim.database._database import database_get
 
 

nfv/nfv-vim/nfv_vim/database/model/__init__.py

@@ -3,23 +3,23 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.database.model._base import lookup_class_by_table  # noqa: F401
 from nfv_vim.database.model._base import Base  # noqa: F401
-from nfv_vim.database.model._tenant import Tenant  # noqa: F401
+from nfv_vim.database.model._base import lookup_class_by_table  # noqa: F401
-from nfv_vim.database.model._image import Image  # noqa: F401
-from nfv_vim.database.model._volume import Volume  # noqa: F401
-from nfv_vim.database.model._volume_snapshot import VolumeSnapshot  # noqa: F401
-from nfv_vim.database.model._system import System  # noqa: F401
 from nfv_vim.database.model._host import Host_v5  # noqa: F401
 from nfv_vim.database.model._host import Host_v6  # noqa: F401
 from nfv_vim.database.model._host_aggregate import HostAggregate  # noqa: F401
 from nfv_vim.database.model._host_group import HostGroup  # noqa: F401
-from nfv_vim.database.model._subnet import Subnet  # noqa: F401
-from nfv_vim.database.model._network import Network  # noqa: F401
-from nfv_vim.database.model._service_host import ServiceHost  # noqa: F401
 from nfv_vim.database.model._hypervisor import Hypervisor  # noqa: F401
-from nfv_vim.database.model._instance_type import InstanceType  # noqa: F401
+from nfv_vim.database.model._image import Image  # noqa: F401
-from nfv_vim.database.model._instance_group import InstanceGroup  # noqa: F401
 from nfv_vim.database.model._instance import Instance_v4  # noqa: F401
 from nfv_vim.database.model._instance import Instance_v5  # noqa: F401
+from nfv_vim.database.model._instance_group import InstanceGroup  # noqa: F401
+from nfv_vim.database.model._instance_type import InstanceType  # noqa: F401
+from nfv_vim.database.model._network import Network  # noqa: F401
+from nfv_vim.database.model._service_host import ServiceHost  # noqa: F401
+from nfv_vim.database.model._subnet import Subnet  # noqa: F401
 from nfv_vim.database.model._sw_update import SoftwareUpdate  # noqa: F401
+from nfv_vim.database.model._system import System  # noqa: F401
+from nfv_vim.database.model._tenant import Tenant  # noqa: F401
+from nfv_vim.database.model._volume import Volume  # noqa: F401
+from nfv_vim.database.model._volume_snapshot import VolumeSnapshot  # noqa: F401

nfv/nfv-vim/nfv_vim/directors/__init__.py

@@ -3,11 +3,11 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
+from nfv_vim.directors._directors_module import directors_finalize  # noqa: F401
+from nfv_vim.directors._directors_module import directors_initialize  # noqa: F401
+from nfv_vim.directors._host_director import get_host_director  # noqa: F401
 from nfv_vim.directors._image_director import get_image_director  # noqa: F401
-from nfv_vim.directors._volume_director import get_volume_director  # noqa: F401
 from nfv_vim.directors._instance_director import get_instance_director  # noqa: F401
 from nfv_vim.directors._network_director import get_network_director  # noqa: F401
 from nfv_vim.directors._sw_mgmt_director import get_sw_mgmt_director  # noqa: F401
-from nfv_vim.directors._host_director import get_host_director  # noqa: F401
+from nfv_vim.directors._volume_director import get_volume_director  # noqa: F401
-from nfv_vim.directors._directors_module import directors_initialize  # noqa: F401
-from nfv_vim.directors._directors_module import directors_finalize  # noqa: F401

nfv/nfv-vim/nfv_vim/directors/_directors_module.py

@@ -3,18 +3,18 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.directors._image_director import image_director_initialize
-from nfv_vim.directors._image_director import image_director_finalize
-from nfv_vim.directors._volume_director import volume_director_initialize
-from nfv_vim.directors._volume_director import volume_director_finalize
-from nfv_vim.directors._instance_director import instance_director_initialize
-from nfv_vim.directors._instance_director import instance_director_finalize
-from nfv_vim.directors._network_director import network_director_initialize
-from nfv_vim.directors._network_director import network_director_finalize
-from nfv_vim.directors._sw_mgmt_director import sw_mgmt_director_initialize
-from nfv_vim.directors._sw_mgmt_director import sw_mgmt_director_finalize
-from nfv_vim.directors._host_director import host_director_initialize
 from nfv_vim.directors._host_director import host_director_finalize
+from nfv_vim.directors._host_director import host_director_initialize
+from nfv_vim.directors._image_director import image_director_finalize
+from nfv_vim.directors._image_director import image_director_initialize
+from nfv_vim.directors._instance_director import instance_director_finalize
+from nfv_vim.directors._instance_director import instance_director_initialize
+from nfv_vim.directors._network_director import network_director_finalize
+from nfv_vim.directors._network_director import network_director_initialize
+from nfv_vim.directors._sw_mgmt_director import sw_mgmt_director_finalize
+from nfv_vim.directors._sw_mgmt_director import sw_mgmt_director_initialize
+from nfv_vim.directors._volume_director import volume_director_finalize
+from nfv_vim.directors._volume_director import volume_director_initialize
 
 
 def directors_initialize():

nfv/nfv-vim/nfv_vim/directors/_image_director.py

@@ -6,9 +6,10 @@
 import six
 
 from nfv_common import debug
-from nfv_common.helpers import coroutine
+
 from nfv_common.helpers import Constant
 from nfv_common.helpers import Constants
+from nfv_common.helpers import coroutine
 from nfv_common.helpers import Singleton
 
 from nfv_vim import nfvi

nfv/nfv-vim/nfv_vim/directors/_instance_director.py

@@ -9,6 +9,7 @@ import six
 from nfv_common import config
 from nfv_common import debug
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 from nfv_common.helpers import Singleton
 

nfv/nfv-vim/nfv_vim/directors/_sw_mgmt_director.py

@@ -9,6 +9,7 @@ import uuid
 from nfv_common import config
 from nfv_common import debug
 from nfv_common import schedule
+
 from nfv_common.helpers import Singleton
 
 from nfv_vim import objects

nfv/nfv-vim/nfv_vim/directors/_volume_director.py

@@ -6,9 +6,10 @@
 import six
 
 from nfv_common import debug
-from nfv_common.helpers import coroutine
+
 from nfv_common.helpers import Constant
 from nfv_common.helpers import Constants
+from nfv_common.helpers import coroutine
 from nfv_common.helpers import Singleton
 
 from nfv_vim import nfvi

nfv/nfv-vim/nfv_vim/dor/__init__.py

@@ -3,7 +3,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.dor._dor_module import system_is_stabilized  # noqa: F401
-from nfv_vim.dor._dor_module import dor_is_complete  # noqa: F401
-from nfv_vim.dor._dor_module import dor_initialize  # noqa: F401
 from nfv_vim.dor._dor_module import dor_finalize  # noqa: F401
+from nfv_vim.dor._dor_module import dor_initialize  # noqa: F401
+from nfv_vim.dor._dor_module import dor_is_complete  # noqa: F401
+from nfv_vim.dor._dor_module import system_is_stabilized  # noqa: F401

nfv/nfv-vim/nfv_vim/dor/_dor_module.py

@@ -8,6 +8,7 @@ import os.path
 from nfv_common import config
 from nfv_common import debug
 from nfv_common import timers
+
 from nfv_common.helpers import coroutine
 from nfv_common.helpers import local_uptime_in_secs
 from nfv_common.helpers import process_uptime_in_secs

nfv/nfv-vim/nfv_vim/events/__init__.py

@@ -3,5 +3,5 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.events._events_module import events_initialize  # noqa: F401
 from nfv_vim.events._events_module import events_finalize  # noqa: F401
+from nfv_vim.events._events_module import events_initialize  # noqa: F401

nfv/nfv-vim/nfv_vim/events/_events_module.py

@@ -3,10 +3,10 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-from nfv_vim.events._vim_api_events import vim_api_events_initialize
 from nfv_vim.events._vim_api_events import vim_api_events_finalize
-from nfv_vim.events._vim_nfvi_events import vim_nfvi_events_initialize
+from nfv_vim.events._vim_api_events import vim_api_events_initialize
 from nfv_vim.events._vim_nfvi_events import vim_nfvi_events_finalize
+from nfv_vim.events._vim_nfvi_events import vim_nfvi_events_initialize
 
 
 def events_initialize():