diff --git a/nfv/nfv-client/nfv_client/openstack/objects.py b/nfv/nfv-client/nfv_client/openstack/objects.py index 8a51d620..c63bd46a 100755 --- a/nfv/nfv-client/nfv_client/openstack/objects.py +++ b/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): diff --git a/nfv/nfv-client/nfv_client/sw_update/__init__.py b/nfv/nfv-client/nfv_client/sw_update/__init__.py index 478439b4..f0f02e88 100755 --- a/nfv/nfv-client/nfv_client/sw_update/__init__.py +++ b/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 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 abort_strategy # 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 abort_strategy # 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 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 diff --git a/nfv/nfv-common/nfv_common/alarm/__init__.py b/nfv/nfv-common/nfv_common/alarm/__init__.py index 7be0601c..33e28dc1 100755 --- a/nfv/nfv-common/nfv_common/alarm/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py b/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py index d89b221b..1572582a 100755 --- a/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py b/nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py index 20f3e2ce..bf19e674 100755 --- a/nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/catalog/model/_defs.py b/nfv/nfv-common/nfv_common/catalog/model/_defs.py index 27da0043..9bc0c9df 100755 --- a/nfv/nfv-common/nfv_common/catalog/model/_defs.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/debug/__init__.py b/nfv/nfv-common/nfv_common/debug/__init__.py index 1f9060e5..05b4636d 100755 --- a/nfv/nfv-common/nfv_common/debug/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/debug/_debug_log.py b/nfv/nfv-common/nfv_common/debug/_debug_log.py index 148060cc..bcb775b9 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_log.py +++ b/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 = {} diff --git a/nfv/nfv-common/nfv_common/debug/_debug_module.py b/nfv/nfv-common/nfv_common/debug/_debug_module.py index 48ce708c..af664aab 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_module.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/event_log/__init__.py b/nfv/nfv-common/nfv_common/event_log/__init__.py index e7efed5b..9fc018f6 100755 --- a/nfv/nfv-common/nfv_common/event_log/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/event_log/_event_log_thread.py b/nfv/nfv-common/nfv_common/event_log/_event_log_thread.py index 4ba19bb9..a65df81f 100755 --- a/nfv/nfv-common/nfv_common/event_log/_event_log_thread.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/event_log/objects/v1/__init__.py b/nfv/nfv-common/nfv_common/event_log/objects/v1/__init__.py index 18214ec4..482106af 100755 --- a/nfv/nfv-common/nfv_common/event_log/objects/v1/__init__.py +++ b/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_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 EventLogData # 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 diff --git a/nfv/nfv-common/nfv_common/forensic/__init__.py b/nfv/nfv-common/nfv_common/forensic/__init__.py index 17f7c031..3f482377 100755 --- a/nfv/nfv-common/nfv_common/forensic/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/helpers.py b/nfv/nfv-common/nfv_common/helpers.py index 376452e6..85d22cd9 100755 --- a/nfv/nfv-common/nfv_common/helpers.py +++ b/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): diff --git a/nfv/nfv-common/nfv_common/histogram.py b/nfv/nfv-common/nfv_common/histogram.py index d36333c4..0e3f7aff 100755 --- a/nfv/nfv-common/nfv_common/histogram.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/profiler.py b/nfv/nfv-common/nfv_common/profiler.py index a9a8b014..3e265c23 100755 --- a/nfv/nfv-common/nfv_common/profiler.py +++ b/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: diff --git a/nfv/nfv-common/nfv_common/schedule/__init__.py b/nfv/nfv-common/nfv_common/schedule/__init__.py index 153ad445..4948d10d 100755 --- a/nfv/nfv-common/nfv_common/schedule/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/schedule/_schedule_module.py b/nfv/nfv-common/nfv_common/schedule/_schedule_module.py index 3e8a6b2e..cbc45e47 100755 --- a/nfv/nfv-common/nfv_common/schedule/_schedule_module.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/selectable.py b/nfv/nfv-common/nfv_common/selectable.py index 6f8ed528..a60f378b 100755 --- a/nfv/nfv-common/nfv_common/selectable.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/selobj/__init__.py b/nfv/nfv-common/nfv_common/selobj/__init__.py index 59312033..c49da9b8 100755 --- a/nfv/nfv-common/nfv_common/selobj/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/state_machine/__init__.py b/nfv/nfv-common/nfv_common/state_machine/__init__.py index 1e8145de..05106e2a 100755 --- a/nfv/nfv-common/nfv_common/state_machine/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/state_machine/_state_task.py b/nfv/nfv-common/nfv_common/state_machine/_state_task.py index 520e0d3b..1607bc40 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_task.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/strategy/__init__.py b/nfv/nfv-common/nfv_common/strategy/__init__.py index 226122b8..ba78c4a3 100755 --- a/nfv/nfv-common/nfv_common/strategy/__init__.py +++ b/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_defs import STRATEGY_STATE # noqa: F401 -from nfv_common.strategy._strategy_defs import STRATEGY_PHASE # noqa: F401 +from nfv_common.strategy._strategy import Strategy # 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 import Strategy # noqa: F401 +from nfv_common.strategy._strategy_step import StrategyStep # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy.py b/nfv/nfv-common/nfv_common/strategy/_strategy.py index e55d6a49..ae420e4f 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy.py +++ b/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') diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py b/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py index a75ec826..0c2fb9cf 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py +++ b/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') diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py b/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py index c520a082..c7e0cf27 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py +++ b/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() diff --git a/nfv/nfv-common/nfv_common/tasks/__init__.py b/nfv/nfv-common/nfv_common/tasks/__init__.py index 29f1c925..d6205b70 100755 --- a/nfv/nfv-common/nfv_common/tasks/__init__.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py b/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py index 93ef044f..656cbf56 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/tasks/_task_work.py b/nfv/nfv-common/nfv_common/tasks/_task_work.py index faf6ac86..e8d27be8 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_work.py +++ b/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') diff --git a/nfv/nfv-common/nfv_common/tasks/unit_test.py b/nfv/nfv-common/nfv_common/tasks/unit_test.py index 61f091db..ea35b626 100755 --- a/nfv/nfv-common/nfv_common/tasks/unit_test.py +++ b/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) diff --git a/nfv/nfv-common/nfv_common/tcp/_tcp_connection.py b/nfv/nfv-common/nfv_common/tcp/_tcp_connection.py index 353dd430..1d8e39d2 100755 --- a/nfv/nfv-common/nfv_common/tcp/_tcp_connection.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/tcp/_tcp_server.py b/nfv/nfv-common/nfv_common/tcp/_tcp_server.py index cacd8336..5a568de3 100755 --- a/nfv/nfv-common/nfv_common/tcp/_tcp_server.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/tcp/unit_test.py b/nfv/nfv-common/nfv_common/tcp/unit_test.py index 62a85f97..a32f95d0 100755 --- a/nfv/nfv-common/nfv_common/tcp/unit_test.py +++ b/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): diff --git a/nfv/nfv-common/nfv_common/thread/_thread.py b/nfv/nfv-common/nfv_common/thread/_thread.py index 40083149..f7f9b0bc 100755 --- a/nfv/nfv-common/nfv_common/thread/_thread.py +++ b/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 diff --git a/nfv/nfv-common/nfv_common/timers/__init__.py b/nfv/nfv-common/nfv_common/timers/__init__.py index 2afb878e..df021fe7 100755 --- a/nfv/nfv-common/nfv_common/timers/__init__.py +++ b/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 diff --git a/nfv/nfv-debug-tools/histogram_analysis/Histogram.py b/nfv/nfv-debug-tools/histogram_analysis/Histogram.py index 009bd5ed..d9a83ff0 100755 --- a/nfv/nfv-debug-tools/histogram_analysis/Histogram.py +++ b/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/') diff --git a/nfv/nfv-debug-tools/histogram_analysis/plotter.py b/nfv/nfv-debug-tools/histogram_analysis/plotter.py index aff92078..dd6088af 100755 --- a/nfv/nfv-debug-tools/histogram_analysis/plotter.py +++ b/nfv/nfv-debug-tools/histogram_analysis/plotter.py @@ -39,16 +39,16 @@ # ################################################################################ -import os +from builtins import input import csv -import sys -import time +from glob import iglob +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 diff --git a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py b/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py index c8d04f78..476bea72 100755 --- a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py +++ b/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 diff --git a/nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py b/nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py index 563ea355..f049b6ea 100755 --- a/nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py +++ b/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 diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py index 0360abea..1f4bca6a 100644 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/clients/kubernetes_client.py +++ b/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 diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py index bee76cc9..b9baa243 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py index b952f261..23b63e6d 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py index 5c7e10d1..b4605e27 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py index 53205c5e..5318bff6 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py index d2639c45..f59185fc 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py index 854968c4..969c9643 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py index 2bb9663f..6c188808 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py +++ b/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') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rpc_listener.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rpc_listener.py index 8e3f6829..80200a1e 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rpc_listener.py +++ b/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') diff --git a/nfv/nfv-tests/nfv_scenario_tests/main.py b/nfv/nfv-tests/nfv_scenario_tests/main.py index 176912a8..e35b955c 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/main.py +++ b/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) diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py b/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py index 388f7dfb..879e098a 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py +++ b/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_instances import TestInstanceStop # 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_hosts import TestHostLock # noqa: F401 +from tests._test_hosts import TestHostUnlock # 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_hosts import TestHostUnlock # noqa: F401 +from tests._test_instances import TestInstanceResume # 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 diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_hosts.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_hosts.py index 31065415..b84383c5 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_hosts.py +++ b/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') diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_instances.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_instances.py index 639c520c..bf0b5df0 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_instances.py +++ b/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 diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_base.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_base.py index d16f8e0a..beeaf1f7 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_base.py +++ b/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 diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py index bf508052..3f819aac 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py +++ b/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 diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py index 2791dad9..bbd8e07d 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py +++ b/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 diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py index 52c45390..6abab393 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_upgrade_strategy.py +++ b/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 diff --git a/nfv/nfv-tools/nfv_tools/forensic.py b/nfv/nfv-tools/nfv_tools/forensic.py index 4ce7a5a5..4bc32145 100755 --- a/nfv/nfv-tools/nfv_tools/forensic.py +++ b/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 diff --git a/nfv/nfv-tools/nfv_tools/notify.py b/nfv/nfv-tools/nfv_tools/notify.py index ea79bfe7..c3266a04 100755 --- a/nfv/nfv-tools/nfv_tools/notify.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/alarm/__init__.py b/nfv/nfv-vim/nfv_vim/alarm/__init__.py index 97f2061c..d18b9042 100755 --- a/nfv/nfv-vim/nfv_vim/alarm/__init__.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/_application.py b/nfv/nfv-vim/nfv_vim/api/_application.py index 2036b5b6..36c42866 100755 --- a/nfv/nfv-vim/nfv_vim/api/_application.py +++ b/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(): diff --git a/nfv/nfv-vim/nfv_vim/api/_hooks.py b/nfv/nfv-vim/nfv_vim/api/_hooks.py index 5bee2c6c..74ac06de 100755 --- a/nfv/nfv-vim/nfv_vim/api/_hooks.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/root.py b/nfv/nfv-vim/nfv_vim/api/controllers/root.py index c2c2f585..5e1c7f8d 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/root.py +++ b/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): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py index ecf31d88..d632d8b8 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py +++ b/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): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py index 47b24b03..6220cbe6 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_controller.py +++ b/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): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_heat_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_heat_api.py index 9a37a351..955085f4 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/_heat_api.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py index aa34b0d6..118f1290 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/_controller.py +++ b/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): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py index 268f067f..496d59fc 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_patch.py +++ b/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') diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py index d9f42dbe..f9079f15 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_strategy.py +++ b/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 SwUpdateNames +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_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') diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py index e4deadb7..ce1d6ee9 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_upgrade.py +++ b/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') diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py index 5595776b..515070f2 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_computes_api.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py index 3aa69bbf..c0b7fd7f 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_controller.py +++ b/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): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py index 7578ab53..03f35b34 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_image_api.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py index 40365cd7..2f49e216 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_api.py +++ b/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') diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py index 7cc1c3c8..189d65d9 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_networks_middleware.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py index 8950c14d..8f12fdef 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/_volume_api.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/api/openstack/__init__.py b/nfv/nfv-vim/nfv_vim/api/openstack/__init__.py index 75145bf4..8216d7c3 100755 --- a/nfv/nfv-vim/nfv_vim/api/openstack/__init__.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/audits/__init__.py b/nfv/nfv-vim/nfv_vim/audits/__init__.py index d3e1e426..1540c93c 100755 --- a/nfv/nfv-vim/nfv_vim/audits/__init__.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/audits/_audits_module.py b/nfv/nfv-vim/nfv_vim/audits/_audits_module.py index 3d0273c5..c77bbd66 100755 --- a/nfv/nfv-vim/nfv_vim/audits/_audits_module.py +++ b/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(): diff --git a/nfv/nfv-vim/nfv_vim/audits/_vim_alarm_audits.py b/nfv/nfv-vim/nfv_vim/audits/_vim_alarm_audits.py index b59cd01e..6850211d 100755 --- a/nfv/nfv-vim/nfv_vim/audits/_vim_alarm_audits.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/audits/_vim_nfvi_audits.py b/nfv/nfv-vim/nfv_vim/audits/_vim_nfvi_audits.py index 3eca95b5..fe1aa2d8 100755 --- a/nfv/nfv-vim/nfv_vim/audits/_vim_nfvi_audits.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/__init__.py b/nfv/nfv-vim/nfv_vim/database/__init__.py index 6b9a7c62..88a80222 100755 --- a/nfv/nfv-vim/nfv_vim/database/__init__.py +++ b/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_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_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_host_aggregate_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_host_aggregate_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_host_aggregate_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_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_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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database.py b/nfv/nfv-vim/nfv_vim/database/_database.py index a8aabd44..dca4281b 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_block_storage_module.py b/nfv/nfv-vim/nfv_vim/database/_database_block_storage_module.py index 8f71bf99..9cb3f414 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_block_storage_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_compute_module.py b/nfv/nfv-vim/nfv_vim/database/_database_compute_module.py index c33ccc6f..e0c7d966 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_compute_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_identity_module.py b/nfv/nfv-vim/nfv_vim/database/_database_identity_module.py index 6405851b..12ff2e3e 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_identity_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_image_module.py b/nfv/nfv-vim/nfv_vim/database/_database_image_module.py index 0946fff7..7b73c0ad 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_image_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py b/nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py index 34366e7a..cf74ba11 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_network_module.py b/nfv/nfv-vim/nfv_vim/database/_database_network_module.py index 460b1e3e..cb2e3478 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_network_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/_database_sw_update.py b/nfv/nfv-vim/nfv_vim/database/_database_sw_update.py index 6e1d2f92..91889962 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_sw_update.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/database/model/__init__.py b/nfv/nfv-vim/nfv_vim/database/model/__init__.py index c51b5b1f..a868d031 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/__init__.py +++ b/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._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._base import lookup_class_by_table # 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._instance_group import InstanceGroup # noqa: F401 +from nfv_vim.database.model._image import Image # 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 diff --git a/nfv/nfv-vim/nfv_vim/directors/__init__.py b/nfv/nfv-vim/nfv_vim/directors/__init__.py index e6e44f38..84693fd7 100755 --- a/nfv/nfv-vim/nfv_vim/directors/__init__.py +++ b/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._directors_module import directors_initialize # noqa: F401 -from nfv_vim.directors._directors_module import directors_finalize # noqa: F401 +from nfv_vim.directors._volume_director import get_volume_director # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/directors/_directors_module.py b/nfv/nfv-vim/nfv_vim/directors/_directors_module.py index 3aea9bc7..308ab90c 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_directors_module.py +++ b/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(): diff --git a/nfv/nfv-vim/nfv_vim/directors/_image_director.py b/nfv/nfv-vim/nfv_vim/directors/_image_director.py index df740d81..8d80e1f3 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_image_director.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py b/nfv/nfv-vim/nfv_vim/directors/_instance_director.py index 9efa32e0..71f2833f 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/directors/_sw_mgmt_director.py b/nfv/nfv-vim/nfv_vim/directors/_sw_mgmt_director.py index c80ad563..1e822ac2 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_sw_mgmt_director.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/directors/_volume_director.py b/nfv/nfv-vim/nfv_vim/directors/_volume_director.py index 5538ad77..3d84395b 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_volume_director.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/dor/__init__.py b/nfv/nfv-vim/nfv_vim/dor/__init__.py index 89ba311c..1c78c7cc 100755 --- a/nfv/nfv-vim/nfv_vim/dor/__init__.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/dor/_dor_module.py b/nfv/nfv-vim/nfv_vim/dor/_dor_module.py index 15666d0e..ca87afe2 100755 --- a/nfv/nfv-vim/nfv_vim/dor/_dor_module.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/events/__init__.py b/nfv/nfv-vim/nfv_vim/events/__init__.py index 1bc8ccfd..9cd82f96 100755 --- a/nfv/nfv-vim/nfv_vim/events/__init__.py +++ b/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 diff --git a/nfv/nfv-vim/nfv_vim/events/_events_module.py b/nfv/nfv-vim/nfv_vim/events/_events_module.py index 9730b007..ccf5527e 100755 --- a/nfv/nfv-vim/nfv_vim/events/_events_module.py +++ b/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(): diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py index 9b9fcdca..0bef8d8b 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py @@ -3,65 +3,64 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_common import debug from nfv_common import config +from nfv_common import debug from nfv_common import tcp - from nfv_vim import rpc -from nfv_vim.events._vim_image_api_events import vim_image_api_initialize -from nfv_vim.events._vim_image_api_events import vim_image_api_finalize from nfv_vim.events._vim_image_api_events import vim_image_api_create_image from nfv_vim.events._vim_image_api_events import vim_image_api_delete_image -from nfv_vim.events._vim_image_api_events import vim_image_api_update_image +from nfv_vim.events._vim_image_api_events import vim_image_api_finalize from nfv_vim.events._vim_image_api_events import vim_image_api_get_image from nfv_vim.events._vim_image_api_events import vim_image_api_get_images +from nfv_vim.events._vim_image_api_events import vim_image_api_initialize +from nfv_vim.events._vim_image_api_events import vim_image_api_update_image -from nfv_vim.events._vim_volume_api_events import vim_volume_api_initialize -from nfv_vim.events._vim_volume_api_events import vim_volume_api_finalize from nfv_vim.events._vim_volume_api_events import vim_volume_api_create_volume from nfv_vim.events._vim_volume_api_events import vim_volume_api_delete_volume -from nfv_vim.events._vim_volume_api_events import vim_volume_api_update_volume +from nfv_vim.events._vim_volume_api_events import vim_volume_api_finalize from nfv_vim.events._vim_volume_api_events import vim_volume_api_get_volume from nfv_vim.events._vim_volume_api_events import vim_volume_api_get_volumes +from nfv_vim.events._vim_volume_api_events import vim_volume_api_initialize +from nfv_vim.events._vim_volume_api_events import vim_volume_api_update_volume -from nfv_vim.events._vim_instance_api_events import vim_instance_api_initialize -from nfv_vim.events._vim_instance_api_events import vim_instance_api_finalize -from nfv_vim.events._vim_instance_api_events import vim_instance_api_create_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_start_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_stop_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_pause_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_unpause_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_suspend_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_resume_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_reboot_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_live_migrate_instance from nfv_vim.events._vim_instance_api_events import vim_instance_api_cold_migrate_instance -from nfv_vim.events._vim_instance_api_events import vim_instance_api_evacuate_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_create_instance from nfv_vim.events._vim_instance_api_events import vim_instance_api_delete_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_evacuate_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_finalize from nfv_vim.events._vim_instance_api_events import vim_instance_api_get_instance from nfv_vim.events._vim_instance_api_events import vim_instance_api_get_instances +from nfv_vim.events._vim_instance_api_events import vim_instance_api_initialize +from nfv_vim.events._vim_instance_api_events import vim_instance_api_live_migrate_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_pause_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_reboot_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_resume_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_start_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_stop_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_suspend_instance +from nfv_vim.events._vim_instance_api_events import vim_instance_api_unpause_instance -from nfv_vim.events._vim_network_api_events import vim_network_api_initialize -from nfv_vim.events._vim_network_api_events import vim_network_api_finalize -from nfv_vim.events._vim_network_api_events import vim_network_api_create_subnet -from nfv_vim.events._vim_network_api_events import vim_network_api_update_subnet -from nfv_vim.events._vim_network_api_events import vim_network_api_delete_subnet -from nfv_vim.events._vim_network_api_events import vim_network_api_get_subnet -from nfv_vim.events._vim_network_api_events import vim_network_api_get_subnets from nfv_vim.events._vim_network_api_events import vim_network_api_create_network -from nfv_vim.events._vim_network_api_events import vim_network_api_update_network +from nfv_vim.events._vim_network_api_events import vim_network_api_create_subnet from nfv_vim.events._vim_network_api_events import vim_network_api_delete_network +from nfv_vim.events._vim_network_api_events import vim_network_api_delete_subnet +from nfv_vim.events._vim_network_api_events import vim_network_api_finalize from nfv_vim.events._vim_network_api_events import vim_network_api_get_network from nfv_vim.events._vim_network_api_events import vim_network_api_get_networks +from nfv_vim.events._vim_network_api_events import vim_network_api_get_subnet +from nfv_vim.events._vim_network_api_events import vim_network_api_get_subnets +from nfv_vim.events._vim_network_api_events import vim_network_api_initialize +from nfv_vim.events._vim_network_api_events import vim_network_api_update_network +from nfv_vim.events._vim_network_api_events import vim_network_api_update_subnet -from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_create_strategy -from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_apply_strategy from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_abort_strategy +from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_apply_strategy +from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_create_strategy from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_delete_strategy +from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_finalize from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_get_strategy from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_initialize -from nfv_vim.events._vim_sw_update_api_events import vim_sw_update_api_finalize DLOG = debug.debug_get_logger('nfv_vim.vim_api_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_image_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_image_api_events.py index 44c2920f..35ef4ee2 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_image_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_image_api_events.py @@ -4,11 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import json -from nfv_common import debug +from nfv_common import debug +from nfv_vim import directors from nfv_vim import rpc from nfv_vim import tables -from nfv_vim import directors DLOG = debug.debug_get_logger('nfv_vim.vim_image_api_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_instance_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_instance_api_events.py index b13e1a11..9a82fa1b 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_instance_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_instance_api_events.py @@ -5,10 +5,10 @@ # from nfv_common import debug +from nfv_vim import directors +from nfv_vim import objects from nfv_vim import rpc from nfv_vim import tables -from nfv_vim import objects -from nfv_vim import directors DLOG = debug.debug_get_logger('nfv_vim.vim_instance_api_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_network_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_network_api_events.py index 0480c00e..68fdc097 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_network_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_network_api_events.py @@ -4,10 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # from nfv_common import debug - +from nfv_vim import directors from nfv_vim import rpc from nfv_vim import tables -from nfv_vim import directors DLOG = debug.debug_get_logger('nfv_vim.vim_network_api_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_nfvi_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_nfvi_events.py index 1fb9ca82..c39ea0fb 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_nfvi_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_nfvi_events.py @@ -7,8 +7,8 @@ from nfv_common import debug from nfv_common.helpers import coroutine from nfv_vim import nfvi -from nfv_vim import tables from nfv_vim import objects +from nfv_vim import tables DLOG = debug.debug_get_logger('nfv_vim.vim_nfvi_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_sw_update_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_sw_update_api_events.py index 6b5f5696..64b6a629 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_sw_update_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_sw_update_api_events.py @@ -4,10 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # from nfv_common import debug - -from nfv_vim import rpc -from nfv_vim import objects from nfv_vim import directors +from nfv_vim import objects +from nfv_vim import rpc DLOG = debug.debug_get_logger('nfv_vim.vim_sw_update_api_events') diff --git a/nfv/nfv-vim/nfv_vim/events/_vim_volume_api_events.py b/nfv/nfv-vim/nfv_vim/events/_vim_volume_api_events.py index 178f5276..30742208 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_volume_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_volume_api_events.py @@ -4,10 +4,9 @@ # SPDX-License-Identifier: Apache-2.0 # from nfv_common import debug - +from nfv_vim import directors from nfv_vim import rpc from nfv_vim import tables -from nfv_vim import directors DLOG = debug.debug_get_logger('nfv_vim.vim_volume_api_events') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py index 41814e34..c08da8df 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py @@ -7,16 +7,16 @@ from nfv_common import debug from nfv_common import state_machine from nfv_vim.host_fsm._host_defs import HOST_STATE -from nfv_vim.host_fsm._host_state_initial import InitialState from nfv_vim.host_fsm._host_state_configure import ConfigureState -from nfv_vim.host_fsm._host_state_enabling import EnablingState -from nfv_vim.host_fsm._host_state_enabled import EnabledState -from nfv_vim.host_fsm._host_state_disabling import DisablingState -from nfv_vim.host_fsm._host_state_disabling_failed import DisablingFailedState -from nfv_vim.host_fsm._host_state_disabled import DisabledState +from nfv_vim.host_fsm._host_state_deleted import DeletedState from nfv_vim.host_fsm._host_state_deleting import DeletingState from nfv_vim.host_fsm._host_state_deleting_failed import DeletingFailedState -from nfv_vim.host_fsm._host_state_deleted import DeletedState +from nfv_vim.host_fsm._host_state_disabled import DisabledState +from nfv_vim.host_fsm._host_state_disabling import DisablingState +from nfv_vim.host_fsm._host_state_disabling_failed import DisablingFailedState +from nfv_vim.host_fsm._host_state_enabled import EnabledState +from nfv_vim.host_fsm._host_state_enabling import EnablingState +from nfv_vim.host_fsm._host_state_initial import InitialState DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabled.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabled.py index 0cca9693..47a92735 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabled.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabled.py @@ -8,9 +8,9 @@ from nfv_common import state_machine from nfv_vim.host_fsm._host_defs import HOST_EVENT from nfv_vim.host_fsm._host_defs import HOST_STATE +from nfv_vim.host_fsm._host_tasks import AuditDisabledHostTask from nfv_vim.host_fsm._host_tasks import FailHostTask from nfv_vim.host_fsm._host_tasks import NotifyDisabledHostTask -from nfv_vim.host_fsm._host_tasks import AuditDisabledHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_task_work.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_task_work.py index 445d13f8..3ed94ddd 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_task_work.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_task_work.py @@ -4,13 +4,14 @@ # SPDX-License-Identifier: Apache-2.0 # import weakref -from nfv_common.helpers import coroutine from nfv_common import config from nfv_common import debug from nfv_common import state_machine from nfv_common import timers +from nfv_common.helpers import coroutine + from nfv_vim import nfvi from nfv_vim.host_fsm._host_defs import HOST_EVENT diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py index 2ea597d2..41ef6ceb 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py @@ -5,28 +5,28 @@ # import weakref -from nfv_common import state_machine from nfv_common import debug +from nfv_common import state_machine from nfv_vim.host_fsm._host_defs import HOST_EVENT -from nfv_vim.host_fsm._host_task_work import QueryHypervisorTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostEnabledTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostDisabledTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostFailedTaskWork +from nfv_vim.host_fsm._host_task_work import AuditHostServicesCompleteTaskWork +from nfv_vim.host_fsm._host_task_work import AuditHostServicesTaskWork +from nfv_vim.host_fsm._host_task_work import AuditInstancesTaskWork from nfv_vim.host_fsm._host_task_work import CreateHostServicesTaskWork from nfv_vim.host_fsm._host_task_work import DeleteHostServicesTaskWork -from nfv_vim.host_fsm._host_task_work import EnableHostServicesTaskWork from nfv_vim.host_fsm._host_task_work import DisableHostServicesTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostServicesEnabledTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDisabledTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDisableFailedTaskWork +from nfv_vim.host_fsm._host_task_work import EnableHostServicesTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostDisabledTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostEnabledTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostFailedTaskWork from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDeletedTaskWork from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDeleteFailedTaskWork -from nfv_vim.host_fsm._host_task_work import NotifyInstancesHostDisablingTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDisabledTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostServicesDisableFailedTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyHostServicesEnabledTaskWork from nfv_vim.host_fsm._host_task_work import NotifyInstancesHostDisabledTaskWork -from nfv_vim.host_fsm._host_task_work import AuditHostServicesTaskWork -from nfv_vim.host_fsm._host_task_work import AuditHostServicesCompleteTaskWork -from nfv_vim.host_fsm._host_task_work import AuditInstancesTaskWork +from nfv_vim.host_fsm._host_task_work import NotifyInstancesHostDisablingTaskWork +from nfv_vim.host_fsm._host_task_work import QueryHypervisorTaskWork DLOG = debug.debug_get_logger('nfv_vim.state_machine.host_task') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py b/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py index 33a47e52..34adbfee 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py @@ -5,26 +5,26 @@ # from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT # noqa: F401 from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import LiveMigrateStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import ColdMigrateStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import ColdMigrateConfirmStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import ColdMigrateRevertStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import ColdMigrateStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import DeleteStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import EvacuateStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import StartStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import StopStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import FailStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import GuestServicesCreateStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import GuestServicesDeleteStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import GuestServicesDisableStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import GuestServicesEnableStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import GuestServicesSetStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import LiveMigrateStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import PauseStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import UnpauseStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import SuspendStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import ResumeStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import RebootStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import RebuildStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import FailStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import DeleteStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import ResizeStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import ResizeConfirmStateMachine # noqa: F401 from nfv_vim.instance_fsm._instance_fsm import ResizeRevertStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import GuestServicesCreateStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import GuestServicesEnableStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import GuestServicesDisableStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import GuestServicesSetStateMachine # noqa: F401 -from nfv_vim.instance_fsm._instance_fsm import GuestServicesDeleteStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import ResizeStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import ResumeStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import StartStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import StopStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import SuspendStateMachine # noqa: F401 +from nfv_vim.instance_fsm._instance_fsm import UnpauseStateMachine # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py index 3965d4c8..ef2c99f6 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py @@ -7,31 +7,31 @@ from nfv_common import debug from nfv_common import state_machine from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE -from nfv_vim.instance_fsm._instance_state_initial import InitialState -from nfv_vim.instance_fsm._instance_state_live_migrate import LiveMigrateState -from nfv_vim.instance_fsm._instance_state_live_migrate_finish import LiveMigrateFinishState from nfv_vim.instance_fsm._instance_state_cold_migrate import ColdMigrateState from nfv_vim.instance_fsm._instance_state_cold_migrate_confirm import ColdMigrateConfirmState from nfv_vim.instance_fsm._instance_state_cold_migrate_revert import ColdMigrateRevertState +from nfv_vim.instance_fsm._instance_state_delete import DeleteState from nfv_vim.instance_fsm._instance_state_evacuate import EvacuateState -from nfv_vim.instance_fsm._instance_state_start import StartState -from nfv_vim.instance_fsm._instance_state_stop import StopState +from nfv_vim.instance_fsm._instance_state_fail import FailState +from nfv_vim.instance_fsm._instance_state_guest_services_create import GuestServicesCreateState +from nfv_vim.instance_fsm._instance_state_guest_services_delete import GuestServicesDeleteState +from nfv_vim.instance_fsm._instance_state_guest_services_disable import GuestServicesDisableState +from nfv_vim.instance_fsm._instance_state_guest_services_enable import GuestServicesEnableState +from nfv_vim.instance_fsm._instance_state_guest_services_set import GuestServicesSetState +from nfv_vim.instance_fsm._instance_state_initial import InitialState +from nfv_vim.instance_fsm._instance_state_live_migrate import LiveMigrateState +from nfv_vim.instance_fsm._instance_state_live_migrate_finish import LiveMigrateFinishState from nfv_vim.instance_fsm._instance_state_pause import PauseState -from nfv_vim.instance_fsm._instance_state_unpause import UnpauseState -from nfv_vim.instance_fsm._instance_state_suspend import SuspendState -from nfv_vim.instance_fsm._instance_state_resume import ResumeState from nfv_vim.instance_fsm._instance_state_reboot import RebootState from nfv_vim.instance_fsm._instance_state_rebuild import RebuildState -from nfv_vim.instance_fsm._instance_state_fail import FailState from nfv_vim.instance_fsm._instance_state_resize import ResizeState from nfv_vim.instance_fsm._instance_state_resize_confirm import ResizeConfirmState from nfv_vim.instance_fsm._instance_state_resize_revert import ResizeRevertState -from nfv_vim.instance_fsm._instance_state_delete import DeleteState -from nfv_vim.instance_fsm._instance_state_guest_services_create import GuestServicesCreateState -from nfv_vim.instance_fsm._instance_state_guest_services_enable import GuestServicesEnableState -from nfv_vim.instance_fsm._instance_state_guest_services_disable import GuestServicesDisableState -from nfv_vim.instance_fsm._instance_state_guest_services_set import GuestServicesSetState -from nfv_vim.instance_fsm._instance_state_guest_services_delete import GuestServicesDeleteState +from nfv_vim.instance_fsm._instance_state_resume import ResumeState +from nfv_vim.instance_fsm._instance_state_start import StartState +from nfv_vim.instance_fsm._instance_state_stop import StopState +from nfv_vim.instance_fsm._instance_state_suspend import SuspendState +from nfv_vim.instance_fsm._instance_state_unpause import UnpauseState DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate.py index d2fc4ec2..3fe423d1 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate.py @@ -4,8 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 # from nfv_common import debug -from nfv_common import timers from nfv_common import state_machine +from nfv_common import timers from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py index b27e605e..346bb35f 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py @@ -9,33 +9,33 @@ from nfv_common import debug from nfv_common import state_machine from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT -from nfv_vim.instance_fsm._instance_task_work import QueryHypervisorTaskWork -from nfv_vim.instance_fsm._instance_task_work import LiveMigrateTaskWork -from nfv_vim.instance_fsm._instance_task_work import ColdMigrateTaskWork from nfv_vim.instance_fsm._instance_task_work import ColdMigrateConfirmTaskWork from nfv_vim.instance_fsm._instance_task_work import ColdMigrateRevertTaskWork -from nfv_vim.instance_fsm._instance_task_work import ResizeTaskWork -from nfv_vim.instance_fsm._instance_task_work import ResizeConfirmTaskWork -from nfv_vim.instance_fsm._instance_task_work import ResizeRevertTaskWork +from nfv_vim.instance_fsm._instance_task_work import ColdMigrateTaskWork +from nfv_vim.instance_fsm._instance_task_work import DeleteTaskWork from nfv_vim.instance_fsm._instance_task_work import EvacuateTaskWork -from nfv_vim.instance_fsm._instance_task_work import StartTaskWork -from nfv_vim.instance_fsm._instance_task_work import StopTaskWork +from nfv_vim.instance_fsm._instance_task_work import FailTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesCreateTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesDeleteTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesDisableTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesEnableTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesPostNotifyTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesPreNotifyTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesSetTaskWork +from nfv_vim.instance_fsm._instance_task_work import GuestServicesVoteTaskWork +from nfv_vim.instance_fsm._instance_task_work import LiveMigrateTaskWork from nfv_vim.instance_fsm._instance_task_work import PauseTaskWork -from nfv_vim.instance_fsm._instance_task_work import UnpauseTaskWork -from nfv_vim.instance_fsm._instance_task_work import SuspendTaskWork -from nfv_vim.instance_fsm._instance_task_work import ResumeTaskWork +from nfv_vim.instance_fsm._instance_task_work import QueryHypervisorTaskWork from nfv_vim.instance_fsm._instance_task_work import RebootTaskWork from nfv_vim.instance_fsm._instance_task_work import RebuildTaskWork -from nfv_vim.instance_fsm._instance_task_work import FailTaskWork -from nfv_vim.instance_fsm._instance_task_work import DeleteTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesCreateTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesEnableTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesDisableTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesSetTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesDeleteTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesVoteTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesPreNotifyTaskWork -from nfv_vim.instance_fsm._instance_task_work import GuestServicesPostNotifyTaskWork +from nfv_vim.instance_fsm._instance_task_work import ResizeConfirmTaskWork +from nfv_vim.instance_fsm._instance_task_work import ResizeRevertTaskWork +from nfv_vim.instance_fsm._instance_task_work import ResizeTaskWork +from nfv_vim.instance_fsm._instance_task_work import ResumeTaskWork +from nfv_vim.instance_fsm._instance_task_work import StartTaskWork +from nfv_vim.instance_fsm._instance_task_work import StopTaskWork +from nfv_vim.instance_fsm._instance_task_work import SuspendTaskWork +from nfv_vim.instance_fsm._instance_task_work import UnpauseTaskWork DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance_task') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/__init__.py b/nfv/nfv-vim/nfv_vim/nfvi/__init__.py index 9e2569d4..fb7c2749 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/__init__.py @@ -6,133 +6,142 @@ import nfv_vim.nfvi.api # noqa: F401 import nfv_vim.nfvi.objects # noqa: F401 -from nfv_vim.nfvi._nfvi_defs import NFVI_ERROR_CODE # noqa: F401 -from nfv_vim.nfvi._nfvi_identity_module import nfvi_get_tenants # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_plugin_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_create # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_set # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_delete # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_query # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_vote # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_notify # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_disable_guest_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_enable_guest_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_create_guest_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_delete_guest_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_query_guest_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_host_services_query_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_query_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_state_notify_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_alarm_notify_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_action_notify_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_system_info # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_system_state # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_hosts # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_upgrade # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_start # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_activate # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_complete # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_disable_container_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_enable_container_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_delete_container_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_enabled # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disable_extend # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disable_failed # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_deleted # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_delete_failed # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_failed # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_lock_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_unlock_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_reboot_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_swact_from_host # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_alarms # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_logs # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_alarm_history # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_add_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_action_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_state_change_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_get_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_upgrade_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_update_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_notification_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_image_plugin_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_get_images # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_create_image # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_delete_image # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_update_image # noqa: F401 -from nfv_vim.nfvi._nfvi_image_module import nfvi_get_image # noqa: F401 from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_block_storage_plugin_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_get_volumes # noqa: F401 from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_create_volume # noqa: F401 from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_delete_volume # noqa: F401 -from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_update_volume # noqa: F401 from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_get_volume # noqa: F401 from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_get_volume_snapshots # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_notify_network_host_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_enable_network_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_network_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_create_network_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_query_network_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_network_plugin_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_get_networks # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_create_network # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_update_network # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_network # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_get_network # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_create_subnet # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_update_subnet # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_subnet # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_get_subnet # noqa: F401 -from nfv_vim.nfvi._nfvi_network_module import nfvi_get_subnets # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_notify_compute_host_enabled # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_notify_compute_host_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_get_volumes # noqa: F401 +from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_update_volume # noqa: F401 + +from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_confirm_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_revert_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_compute_plugin_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_compute_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_instance_type # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_compute_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_instance_type # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_disable_compute_host_services # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_enable_compute_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_compute_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_compute_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_query_compute_host_services # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_compute_plugin_disabled # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_host_aggregates # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_hypervisors # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_hypervisor # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_types # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_instance_type # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_instance_type # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_type # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_groups # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instances # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_create_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_live_migrate_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_confirm_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_cold_migrate_revert_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_confirm_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_revert_instance # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_evacuate_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_fail_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_host_aggregates # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_hypervisor # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_hypervisors # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_groups # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_type # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance_types # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instances # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_live_migrate_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_notify_compute_host_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_notify_compute_host_enabled # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_pause_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_query_compute_host_services # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_reboot_instance # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_rebuild_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_fail_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_pause_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_unpause_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_suspend_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_action_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_action_change_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_delete_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_state_change_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_reject_instance_action # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_confirm_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_resize_revert_instance # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_resume_instance # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_start_instance # noqa: F401 from nfv_vim.nfvi._nfvi_compute_module import nfvi_stop_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_delete_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_get_instance # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_reject_instance_action # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_delete_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_state_change_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_action_change_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_compute_module import nfvi_register_instance_action_callback # noqa: F401 -from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_updates # noqa: F401 -from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_hosts # noqa: F401 -from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_host # noqa: F401 -from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_hosts # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_suspend_instance # noqa: F401 +from nfv_vim.nfvi._nfvi_compute_module import nfvi_unpause_instance # noqa: F401 + +from nfv_vim.nfvi._nfvi_defs import NFVI_ERROR_CODE # noqa: F401 + +from nfv_vim.nfvi._nfvi_guest_module import nfvi_create_guest_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_delete_guest_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_disable_guest_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_enable_guest_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_plugin_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_create # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_delete # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_notify # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_query # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_set # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_services_vote # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_query_guest_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_action_notify_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_alarm_notify_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_query_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_guest_services_state_notify_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_guest_module import nfvi_register_host_services_query_callback # noqa: F401 + +from nfv_vim.nfvi._nfvi_identity_module import nfvi_get_tenants # noqa: F401 + +from nfv_vim.nfvi._nfvi_image_module import nfvi_create_image # noqa: F401 +from nfv_vim.nfvi._nfvi_image_module import nfvi_delete_image # noqa: F401 +from nfv_vim.nfvi._nfvi_image_module import nfvi_get_image # noqa: F401 +from nfv_vim.nfvi._nfvi_image_module import nfvi_get_images # noqa: F401 +from nfv_vim.nfvi._nfvi_image_module import nfvi_image_plugin_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_image_module import nfvi_update_image # noqa: F401 + +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_delete_container_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_disable_container_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_enable_container_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_alarm_history # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_alarms # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_hosts # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_logs # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_system_info # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_system_state # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_get_upgrade # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_lock_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_failed # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_delete_failed # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_deleted # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disable_extend # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disable_failed # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_services_enabled # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_reboot_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_action_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_add_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_get_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_notification_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_state_change_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_update_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_register_host_upgrade_callback # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_swact_from_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_unlock_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_activate # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_complete # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_host # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_upgrade_start # noqa: F401 + +from nfv_vim.nfvi._nfvi_module import nfvi_finalize # noqa: F401 from nfv_vim.nfvi._nfvi_module import nfvi_initialize # noqa: F401 from nfv_vim.nfvi._nfvi_module import nfvi_reinitialize # noqa: F401 -from nfv_vim.nfvi._nfvi_module import nfvi_finalize # noqa: F401 + +from nfv_vim.nfvi._nfvi_network_module import nfvi_create_network # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_create_network_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_create_subnet # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_network # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_network_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_delete_subnet # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_enable_network_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_get_network # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_get_networks # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_get_subnet # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_get_subnets # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_network_plugin_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_notify_network_host_disabled # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_query_network_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_update_network # noqa: F401 +from nfv_vim.nfvi._nfvi_network_module import nfvi_update_subnet # noqa: F401 + +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_hosts # noqa: F401 +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_updates # noqa: F401 +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_host # noqa: F401 +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_hosts # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py index 9844dcf6..b2dd4726 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py @@ -6,22 +6,22 @@ from nfv_common import debug from nfv_common import tasks -from nfv_vim.nfvi._nfvi_identity_module import nfvi_identity_initialize -from nfv_vim.nfvi._nfvi_identity_module import nfvi_identity_finalize -from nfv_vim.nfvi._nfvi_image_module import nfvi_image_initialize -from nfv_vim.nfvi._nfvi_image_module import nfvi_image_finalize -from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_block_storage_initialize from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_block_storage_finalize -from nfv_vim.nfvi._nfvi_network_module import nfvi_network_initialize -from nfv_vim.nfvi._nfvi_network_module import nfvi_network_finalize -from nfv_vim.nfvi._nfvi_compute_module import nfvi_compute_initialize +from nfv_vim.nfvi._nfvi_block_storage_module import nfvi_block_storage_initialize from nfv_vim.nfvi._nfvi_compute_module import nfvi_compute_finalize -from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_initialize +from nfv_vim.nfvi._nfvi_compute_module import nfvi_compute_initialize from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_finalize -from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_infrastructure_initialize +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_initialize +from nfv_vim.nfvi._nfvi_identity_module import nfvi_identity_finalize +from nfv_vim.nfvi._nfvi_identity_module import nfvi_identity_initialize +from nfv_vim.nfvi._nfvi_image_module import nfvi_image_finalize +from nfv_vim.nfvi._nfvi_image_module import nfvi_image_initialize from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_infrastructure_finalize -from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_initialize +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_infrastructure_initialize +from nfv_vim.nfvi._nfvi_network_module import nfvi_network_finalize +from nfv_vim.nfvi._nfvi_network_module import nfvi_network_initialize from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_finalize +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_initialize DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_plugin.py index 9458001c..c4fc4fed 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_plugin.py @@ -5,8 +5,8 @@ # import stevedore -from nfv_common import tasks from nfv_common import debug +from nfv_common import tasks DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py b/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py index bc346f94..755cdd8b 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py @@ -3,11 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # +from nfv_vim.nfvi.api.v1._nfvi_block_storage_api import NFVIBlockStorageAPI # noqa: F401 +from nfv_vim.nfvi.api.v1._nfvi_compute_api import NFVIComputeAPI # noqa: F401 +from nfv_vim.nfvi.api.v1._nfvi_guest_api import NFVIGuestAPI # noqa: F401 from nfv_vim.nfvi.api.v1._nfvi_identity_api import NFVIIdentityAPI # noqa: F401 from nfv_vim.nfvi.api.v1._nfvi_image_api import NFVIImageAPI # noqa: F401 -from nfv_vim.nfvi.api.v1._nfvi_block_storage_api import NFVIBlockStorageAPI # noqa: F401 -from nfv_vim.nfvi.api.v1._nfvi_network_api import NFVINetworkAPI # noqa: F401 -from nfv_vim.nfvi.api.v1._nfvi_compute_api import NFVIComputeAPI # noqa: F401 from nfv_vim.nfvi.api.v1._nfvi_infrastructure_api import NFVIInfrastructureAPI # noqa: F401 -from nfv_vim.nfvi.api.v1._nfvi_guest_api import NFVIGuestAPI # noqa: F401 +from nfv_vim.nfvi.api.v1._nfvi_network_api import NFVINetworkAPI # noqa: F401 from nfv_vim.nfvi.api.v1._nfvi_sw_mgmt_api import NFVISwMgmtAPI # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py index 1dcc5166..9fa68225 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py @@ -3,65 +3,65 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_vim.nfvi.objects.v1._paging import Paging # noqa: F401 -from nfv_vim.nfvi.objects.v1._tenant import Tenant # noqa: F401 -from nfv_vim.nfvi.objects.v1._image import IMAGE_AVAIL_STATUS # noqa: F401 -from nfv_vim.nfvi.objects.v1._image import IMAGE_ACTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._image import IMAGE_PROPERTY # noqa: F401 -from nfv_vim.nfvi.objects.v1._image import ImageAttributes # noqa: F401 -from nfv_vim.nfvi.objects.v1._image import Image # noqa: F401 -from nfv_vim.nfvi.objects.v1._volume import VOLUME_AVAIL_STATUS # noqa: F401 -from nfv_vim.nfvi.objects.v1._volume import VOLUME_ACTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._volume import Volume # noqa: F401 -from nfv_vim.nfvi.objects.v1._volume_snapshot import VolumeSnapshot # noqa: F401 -from nfv_vim.nfvi.objects.v1._subnet import Subnet # noqa: F401 -from nfv_vim.nfvi.objects.v1._network import NETWORK_ADMIN_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._network import NETWORK_OPER_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._network import NETWORK_AVAIL_STATUS # noqa: F401 -from nfv_vim.nfvi.objects.v1._network import NetworkProviderData # noqa: F401 -from nfv_vim.nfvi.objects.v1._network import Network # noqa: F401 -from nfv_vim.nfvi.objects.v1._service_host import ServiceHost # noqa: F401 -from nfv_vim.nfvi.objects.v1._hypervisor import HYPERVISOR_ADMIN_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._hypervisor import HYPERVISOR_OPER_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._hypervisor import Hypervisor # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ADMIN_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_OPER_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_AVAIL_STATUS # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION_TYPE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_REBUILD_OPTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_RESIZE_OPTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_REBOOT_OPTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_LIVE_MIGRATE_OPTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import INSTANCE_GUEST_SERVICE_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import Instance # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance import InstanceActionData # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_type import STORAGE_TYPE # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_type import INSTANCE_TYPE_EXTENSION # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_type import InstanceTypeAttributes # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_type import InstanceType # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_group import INSTANCE_GROUP_POLICY # noqa: F401 -from nfv_vim.nfvi.objects.v1._instance_group import InstanceGroup # noqa: F401 -from nfv_vim.nfvi.objects.v1._host import HOST_ADMIN_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._host import HOST_OPER_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._host import HOST_AVAIL_STATUS # noqa: F401 +from nfv_vim.nfvi.objects.v1._alarm import Alarm # noqa: F401 +from nfv_vim.nfvi.objects.v1._alarm import ALARM_SEVERITY # noqa: F401 +from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_ADMIN_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_NAME # noqa: F401 +from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_OPER_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._guest_service import GuestService # noqa: F401 +from nfv_vim.nfvi.objects.v1._host import Host # noqa: F401 from nfv_vim.nfvi.objects.v1._host import HOST_ACTION # noqa: F401 -from nfv_vim.nfvi.objects.v1._host import HOST_NOTIFICATIONS # noqa: F401 +from nfv_vim.nfvi.objects.v1._host import HOST_ADMIN_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._host import HOST_AVAIL_STATUS # noqa: F401 from nfv_vim.nfvi.objects.v1._host import HOST_LABEL_KEYS # noqa: F401 from nfv_vim.nfvi.objects.v1._host import HOST_LABEL_VALUES # noqa: F401 -from nfv_vim.nfvi.objects.v1._host import Host # noqa: F401 +from nfv_vim.nfvi.objects.v1._host import HOST_NOTIFICATIONS # noqa: F401 +from nfv_vim.nfvi.objects.v1._host import HOST_OPER_STATE # noqa: F401 from nfv_vim.nfvi.objects.v1._host_aggregate import HostAggregate # noqa: F401 from nfv_vim.nfvi.objects.v1._host_group import HOST_GROUP_POLICY # noqa: F401 from nfv_vim.nfvi.objects.v1._host_group import HostGroup # noqa: F401 -from nfv_vim.nfvi.objects.v1._system import System # noqa: F401 -from nfv_vim.nfvi.objects.v1._upgrade import UPGRADE_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._upgrade import Upgrade # noqa: F401 -from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_NAME # noqa: F401 -from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_ADMIN_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._guest_service import GUEST_SERVICE_OPER_STATE # noqa: F401 -from nfv_vim.nfvi.objects.v1._guest_service import GuestService # noqa: F401 from nfv_vim.nfvi.objects.v1._host_sw_patch import HostSwPatch # noqa: F401 +from nfv_vim.nfvi.objects.v1._hypervisor import Hypervisor # noqa: F401 +from nfv_vim.nfvi.objects.v1._hypervisor import HYPERVISOR_ADMIN_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._hypervisor import HYPERVISOR_OPER_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._image import Image # noqa: F401 +from nfv_vim.nfvi.objects.v1._image import IMAGE_ACTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._image import IMAGE_AVAIL_STATUS # noqa: F401 +from nfv_vim.nfvi.objects.v1._image import IMAGE_PROPERTY # noqa: F401 +from nfv_vim.nfvi.objects.v1._image import ImageAttributes # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import Instance # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ACTION_TYPE # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_ADMIN_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_AVAIL_STATUS # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_GUEST_SERVICE_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_LIVE_MIGRATE_OPTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_OPER_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_REBOOT_OPTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_REBUILD_OPTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import INSTANCE_RESIZE_OPTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance import InstanceActionData # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_group import INSTANCE_GROUP_POLICY # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_group import InstanceGroup # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_type import INSTANCE_TYPE_EXTENSION # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_type import InstanceType # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_type import InstanceTypeAttributes # noqa: F401 +from nfv_vim.nfvi.objects.v1._instance_type import STORAGE_TYPE # noqa: F401 +from nfv_vim.nfvi.objects.v1._network import Network # noqa: F401 +from nfv_vim.nfvi.objects.v1._network import NETWORK_ADMIN_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._network import NETWORK_AVAIL_STATUS # noqa: F401 +from nfv_vim.nfvi.objects.v1._network import NETWORK_OPER_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._network import NetworkProviderData # noqa: F401 +from nfv_vim.nfvi.objects.v1._paging import Paging # noqa: F401 +from nfv_vim.nfvi.objects.v1._service_host import ServiceHost # noqa: F401 +from nfv_vim.nfvi.objects.v1._subnet import Subnet # noqa: F401 from nfv_vim.nfvi.objects.v1._sw_patch import SwPatch # noqa: F401 -from nfv_vim.nfvi.objects.v1._alarm import ALARM_SEVERITY # noqa: F401 -from nfv_vim.nfvi.objects.v1._alarm import Alarm # noqa: F401 +from nfv_vim.nfvi.objects.v1._system import System # noqa: F401 +from nfv_vim.nfvi.objects.v1._tenant import Tenant # noqa: F401 +from nfv_vim.nfvi.objects.v1._upgrade import Upgrade # noqa: F401 +from nfv_vim.nfvi.objects.v1._upgrade import UPGRADE_STATE # noqa: F401 +from nfv_vim.nfvi.objects.v1._volume import Volume # noqa: F401 +from nfv_vim.nfvi.objects.v1._volume import VOLUME_ACTION # noqa: F401 +from nfv_vim.nfvi.objects.v1._volume import VOLUME_AVAIL_STATUS # noqa: F401 +from nfv_vim.nfvi.objects.v1._volume_snapshot import VolumeSnapshot # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py index f9664b5a..df9e6d6e 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py @@ -4,11 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.nfvi.objects.v1._object import ObjectData from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py index 28bd9a8b..21fb1d45 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six from datetime import datetime +import six from nfv_vim.nfvi.objects.v1._instance_type import INSTANCE_TYPE_EXTENSION from nfv_vim.nfvi.objects.v1._object import ObjectData diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py index a6ede900..51c0d39c 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_type.py @@ -4,10 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.nfvi.objects.v1._object import ObjectData + from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py index 4891a366..28952991 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py @@ -4,11 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.nfvi.objects.v1._object import ObjectData from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/objects/__init__.py b/nfv/nfv-vim/nfv_vim/objects/__init__.py index 1a965ce3..ccfb5353 100755 --- a/nfv/nfv-vim/nfv_vim/objects/__init__.py +++ b/nfv/nfv-vim/nfv_vim/objects/__init__.py @@ -3,41 +3,41 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_vim.objects._tenant import Tenant # noqa: F401 -from nfv_vim.objects._system import System # noqa: F401 -from nfv_vim.objects._host import HOST_PERSONALITY # noqa: F401 +from nfv_vim.objects._guest_services import GuestServices # noqa: F401 +from nfv_vim.objects._host import Host # noqa: F401 from nfv_vim.objects._host import HOST_NAME # noqa: F401 +from nfv_vim.objects._host import HOST_PERSONALITY # noqa: F401 from nfv_vim.objects._host import HOST_SERVICE_STATE # noqa: F401 from nfv_vim.objects._host import HOST_SERVICES # noqa: F401 -from nfv_vim.objects._host import Host # noqa: F401 +from nfv_vim.objects._host_aggregate import HostAggregate # noqa: F401 from nfv_vim.objects._host_group import HOST_GROUP_POLICY # noqa: F401 from nfv_vim.objects._host_group import HostGroup # noqa: F401 -from nfv_vim.objects._image import ImageAttributes # noqa: F401 -from nfv_vim.objects._image import Image # noqa: F401 -from nfv_vim.objects._volume import Volume # noqa: F401 -from nfv_vim.objects._volume_snapshot import VolumeSnapshot # noqa: F401 -from nfv_vim.objects._service_host import ServiceHost # noqa: F401 -from nfv_vim.objects._host_aggregate import HostAggregate # noqa: F401 from nfv_vim.objects._hypervisor import Hypervisor # noqa: F401 -from nfv_vim.objects._instance import INSTANCE_ACTION_TYPE # noqa: F401 -from nfv_vim.objects._instance import INSTANCE_ACTION_STATE # noqa: F401 -from nfv_vim.objects._instance import INSTANCE_ACTION_INITIATED_BY # noqa: F401 -from nfv_vim.objects._instance import InstanceActionData # noqa: F401 +from nfv_vim.objects._image import Image # noqa: F401 +from nfv_vim.objects._image import ImageAttributes # noqa: F401 from nfv_vim.objects._instance import Instance # noqa: F401 -from nfv_vim.objects._instance_type import STORAGE_TYPE # noqa: F401 +from nfv_vim.objects._instance import INSTANCE_ACTION_INITIATED_BY # noqa: F401 +from nfv_vim.objects._instance import INSTANCE_ACTION_STATE # noqa: F401 +from nfv_vim.objects._instance import INSTANCE_ACTION_TYPE # noqa: F401 +from nfv_vim.objects._instance import InstanceActionData # noqa: F401 +from nfv_vim.objects._instance_group import INSTANCE_GROUP_POLICY # noqa: F401 +from nfv_vim.objects._instance_group import InstanceGroup # noqa: F401 from nfv_vim.objects._instance_type import INSTANCE_TYPE_EXTENSION # noqa: F401 from nfv_vim.objects._instance_type import InstanceType # noqa: F401 from nfv_vim.objects._instance_type import InstanceTypeAttributes # noqa: F401 -from nfv_vim.objects._instance_group import INSTANCE_GROUP_POLICY # noqa: F401 -from nfv_vim.objects._instance_group import InstanceGroup # noqa: F401 -from nfv_vim.objects._subnet import Subnet # noqa: F401 -from nfv_vim.objects._network import NetworkProviderData # noqa: F401 +from nfv_vim.objects._instance_type import STORAGE_TYPE # noqa: F401 from nfv_vim.objects._network import Network # noqa: F401 -from nfv_vim.objects._guest_services import GuestServices # noqa: F401 -from nfv_vim.objects._sw_update import SW_UPDATE_TYPE # noqa: F401 +from nfv_vim.objects._network import NetworkProviderData # noqa: F401 +from nfv_vim.objects._service_host import ServiceHost # noqa: F401 +from nfv_vim.objects._subnet import Subnet # noqa: F401 +from nfv_vim.objects._sw_patch import SwPatch # noqa: F401 +from nfv_vim.objects._sw_update import SW_UPDATE_ALARM_RESTRICTION # noqa: F401 from nfv_vim.objects._sw_update import SW_UPDATE_APPLY_TYPE # noqa: F401 from nfv_vim.objects._sw_update import SW_UPDATE_INSTANCE_ACTION # noqa: F401 +from nfv_vim.objects._sw_update import SW_UPDATE_TYPE # noqa: F401 from nfv_vim.objects._sw_update import SwUpdate # noqa: F401 -from nfv_vim.objects._sw_update import SW_UPDATE_ALARM_RESTRICTION # noqa: F401 -from nfv_vim.objects._sw_patch import SwPatch # noqa: F401 from nfv_vim.objects._sw_upgrade import SwUpgrade # noqa: F401 +from nfv_vim.objects._system import System # noqa: F401 +from nfv_vim.objects._tenant import Tenant # noqa: F401 +from nfv_vim.objects._volume import Volume # noqa: F401 +from nfv_vim.objects._volume_snapshot import VolumeSnapshot # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/objects/_host.py b/nfv/nfv-vim/nfv_vim/objects/_host.py index 128ceaeb..ab161de8 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_host.py +++ b/nfv/nfv-vim/nfv_vim/objects/_host.py @@ -3,12 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import os +import six from nfv_common import debug from nfv_common import state_machine from nfv_common import timers + from nfv_common.helpers import Constant from nfv_common.helpers import Singleton diff --git a/nfv/nfv-vim/nfv_vim/objects/_host_group.py b/nfv/nfv-vim/nfv_vim/objects/_host_group.py index ee464c82..0d535916 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_host_group.py +++ b/nfv/nfv-vim/nfv_vim/objects/_host_group.py @@ -4,9 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six + from nfv_vim.objects._object import ObjectData from nfv_common import debug + from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton diff --git a/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py b/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py index d21df88d..8e1c16fd 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py +++ b/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py @@ -7,8 +7,8 @@ from nfv_vim.objects._object import ObjectData from nfv_common import debug -from nfv_vim import nfvi from nfv_vim import event_log +from nfv_vim import nfvi DLOG = debug.debug_get_logger('nfv_vim.objects.hypervisor') diff --git a/nfv/nfv-vim/nfv_vim/objects/_image.py b/nfv/nfv-vim/nfv_vim/objects/_image.py index 04a70faa..a7afab5d 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_image.py +++ b/nfv/nfv-vim/nfv_vim/objects/_image.py @@ -4,14 +4,17 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.objects._object import ObjectData + from nfv_common import debug from nfv_common import state_machine + from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_vim.objects._object import ObjectData + from nfv_vim import nfvi DLOG = debug.debug_get_logger('nfv_vim.objects.image') diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance.py b/nfv/nfv-vim/nfv_vim/objects/_instance.py index 8d48a9ef..362fcd21 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance.py @@ -13,8 +13,9 @@ from nfv_vim.objects._object import ObjectData from nfv_common import config from nfv_common import debug -from nfv_common import timers from nfv_common import state_machine +from nfv_common import timers + from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton @@ -24,8 +25,8 @@ from nfv_vim import event_log from nfv_vim import instance_fsm from nfv_vim import nfvi -from nfv_vim.objects._instance_type import STORAGE_TYPE from nfv_vim.objects._guest_services import GuestServices +from nfv_vim.objects._instance_type import STORAGE_TYPE DLOG = debug.debug_get_logger('nfv_vim.objects.instance') MAX_EVENT_REASON_LENGTH = 255 @@ -2496,8 +2497,8 @@ class Instance(ObjectData): """ NFVI Instance State Change """ - from nfv_vim import tables from nfv_vim import directors + from nfv_vim import tables instance_director = directors.get_instance_director() diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance_group.py b/nfv/nfv-vim/nfv_vim/objects/_instance_group.py index 30e7b57f..bf6f9cc1 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance_group.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance_group.py @@ -4,7 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.objects._object import ObjectData from nfv_common import debug from nfv_common.helpers import Constant @@ -12,6 +11,7 @@ from nfv_common.helpers import Constants from nfv_common.helpers import Singleton from nfv_vim import alarm +from nfv_vim.objects._object import ObjectData DLOG = debug.debug_get_logger('nfv_vim.objects.instance_group') diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py index d2acb7b1..c3aba029 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py @@ -4,12 +4,12 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_vim.objects._object import ObjectData from nfv_common import debug from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_vim.objects._object import ObjectData DLOG = debug.debug_get_logger('nfv_vim.objects.instance_type') diff --git a/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py b/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py index 6d8ad9dc..1df28b79 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py @@ -5,16 +5,17 @@ # from nfv_common import debug from nfv_common import timers + from nfv_common.helpers import coroutine from nfv_vim import alarm from nfv_vim import event_log from nfv_vim import nfvi -from nfv_vim.objects._sw_update import SwUpdate from nfv_vim.objects._sw_update import SW_UPDATE_ALARM_TYPES from nfv_vim.objects._sw_update import SW_UPDATE_EVENT_IDS from nfv_vim.objects._sw_update import SW_UPDATE_TYPE +from nfv_vim.objects._sw_update import SwUpdate DLOG = debug.debug_get_logger('nfv_vim.objects.sw_patch') diff --git a/nfv/nfv-vim/nfv_vim/objects/_sw_update.py b/nfv/nfv-vim/nfv_vim/objects/_sw_update.py index 0969aa8d..7273604f 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_update.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_update.py @@ -8,10 +8,11 @@ import uuid from nfv_common import debug from nfv_common import timers + from nfv_common.helpers import Constant from nfv_common.helpers import Constants -from nfv_common.helpers import Singleton from nfv_common.helpers import coroutine +from nfv_common.helpers import Singleton from nfv_vim import alarm from nfv_vim import event_log diff --git a/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py b/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py index 612ed9aa..cfaf4783 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py @@ -10,10 +10,10 @@ from nfv_vim import alarm from nfv_vim import event_log from nfv_vim import nfvi -from nfv_vim.objects._sw_update import SwUpdate from nfv_vim.objects._sw_update import SW_UPDATE_ALARM_TYPES from nfv_vim.objects._sw_update import SW_UPDATE_EVENT_IDS from nfv_vim.objects._sw_update import SW_UPDATE_TYPE +from nfv_vim.objects._sw_update import SwUpdate DLOG = debug.debug_get_logger('nfv_vim.objects.sw_upgrade') diff --git a/nfv/nfv-vim/nfv_vim/rpc/__init__.py b/nfv/nfv-vim/nfv_vim/rpc/__init__.py index a87932eb..016215e1 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/__init__.py +++ b/nfv/nfv-vim/nfv_vim/rpc/__init__.py @@ -3,82 +3,82 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION # noqa: F401 -from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE # noqa: F401 from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT # noqa: F401 +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE # noqa: F401 +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION # noqa: F401 from nfv_vim.rpc._rpc_message import RPCMessage # noqa: F401 from nfv_vim.rpc._rpc_message_image import APIRequestCreateImage # noqa: F401 -from nfv_vim.rpc._rpc_message_image import APIResponseCreateImage # noqa: F401 -from nfv_vim.rpc._rpc_message_image import APIRequestUpdateImage # noqa: F401 -from nfv_vim.rpc._rpc_message_image import APIResponseUpdateImage # noqa: F401 from nfv_vim.rpc._rpc_message_image import APIRequestDeleteImage # noqa: F401 -from nfv_vim.rpc._rpc_message_image import APIResponseDeleteImage # noqa: F401 from nfv_vim.rpc._rpc_message_image import APIRequestGetImage # noqa: F401 +from nfv_vim.rpc._rpc_message_image import APIRequestUpdateImage # noqa: F401 +from nfv_vim.rpc._rpc_message_image import APIResponseCreateImage # noqa: F401 +from nfv_vim.rpc._rpc_message_image import APIResponseDeleteImage # noqa: F401 from nfv_vim.rpc._rpc_message_image import APIResponseGetImage # noqa: F401 +from nfv_vim.rpc._rpc_message_image import APIResponseUpdateImage # noqa: F401 from nfv_vim.rpc._rpc_message_volume import APIRequestCreateVolume # noqa: F401 -from nfv_vim.rpc._rpc_message_volume import APIResponseCreateVolume # noqa: F401 -from nfv_vim.rpc._rpc_message_volume import APIRequestUpdateVolume # noqa: F401 -from nfv_vim.rpc._rpc_message_volume import APIResponseUpdateVolume # noqa: F401 from nfv_vim.rpc._rpc_message_volume import APIRequestDeleteVolume # noqa: F401 -from nfv_vim.rpc._rpc_message_volume import APIResponseDeleteVolume # noqa: F401 from nfv_vim.rpc._rpc_message_volume import APIRequestGetVolume # noqa: F401 +from nfv_vim.rpc._rpc_message_volume import APIRequestUpdateVolume # noqa: F401 +from nfv_vim.rpc._rpc_message_volume import APIResponseCreateVolume # noqa: F401 +from nfv_vim.rpc._rpc_message_volume import APIResponseDeleteVolume # noqa: F401 from nfv_vim.rpc._rpc_message_volume import APIResponseGetVolume # noqa: F401 +from nfv_vim.rpc._rpc_message_volume import APIResponseUpdateVolume # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestCreateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseCreateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestStartInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseStartInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestStopInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseStopInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestPauseInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponsePauseInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestUnpauseInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseUnpauseInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestSuspendInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseSuspendInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestResumeInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseResumeInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestRebootInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseRebootInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestLiveMigrateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseLiveMigrateInstance # noqa: F401 from nfv_vim.rpc._rpc_message_instance import APIRequestColdMigrateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseColdMigrateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIRequestEvacuateInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseEvacuateInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestCreateInstance # noqa: F401 from nfv_vim.rpc._rpc_message_instance import APIRequestDeleteInstance # noqa: F401 -from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestEvacuateInstance # noqa: F401 from nfv_vim.rpc._rpc_message_instance import APIRequestGetInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestLiveMigrateInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestPauseInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestRebootInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestResumeInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestStartInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestStopInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestSuspendInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestUnpauseInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseColdMigrateInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseCreateInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseEvacuateInstance # noqa: F401 from nfv_vim.rpc._rpc_message_instance import APIResponseGetInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseLiveMigrateInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponsePauseInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseRebootInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseResumeInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseStartInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseStopInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseSuspendInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseUnpauseInstance # noqa: F401 from nfv_vim.rpc._rpc_message_subnet import APIRequestCreateSubnet # noqa: F401 -from nfv_vim.rpc._rpc_message_subnet import APIResponseCreateSubnet # noqa: F401 -from nfv_vim.rpc._rpc_message_subnet import APIRequestUpdateSubnet # noqa: F401 -from nfv_vim.rpc._rpc_message_subnet import APIResponseUpdateSubnet # noqa: F401 from nfv_vim.rpc._rpc_message_subnet import APIRequestDeleteSubnet # noqa: F401 -from nfv_vim.rpc._rpc_message_subnet import APIResponseDeleteSubnet # noqa: F401 from nfv_vim.rpc._rpc_message_subnet import APIRequestGetSubnet # noqa: F401 +from nfv_vim.rpc._rpc_message_subnet import APIRequestUpdateSubnet # noqa: F401 +from nfv_vim.rpc._rpc_message_subnet import APIResponseCreateSubnet # noqa: F401 +from nfv_vim.rpc._rpc_message_subnet import APIResponseDeleteSubnet # noqa: F401 from nfv_vim.rpc._rpc_message_subnet import APIResponseGetSubnet # noqa: F401 +from nfv_vim.rpc._rpc_message_subnet import APIResponseUpdateSubnet # noqa: F401 from nfv_vim.rpc._rpc_message_network import APIRequestCreateNetwork # noqa: F401 -from nfv_vim.rpc._rpc_message_network import APIResponseCreateNetwork # noqa: F401 -from nfv_vim.rpc._rpc_message_network import APIRequestUpdateNetwork # noqa: F401 -from nfv_vim.rpc._rpc_message_network import APIResponseUpdateNetwork # noqa: F401 from nfv_vim.rpc._rpc_message_network import APIRequestDeleteNetwork # noqa: F401 -from nfv_vim.rpc._rpc_message_network import APIResponseDeleteNetwork # noqa: F401 from nfv_vim.rpc._rpc_message_network import APIRequestGetNetwork # noqa: F401 +from nfv_vim.rpc._rpc_message_network import APIRequestUpdateNetwork # noqa: F401 +from nfv_vim.rpc._rpc_message_network import APIResponseCreateNetwork # noqa: F401 +from nfv_vim.rpc._rpc_message_network import APIResponseDeleteNetwork # noqa: F401 from nfv_vim.rpc._rpc_message_network import APIResponseGetNetwork # noqa: F401 +from nfv_vim.rpc._rpc_message_network import APIResponseUpdateNetwork # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIRequestAbortSwUpdateStrategy # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIRequestApplySwUpdateStrategy # noqa: F401 from nfv_vim.rpc._rpc_message_sw_update import APIRequestCreateSwUpdateStrategy # noqa: F401 from nfv_vim.rpc._rpc_message_sw_update import APIRequestCreateSwUpgradeStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIResponseCreateSwUpdateStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIRequestApplySwUpdateStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIResponseApplySwUpdateStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIRequestAbortSwUpdateStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIResponseAbortSwUpdateStrategy # noqa: F401 from nfv_vim.rpc._rpc_message_sw_update import APIRequestDeleteSwUpdateStrategy # noqa: F401 -from nfv_vim.rpc._rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy # noqa: F401 from nfv_vim.rpc._rpc_message_sw_update import APIRequestGetSwUpdateStrategy # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIResponseAbortSwUpdateStrategy # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIResponseApplySwUpdateStrategy # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIResponseCreateSwUpdateStrategy # noqa: F401 +from nfv_vim.rpc._rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy # noqa: F401 from nfv_vim.rpc._rpc_message_sw_update import APIResponseGetSwUpdateStrategy # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py index b3599841..88353de6 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py @@ -79,78 +79,78 @@ class RPCMessageFactory(object): RPC Message Factory """ from nfv_vim.rpc._rpc_message_image import APIRequestCreateImage - from nfv_vim.rpc._rpc_message_image import APIResponseCreateImage - from nfv_vim.rpc._rpc_message_image import APIRequestUpdateImage - from nfv_vim.rpc._rpc_message_image import APIResponseUpdateImage from nfv_vim.rpc._rpc_message_image import APIRequestDeleteImage - from nfv_vim.rpc._rpc_message_image import APIResponseDeleteImage from nfv_vim.rpc._rpc_message_image import APIRequestGetImage + from nfv_vim.rpc._rpc_message_image import APIRequestUpdateImage + from nfv_vim.rpc._rpc_message_image import APIResponseCreateImage + from nfv_vim.rpc._rpc_message_image import APIResponseDeleteImage from nfv_vim.rpc._rpc_message_image import APIResponseGetImage + from nfv_vim.rpc._rpc_message_image import APIResponseUpdateImage from nfv_vim.rpc._rpc_message_volume import APIRequestCreateVolume - from nfv_vim.rpc._rpc_message_volume import APIResponseCreateVolume - from nfv_vim.rpc._rpc_message_volume import APIRequestUpdateVolume - from nfv_vim.rpc._rpc_message_volume import APIResponseUpdateVolume from nfv_vim.rpc._rpc_message_volume import APIRequestDeleteVolume - from nfv_vim.rpc._rpc_message_volume import APIResponseDeleteVolume from nfv_vim.rpc._rpc_message_volume import APIRequestGetVolume + from nfv_vim.rpc._rpc_message_volume import APIRequestUpdateVolume + from nfv_vim.rpc._rpc_message_volume import APIResponseCreateVolume + from nfv_vim.rpc._rpc_message_volume import APIResponseDeleteVolume from nfv_vim.rpc._rpc_message_volume import APIResponseGetVolume + from nfv_vim.rpc._rpc_message_volume import APIResponseUpdateVolume - from nfv_vim.rpc._rpc_message_instance import APIRequestCreateInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseCreateInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestStartInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseStartInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestStopInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseStopInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestPauseInstance - from nfv_vim.rpc._rpc_message_instance import APIResponsePauseInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestUnpauseInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseUnpauseInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestSuspendInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseSuspendInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestResumeInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseResumeInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestRebootInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseRebootInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestLiveMigrateInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseLiveMigrateInstance from nfv_vim.rpc._rpc_message_instance import APIRequestColdMigrateInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseColdMigrateInstance - from nfv_vim.rpc._rpc_message_instance import APIRequestEvacuateInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseEvacuateInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestCreateInstance from nfv_vim.rpc._rpc_message_instance import APIRequestDeleteInstance - from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestEvacuateInstance from nfv_vim.rpc._rpc_message_instance import APIRequestGetInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestLiveMigrateInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestPauseInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestRebootInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestResumeInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestStartInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestStopInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestSuspendInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestUnpauseInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseColdMigrateInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseCreateInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseEvacuateInstance from nfv_vim.rpc._rpc_message_instance import APIResponseGetInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseLiveMigrateInstance + from nfv_vim.rpc._rpc_message_instance import APIResponsePauseInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseRebootInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseResumeInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseStartInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseStopInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseSuspendInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseUnpauseInstance from nfv_vim.rpc._rpc_message_subnet import APIRequestCreateSubnet - from nfv_vim.rpc._rpc_message_subnet import APIResponseCreateSubnet - from nfv_vim.rpc._rpc_message_subnet import APIRequestUpdateSubnet - from nfv_vim.rpc._rpc_message_subnet import APIResponseUpdateSubnet from nfv_vim.rpc._rpc_message_subnet import APIRequestDeleteSubnet - from nfv_vim.rpc._rpc_message_subnet import APIResponseDeleteSubnet from nfv_vim.rpc._rpc_message_subnet import APIRequestGetSubnet + from nfv_vim.rpc._rpc_message_subnet import APIRequestUpdateSubnet + from nfv_vim.rpc._rpc_message_subnet import APIResponseCreateSubnet + from nfv_vim.rpc._rpc_message_subnet import APIResponseDeleteSubnet from nfv_vim.rpc._rpc_message_subnet import APIResponseGetSubnet + from nfv_vim.rpc._rpc_message_subnet import APIResponseUpdateSubnet from nfv_vim.rpc._rpc_message_network import APIRequestCreateNetwork - from nfv_vim.rpc._rpc_message_network import APIResponseCreateNetwork - from nfv_vim.rpc._rpc_message_network import APIRequestUpdateNetwork - from nfv_vim.rpc._rpc_message_network import APIResponseUpdateNetwork from nfv_vim.rpc._rpc_message_network import APIRequestDeleteNetwork - from nfv_vim.rpc._rpc_message_network import APIResponseDeleteNetwork from nfv_vim.rpc._rpc_message_network import APIRequestGetNetwork + from nfv_vim.rpc._rpc_message_network import APIRequestUpdateNetwork + from nfv_vim.rpc._rpc_message_network import APIResponseCreateNetwork + from nfv_vim.rpc._rpc_message_network import APIResponseDeleteNetwork from nfv_vim.rpc._rpc_message_network import APIResponseGetNetwork + from nfv_vim.rpc._rpc_message_network import APIResponseUpdateNetwork + from nfv_vim.rpc._rpc_message_sw_update import APIRequestAbortSwUpdateStrategy + from nfv_vim.rpc._rpc_message_sw_update import APIRequestApplySwUpdateStrategy from nfv_vim.rpc._rpc_message_sw_update import APIRequestCreateSwUpdateStrategy from nfv_vim.rpc._rpc_message_sw_update import APIRequestCreateSwUpgradeStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIResponseCreateSwUpdateStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIRequestApplySwUpdateStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIResponseApplySwUpdateStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIRequestAbortSwUpdateStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIResponseAbortSwUpdateStrategy from nfv_vim.rpc._rpc_message_sw_update import APIRequestDeleteSwUpdateStrategy - from nfv_vim.rpc._rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy from nfv_vim.rpc._rpc_message_sw_update import APIRequestGetSwUpdateStrategy + from nfv_vim.rpc._rpc_message_sw_update import APIResponseAbortSwUpdateStrategy + from nfv_vim.rpc._rpc_message_sw_update import APIResponseApplySwUpdateStrategy + from nfv_vim.rpc._rpc_message_sw_update import APIResponseCreateSwUpdateStrategy + from nfv_vim.rpc._rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy from nfv_vim.rpc._rpc_message_sw_update import APIResponseGetSwUpdateStrategy _rpc_msg_class_map = { diff --git a/nfv/nfv-vim/nfv_vim/strategy/__init__.py b/nfv/nfv-vim/nfv_vim/strategy/__init__.py index 04b0b48b..916f01c7 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/__init__.py +++ b/nfv/nfv-vim/nfv_vim/strategy/__init__.py @@ -4,28 +4,28 @@ # SPDX-License-Identifier: Apache-2.0 # from nfv_common.strategy import * # noqa: F401,F403 -from nfv_vim.strategy._strategy_defs import STRATEGY_EVENT # noqa: F401 +from nfv_vim.strategy._strategy import strategy_rebuild_from_dict # noqa: F401 from nfv_vim.strategy._strategy import SwPatchStrategy # noqa: F401 from nfv_vim.strategy._strategy import SwUpgradeStrategy # noqa: F401 -from nfv_vim.strategy._strategy import strategy_rebuild_from_dict # noqa: F401 +from nfv_vim.strategy._strategy_defs import STRATEGY_EVENT # noqa: F401 from nfv_vim.strategy._strategy_stages import STRATEGY_STAGE_NAME # noqa: F401 +from nfv_vim.strategy._strategy_steps import DisableHostServicesStep # noqa: F401 from nfv_vim.strategy._strategy_steps import LockHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import UnlockHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import RebootHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import SwactHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import UpgradeHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import UpgradeStartStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import UpgradeActivateStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import UpgradeCompleteStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import SwPatchHostsStep # noqa: F401 from nfv_vim.strategy._strategy_steps import MigrateInstancesStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import StopInstancesStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import StartInstancesStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import SystemStabilizeStep # noqa: F401 from nfv_vim.strategy._strategy_steps import QueryAlarmsStep # noqa: F401 from nfv_vim.strategy._strategy_steps import QuerySwPatchesStep # noqa: F401 from nfv_vim.strategy._strategy_steps import QuerySwPatchHostsStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import WaitDataSyncStep # noqa: F401 from nfv_vim.strategy._strategy_steps import QueryUpgradeStep # noqa: F401 -from nfv_vim.strategy._strategy_steps import DisableHostServicesStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import RebootHostsStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import StartInstancesStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import StopInstancesStep # noqa: F401 from nfv_vim.strategy._strategy_steps import STRATEGY_STEP_NAME # noqa: F401 +from nfv_vim.strategy._strategy_steps import SwactHostsStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import SwPatchHostsStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import SystemStabilizeStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import UnlockHostsStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import UpgradeActivateStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import UpgradeCompleteStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import UpgradeHostsStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import UpgradeStartStep # noqa: F401 +from nfv_vim.strategy._strategy_steps import WaitDataSyncStep # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py index 08f7b87b..6b4addc8 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py @@ -7,21 +7,20 @@ import six import weakref from nfv_common import debug -from nfv_common import strategy from nfv_common.helpers import Constant from nfv_common.helpers import Constants -from nfv_common.helpers import Singleton from nfv_common.helpers import get_local_host_name - -from nfv_vim.objects import SW_UPDATE_APPLY_TYPE -from nfv_vim.objects import SW_UPDATE_INSTANCE_ACTION -from nfv_vim.objects import HOST_PERSONALITY +from nfv_common.helpers import Singleton +from nfv_common import strategy +from nfv_vim.nfvi.objects.v1 import UPGRADE_STATE from nfv_vim.objects import HOST_GROUP_POLICY from nfv_vim.objects import HOST_NAME -from nfv_vim.objects import INSTANCE_GROUP_POLICY +from nfv_vim.objects import HOST_PERSONALITY from nfv_vim.objects import HOST_SERVICES +from nfv_vim.objects import INSTANCE_GROUP_POLICY +from nfv_vim.objects import SW_UPDATE_APPLY_TYPE +from nfv_vim.objects import SW_UPDATE_INSTANCE_ACTION -from nfv_vim.nfvi.objects.v1 import UPGRADE_STATE DLOG = debug.debug_get_logger('nfv_vim.strategy') @@ -546,8 +545,8 @@ class SwPatchStrategy(SwUpdateStrategy): """ Add controller software patch strategy stages """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables if SW_UPDATE_APPLY_TYPE.IGNORE != self._controller_apply_type: host_table = tables.tables_get_host_table() @@ -669,8 +668,8 @@ class SwPatchStrategy(SwUpdateStrategy): """ Add swift software patch strategy stages """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables if SW_UPDATE_APPLY_TYPE.IGNORE != self._swift_apply_type: host_table = tables.tables_get_host_table() @@ -717,8 +716,8 @@ class SwPatchStrategy(SwUpdateStrategy): """ Add worker software patch strategy stages """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables if SW_UPDATE_APPLY_TYPE.IGNORE != self._worker_apply_type: # When using a single controller/worker host, only allow the @@ -839,8 +838,8 @@ class SwPatchStrategy(SwUpdateStrategy): """ Strategy Build Complete """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables result, result_reason = \ super(SwPatchStrategy, self).build_complete(result, result_reason) @@ -1167,8 +1166,8 @@ class SwUpgradeStrategy(SwUpdateStrategy): """ Add upgrade start strategy stage """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables host_table = tables.tables_get_host_table() controller_1_host = None @@ -1192,8 +1191,8 @@ class SwUpgradeStrategy(SwUpdateStrategy): """ Add upgrade complete strategy stage """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables host_table = tables.tables_get_host_table() controller_1_host = None @@ -1218,8 +1217,8 @@ class SwUpgradeStrategy(SwUpdateStrategy): """ Add controller software upgrade strategy stages """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables host_table = tables.tables_get_host_table() @@ -1335,8 +1334,8 @@ class SwUpgradeStrategy(SwUpdateStrategy): """ Add worker software upgrade strategy stages """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables host_lists, reason = self._create_worker_host_lists(worker_hosts, reboot) if host_lists is None: @@ -1404,8 +1403,8 @@ class SwUpgradeStrategy(SwUpdateStrategy): """ Strategy Build Complete """ - from nfv_vim import tables from nfv_vim import strategy + from nfv_vim import tables result, result_reason = \ super(SwUpgradeStrategy, self).build_complete(result, result_reason) diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py index 6dd12a5c..9f157035 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py @@ -6,10 +6,10 @@ import six from nfv_common import debug -from nfv_common import strategy from nfv_common.helpers import Constant from nfv_common.helpers import Constants from nfv_common.helpers import Singleton +from nfv_common import strategy DLOG = debug.debug_get_logger('nfv_vim.strategy.stage') diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py index 3315496b..fe15f093 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py @@ -5,18 +5,16 @@ # import six -from nfv_common import strategy -from nfv_common import timers from nfv_common import debug from nfv_common.helpers import Constant from nfv_common.helpers import Constants -from nfv_common.helpers import Singleton from nfv_common.helpers import coroutine - +from nfv_common.helpers import Singleton +from nfv_common import strategy +from nfv_common import timers from nfv_vim import objects -from nfv_vim import tables - from nfv_vim.strategy._strategy_defs import STRATEGY_EVENT +from nfv_vim import tables DLOG = debug.debug_get_logger('nfv_vim.strategy.step') diff --git a/nfv/nfv-vim/nfv_vim/tables/__init__.py b/nfv/nfv-vim/nfv_vim/tables/__init__.py index e8b23c95..1a1120d8 100755 --- a/nfv/nfv-vim/nfv_vim/tables/__init__.py +++ b/nfv/nfv-vim/nfv_vim/tables/__init__.py @@ -3,20 +3,20 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_vim.tables._image_table import tables_get_image_table # noqa: F401 -from nfv_vim.tables._volume_table import tables_get_volume_table # noqa: F401 -from nfv_vim.tables._volume_snapshot_table import tables_get_volume_snapshot_table # noqa: F401 -from nfv_vim.tables._tenant_table import tables_get_tenant_table # noqa: F401 -from nfv_vim.tables._system_table import tables_get_system_table # noqa: F401 +from nfv_vim.tables._host_aggregate_table import tables_get_host_aggregate_table # noqa: F401 from nfv_vim.tables._host_group_table import tables_get_host_group_table # noqa: F401 from nfv_vim.tables._host_table import tables_get_host_table # noqa: F401 -from nfv_vim.tables._subnet_table import tables_get_subnet_table # noqa: F401 -from nfv_vim.tables._network_table import tables_get_network_table # noqa: F401 -from nfv_vim.tables._service_host_table import tables_get_service_host_table # noqa: F401 from nfv_vim.tables._hypervisor_table import tables_get_hypervisor_table # noqa: F401 -from nfv_vim.tables._instance_type_table import tables_get_instance_type_table # noqa: F401 +from nfv_vim.tables._image_table import tables_get_image_table # noqa: F401 from nfv_vim.tables._instance_group_table import tables_get_instance_group_table # noqa: F401 from nfv_vim.tables._instance_table import tables_get_instance_table # noqa: F401 -from nfv_vim.tables._host_aggregate_table import tables_get_host_aggregate_table # noqa: F401 -from nfv_vim.tables._tables_module import tables_initialize # noqa: F401 +from nfv_vim.tables._instance_type_table import tables_get_instance_type_table # noqa: F401 +from nfv_vim.tables._network_table import tables_get_network_table # noqa: F401 +from nfv_vim.tables._service_host_table import tables_get_service_host_table # noqa: F401 +from nfv_vim.tables._subnet_table import tables_get_subnet_table # noqa: F401 +from nfv_vim.tables._system_table import tables_get_system_table # noqa: F401 from nfv_vim.tables._tables_module import tables_finalize # noqa: F401 +from nfv_vim.tables._tables_module import tables_initialize # noqa: F401 +from nfv_vim.tables._tenant_table import tables_get_tenant_table # noqa: F401 +from nfv_vim.tables._volume_snapshot_table import tables_get_volume_snapshot_table # noqa: F401 +from nfv_vim.tables._volume_table import tables_get_volume_table # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/tables/_tables_module.py b/nfv/nfv-vim/nfv_vim/tables/_tables_module.py index 96020a99..06105f3c 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_tables_module.py +++ b/nfv/nfv-vim/nfv_vim/tables/_tables_module.py @@ -3,36 +3,36 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_vim.tables._image_table import image_table_initialize -from nfv_vim.tables._image_table import image_table_finalize -from nfv_vim.tables._volume_table import volume_table_initialize -from nfv_vim.tables._volume_table import volume_table_finalize -from nfv_vim.tables._volume_snapshot_table import volume_snapshot_table_initialize -from nfv_vim.tables._volume_snapshot_table import volume_snapshot_table_finalize -from nfv_vim.tables._tenant_table import tenant_table_initialize -from nfv_vim.tables._tenant_table import tenant_table_finalize -from nfv_vim.tables._system_table import system_table_initialize -from nfv_vim.tables._system_table import system_table_finalize -from nfv_vim.tables._host_table import host_table_initialize -from nfv_vim.tables._host_table import host_table_finalize -from nfv_vim.tables._host_group_table import host_group_table_initialize -from nfv_vim.tables._host_group_table import host_group_table_finalize -from nfv_vim.tables._hypervisor_table import hypervisor_table_initialize -from nfv_vim.tables._hypervisor_table import hypervisor_table_finalize -from nfv_vim.tables._instance_table import instance_table_initialize -from nfv_vim.tables._instance_table import instance_table_finalize -from nfv_vim.tables._instance_type_table import instance_type_table_initialize -from nfv_vim.tables._instance_type_table import instance_type_table_finalize -from nfv_vim.tables._instance_group_table import instance_group_table_initialize -from nfv_vim.tables._instance_group_table import instance_group_table_finalize -from nfv_vim.tables._service_host_table import service_host_table_initialize -from nfv_vim.tables._service_host_table import service_host_table_finalize -from nfv_vim.tables._host_aggregate_table import host_aggregate_table_initialize from nfv_vim.tables._host_aggregate_table import host_aggregate_table_finalize -from nfv_vim.tables._subnet_table import subnet_table_initialize -from nfv_vim.tables._subnet_table import subnet_table_finalize -from nfv_vim.tables._network_table import network_table_initialize +from nfv_vim.tables._host_aggregate_table import host_aggregate_table_initialize +from nfv_vim.tables._host_group_table import host_group_table_finalize +from nfv_vim.tables._host_group_table import host_group_table_initialize +from nfv_vim.tables._host_table import host_table_finalize +from nfv_vim.tables._host_table import host_table_initialize +from nfv_vim.tables._hypervisor_table import hypervisor_table_finalize +from nfv_vim.tables._hypervisor_table import hypervisor_table_initialize +from nfv_vim.tables._image_table import image_table_finalize +from nfv_vim.tables._image_table import image_table_initialize +from nfv_vim.tables._instance_group_table import instance_group_table_finalize +from nfv_vim.tables._instance_group_table import instance_group_table_initialize +from nfv_vim.tables._instance_table import instance_table_finalize +from nfv_vim.tables._instance_table import instance_table_initialize +from nfv_vim.tables._instance_type_table import instance_type_table_finalize +from nfv_vim.tables._instance_type_table import instance_type_table_initialize from nfv_vim.tables._network_table import network_table_finalize +from nfv_vim.tables._network_table import network_table_initialize +from nfv_vim.tables._service_host_table import service_host_table_finalize +from nfv_vim.tables._service_host_table import service_host_table_initialize +from nfv_vim.tables._subnet_table import subnet_table_finalize +from nfv_vim.tables._subnet_table import subnet_table_initialize +from nfv_vim.tables._system_table import system_table_finalize +from nfv_vim.tables._system_table import system_table_initialize +from nfv_vim.tables._tenant_table import tenant_table_finalize +from nfv_vim.tables._tenant_table import tenant_table_initialize +from nfv_vim.tables._volume_snapshot_table import volume_snapshot_table_finalize +from nfv_vim.tables._volume_snapshot_table import volume_snapshot_table_initialize +from nfv_vim.tables._volume_table import volume_table_finalize +from nfv_vim.tables._volume_table import volume_table_initialize def tables_initialize(): diff --git a/nfv/nfv-vim/nfv_vim/vim.py b/nfv/nfv-vim/nfv_vim/vim.py index 1f9a605d..59756afe 100755 --- a/nfv/nfv-vim/nfv_vim/vim.py +++ b/nfv/nfv-vim/nfv_vim/vim.py @@ -3,28 +3,28 @@ # # SPDX-License-Identifier: Apache-2.0 # -import os -import sys -import signal import argparse +import os +import signal +import sys -from nfv_common import debug -from nfv_common import config -from nfv_common import selobj -from nfv_common import timers from nfv_common import alarm +from nfv_common import config +from nfv_common import debug from nfv_common import event_log from nfv_common import histogram from nfv_common import profiler from nfv_common import schedule +from nfv_common import selobj +from nfv_common import timers -from nfv_vim import nfvi -from nfv_vim import database -from nfv_vim import tables -from nfv_vim import directors -from nfv_vim import events from nfv_vim import audits +from nfv_vim import database +from nfv_vim import directors from nfv_vim import dor +from nfv_vim import events +from nfv_vim import nfvi +from nfv_vim import tables PROCESS_TICK_INTERVAL_IN_MS = 500 PROCESS_TICK_MAX_DELAY_IN_MS = 3000 diff --git a/nfv/nfv-vim/nfv_vim/vim_api.py b/nfv/nfv-vim/nfv_vim/vim_api.py index 50feb55a..364332f0 100755 --- a/nfv/nfv-vim/nfv_vim/vim_api.py +++ b/nfv/nfv-vim/nfv_vim/vim_api.py @@ -3,20 +3,19 @@ # # SPDX-License-Identifier: Apache-2.0 # -import sys -import signal -import socket import argparse from netaddr import IPAddress - +import signal +import socket +import sys from wsgiref import simple_server from nfv_common import config +from nfv_common import debug from nfv_common import selobj from nfv_common import timers -from nfv_common import debug -from nfv_common.helpers import coroutine +from nfv_common.helpers import coroutine from nfv_vim.api import Application PROCESS_TICK_INTERVAL_IN_MS = 500 diff --git a/nfv/nfv-vim/nfv_vim/vim_manage.py b/nfv/nfv-vim/nfv_vim/vim_manage.py index 6de13f0a..ecf4d94a 100755 --- a/nfv/nfv-vim/nfv_vim/vim_manage.py +++ b/nfv/nfv-vim/nfv_vim/vim_manage.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import sys import argparse +import sys from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/vim_webserver.py b/nfv/nfv-vim/nfv_vim/vim_webserver.py index 3b0c88e5..86fc1234 100755 --- a/nfv/nfv-vim/nfv_vim/vim_webserver.py +++ b/nfv/nfv-vim/nfv_vim/vim_webserver.py @@ -3,12 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -import sys -import signal import argparse +import signal +import sys -from nfv_common import debug from nfv_common import config +from nfv_common import debug from nfv_common import selobj from nfv_common import timers diff --git a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py index 62b3d193..44133cd8 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py +++ b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py @@ -4,19 +4,20 @@ # SPDX-License-Identifier: Apache-2.0 # import datetime -from six.moves import http_client as httplib import json import re +from six.moves import http_client as httplib import socket import threading -from SocketServer import ThreadingMixIn + from BaseHTTPServer import BaseHTTPRequestHandler from BaseHTTPServer import HTTPServer +from SocketServer import ThreadingMixIn from nfv_common import debug from nfv_plugins.nfvi_plugins import config -from nfv_plugins.nfvi_plugins.openstack import openstack from nfv_plugins.nfvi_plugins.openstack import fm +from nfv_plugins.nfvi_plugins.openstack import openstack from nfv_vim import database DLOG = debug.debug_get_logger('nfv_vim.webserver.webserver') diff --git a/nfv/tox.ini b/nfv/tox.ini index 0ab26612..f736c338 100755 --- a/nfv/tox.ini +++ b/nfv/tox.ini @@ -67,7 +67,6 @@ verbosity=2 # E501 line too long # - hacking codes - # H104: File contains nothing but comments -# H306: imports not in alphabetical order # H404: multi line docstring should start without a leading new line # H405: multi line docstring summary not separated with an empty line # H501: Do not use self.__dict__ for string formatting @@ -75,7 +74,7 @@ verbosity=2 # F821 undefined name 'unicode' (python3 specific) # F823 local variable referenced before assignment # F841 local variable 'e' is assigned to but never used -ignore = E121,E122,E123,E124,E126,E127,E128,E129,E501,H104,H306,H404,H405,H501,F821,F823,F841 +ignore = E121,E122,E123,E124,E126,E127,E128,E129,E501,H104,H404,H405,H501,F821,F823,F841 # H106 Don’t put vim configuration in source files (off by default). # H203 Use assertIs(Not)None to check for None (off by default). # TODO: enable: H904 Delay string interpolations at logging calls (off by default).