diff --git a/nfv/nfv-client/nfv_client/openstack/openstack.py b/nfv/nfv-client/nfv_client/openstack/openstack.py index 4f378a70..c8092786 100755 --- a/nfv/nfv-client/nfv_client/openstack/openstack.py +++ b/nfv/nfv-client/nfv_client/openstack/openstack.py @@ -6,7 +6,7 @@ import json import urllib2 -from objects import Token +from nfv_client.openstack.objects import Token class OpenStackServices(object): diff --git a/nfv/nfv-client/nfv_client/openstack/sw_update.py b/nfv/nfv-client/nfv_client/openstack/sw_update.py index 4bedf551..4109686c 100755 --- a/nfv/nfv-client/nfv_client/openstack/sw_update.py +++ b/nfv/nfv-client/nfv_client/openstack/sw_update.py @@ -4,7 +4,7 @@ # SPDX-License-Identifier: Apache-2.0 # import json -import rest_api +from nfv_client.openstack import rest_api class StrategyStep(object): diff --git a/nfv/nfv-client/nfv_client/sw_update/__init__.py b/nfv/nfv-client/nfv_client/sw_update/__init__.py index 954f8dc3..478439b4 100755 --- a/nfv/nfv-client/nfv_client/sw_update/__init__.py +++ b/nfv/nfv-client/nfv_client/sw_update/__init__.py @@ -2,19 +2,17 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _sw_update import STRATEGY_NAME_SW_PATCH -from _sw_update import STRATEGY_NAME_SW_UPGRADE -from _sw_update import APPLY_TYPE_SERIAL -from _sw_update import APPLY_TYPE_PARALLEL -from _sw_update import APPLY_TYPE_IGNORE -from _sw_update import INSTANCE_ACTION_MIGRATE -from _sw_update import INSTANCE_ACTION_STOP_START -from _sw_update import ALARM_RESTRICTIONS_STRICT -from _sw_update import ALARM_RESTRICTIONS_RELAXED -from _sw_update import create_strategy -from _sw_update import delete_strategy -from _sw_update import apply_strategy -from _sw_update import abort_strategy -from _sw_update import show_strategy +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 ALARM_RESTRICTIONS_RELAXED # 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 show_strategy # noqa: F401 diff --git a/nfv/nfv-client/setup.py b/nfv/nfv-client/setup.py index 0a9f94e2..86fab4c6 100755 --- a/nfv/nfv-client/setup.py +++ b/nfv/nfv-client/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='nfv_client', diff --git a/nfv/nfv-common/nfv_common/alarm/__init__.py b/nfv/nfv-common/nfv_common/alarm/__init__.py index a5a3f12b..7be0601c 100755 --- a/nfv/nfv-common/nfv_common/alarm/__init__.py +++ b/nfv/nfv-common/nfv_common/alarm/__init__.py @@ -3,17 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from objects.v1 import ALARM_CONTEXT -from objects.v1 import ALARM_TYPE -from objects.v1 import ALARM_EVENT_TYPE -from objects.v1 import ALARM_PROBABLE_CAUSE -from objects.v1 import ALARM_SEVERITY -from objects.v1 import ALARM_TREND_INDICATION -from objects.v1 import AlarmStateData -from objects.v1 import AlarmThresholdData -from objects.v1 import AlarmData +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 AlarmStateData # noqa: F401 +from nfv_common.alarm.objects.v1 import AlarmThresholdData # noqa: F401 +from nfv_common.alarm.objects.v1 import AlarmData # noqa: F401 -from _alarm_module import alarm_raise, alarm_clear -from _alarm_module import alarm_subsystem_sane, alarm_initialize, alarm_finalize +from nfv_common.alarm._alarm_module import alarm_clear # noqa: F401 +from nfv_common.alarm._alarm_module import alarm_finalize # noqa: F401 +from nfv_common.alarm._alarm_module import alarm_initialize # noqa: F401 +from nfv_common.alarm._alarm_module import alarm_raise # noqa: F401 +from nfv_common.alarm._alarm_module import alarm_subsystem_sane # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/alarm/_alarm_module.py b/nfv/nfv-common/nfv_common/alarm/_alarm_module.py index 9692f501..98f24ed8 100755 --- a/nfv/nfv-common/nfv_common/alarm/_alarm_module.py +++ b/nfv/nfv-common/nfv_common/alarm/_alarm_module.py @@ -12,7 +12,7 @@ def alarm_raise(alarm_uuid, alarm_data): """ Raise an alarm """ - from _alarm_thread import AlarmThread + from nfv_common.alarm._alarm_thread import AlarmThread AlarmThread().alarm_raise(alarm_uuid, alarm_data) @@ -20,7 +20,7 @@ def alarm_clear(alarm_uuid): """ Clear an alarm """ - from _alarm_thread import AlarmThread + from nfv_common.alarm._alarm_thread import AlarmThread AlarmThread().alarm_clear(alarm_uuid) @@ -28,7 +28,7 @@ def alarm_subsystem_sane(): """ Returns true if the alarm subsystem is healthy """ - from _alarm_thread import AlarmThread + from nfv_common.alarm._alarm_thread import AlarmThread return 600 >= AlarmThread().stall_elapsed_secs @@ -36,7 +36,7 @@ def alarm_initialize(config): """ Initialize the alarm subsystem """ - from _alarm_thread import AlarmThread + from nfv_common.alarm._alarm_thread import AlarmThread AlarmThread(config).start() @@ -44,5 +44,5 @@ def alarm_finalize(): """ Finalize the alarm subsystem """ - from _alarm_thread import AlarmThread + from nfv_common.alarm._alarm_thread import AlarmThread AlarmThread().stop(max_wait_in_seconds=5) diff --git a/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py b/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py index 42252ded..d89b221b 100755 --- a/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py +++ b/nfv/nfv-common/nfv_common/alarm/_alarm_thread.py @@ -3,15 +3,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import datetime +import six from nfv_common import debug from nfv_common import thread from nfv_common import timers -from nfv_common.helpers import Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Singleton -from _alarm_handlers import AlarmHandlers +from nfv_common.alarm._alarm_handlers import AlarmHandlers DLOG = debug.debug_get_logger('nfv_common.alarm.alarm_thread') diff --git a/nfv/nfv-common/nfv_common/alarm/handlers/v1/__init__.py b/nfv/nfv-common/nfv_common/alarm/handlers/v1/__init__.py index f3fb86b2..fb3bca48 100755 --- a/nfv/nfv-common/nfv_common/alarm/handlers/v1/__init__.py +++ b/nfv/nfv-common/nfv_common/alarm/handlers/v1/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _alarm_handler import AlarmHandler +from nfv_common.alarm.handlers.v1._alarm_handler import AlarmHandler # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/alarm/objects/__init__.py b/nfv/nfv-common/nfv_common/alarm/objects/__init__.py index 90b33192..db4c0bab 100755 --- a/nfv/nfv-common/nfv_common/alarm/objects/__init__.py +++ b/nfv/nfv-common/nfv_common/alarm/objects/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import v1 +import nfv_common.alarm.objects.v1 # noqa: F401 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 25dc7c7c..20f3e2ce 100755 --- a/nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py +++ b/nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py @@ -3,8 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _alarm_defs import ALARM_CONTEXT, ALARM_TYPE, ALARM_EVENT_TYPE -from _alarm_defs import ALARM_PROBABLE_CAUSE, ALARM_SEVERITY, ALARM_TREND_INDICATION -from _alarm_data import AlarmData, AlarmStateData, AlarmThresholdData +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 diff --git a/nfv/nfv-common/nfv_common/alarm/objects/v1/_alarm_defs.py b/nfv/nfv-common/nfv_common/alarm/objects/v1/_alarm_defs.py index cc816753..118a2a0e 100755 --- a/nfv/nfv-common/nfv_common/alarm/objects/v1/_alarm_defs.py +++ b/nfv/nfv-common/nfv_common/alarm/objects/v1/_alarm_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/catalog/__init__.py b/nfv/nfv-common/nfv_common/catalog/__init__.py index 01975855..f2f219dc 100755 --- a/nfv/nfv-common/nfv_common/catalog/__init__.py +++ b/nfv/nfv-common/nfv_common/catalog/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import model +import nfv_common.catalog.model # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/catalog/_catalog_module.py b/nfv/nfv-common/nfv_common/catalog/_catalog_module.py index 41e3e7ce..9b59512b 100755 --- a/nfv/nfv-common/nfv_common/catalog/_catalog_module.py +++ b/nfv/nfv-common/nfv_common/catalog/_catalog_module.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _catalog_backend import CatalogBackend +from nfv_common.catalog._catalog_backend import CatalogBackend _catalog_backend = None diff --git a/nfv/nfv-common/nfv_common/catalog/model/__init__.py b/nfv/nfv-common/nfv_common/catalog/model/__init__.py index 05ed99b3..e45fd33a 100755 --- a/nfv/nfv-common/nfv_common/catalog/model/__init__.py +++ b/nfv/nfv-common/nfv_common/catalog/model/__init__.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _defs import CONNECTION_TYPE, CONNECTIVITY_TYPE -from _vnf_descriptor import VNFD, ConnectionPointVNFD, VirtualLink -from _vnf_descriptor import DeploymentFlavor, ConstituentVDU -from _vnf_descriptor import VDU, VNFC, ConnectionPointVNFC +from nfv_common.catalog.model._defs import CONNECTION_TYPE # noqa: F401 +from nfv_common.catalog.model._defs import CONNECTIVITY_TYPE # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import ConnectionPointVNFC # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import ConnectionPointVNFD # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import ConstituentVDU # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import DeploymentFlavor # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import VDU # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import VirtualLink # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import VNFC # noqa: F401 +from nfv_common.catalog.model._vnf_descriptor import VNFD # 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 f35a6f82..27da0043 100755 --- a/nfv/nfv-common/nfv_common/catalog/model/_defs.py +++ b/nfv/nfv-common/nfv_common/catalog/model/_defs.py @@ -4,7 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/catalog/model/_vnf_descriptor.py b/nfv/nfv-common/nfv_common/catalog/model/_vnf_descriptor.py index 1def1d8c..232ac831 100755 --- a/nfv/nfv-common/nfv_common/catalog/model/_vnf_descriptor.py +++ b/nfv/nfv-common/nfv_common/catalog/model/_vnf_descriptor.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _defs import CONNECTIVITY_TYPE, CONNECTION_TYPE +from nfv_common.catalog.model._defs import CONNECTION_TYPE +from nfv_common.catalog.model._defs import CONNECTIVITY_TYPE # # Virtual Network Function Descriptor - Class Layout diff --git a/nfv/nfv-common/nfv_common/catalog/plugin/v1/_catalog_plugin.py b/nfv/nfv-common/nfv_common/catalog/plugin/v1/_catalog_plugin.py index 3adf14bc..63c886f9 100755 --- a/nfv/nfv-common/nfv_common/catalog/plugin/v1/_catalog_plugin.py +++ b/nfv/nfv-common/nfv_common/catalog/plugin/v1/_catalog_plugin.py @@ -4,7 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from abc import ABCMeta, abstractproperty, abstractmethod + +from abc import ABCMeta +from abc import abstractmethod +from abc import abstractproperty @six.add_metaclass(ABCMeta) diff --git a/nfv/nfv-common/nfv_common/debug/__init__.py b/nfv/nfv-common/nfv_common/debug/__init__.py index 982658c8..1f9060e5 100755 --- a/nfv/nfv-common/nfv_common/debug/__init__.py +++ b/nfv/nfv-common/nfv_common/debug/__init__.py @@ -2,11 +2,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _debug_defs import DEBUG_LEVEL -from _debug_log import debug_trace, debug_get_logger, debug_dump_loggers -from _debug_module import debug_register_config_change_callback -from _debug_module import debug_deregister_config_change_callback -from _debug_module import debug_get_config, debug_reload_config -from _debug_module import debug_initialize, debug_finalize +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_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 diff --git a/nfv/nfv-common/nfv_common/debug/_debug_config.py b/nfv/nfv-common/nfv_common/debug/_debug_config.py index 02ee4cf9..9d3d033f 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_config.py +++ b/nfv/nfv-common/nfv_common/debug/_debug_config.py @@ -6,7 +6,7 @@ import six from six.moves import configparser -from _debug_defs import DEBUG_LEVEL +from nfv_common.debug._debug_defs import DEBUG_LEVEL from nfv_common.helpers import Singleton diff --git a/nfv/nfv-common/nfv_common/debug/_debug_defs.py b/nfv/nfv-common/nfv_common/debug/_debug_defs.py index 3a3187d9..358842f0 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_defs.py +++ b/nfv/nfv-common/nfv_common/debug/_debug_defs.py @@ -5,7 +5,8 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/debug/_debug_log.py b/nfv/nfv-common/nfv_common/debug/_debug_log.py index 07d6a97c..148060cc 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_log.py +++ b/nfv/nfv-common/nfv_common/debug/_debug_log.py @@ -3,17 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # +import datetime +import functools +import inspect +import logging import os import six import sys -import inspect -import logging -import datetime -import functools -from _debug_defs import DEBUG_LEVEL -from _debug_thread import DebugLoggingThread -from _debug_module import Debug +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 _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 6cafd0b6..48ce708c 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_module.py +++ b/nfv/nfv-common/nfv_common/debug/_debug_module.py @@ -8,9 +8,9 @@ import sys from nfv_common.helpers import Singleton -from _debug_defs import DEBUG_LEVEL -from _debug_config import DebugConfig -from _debug_thread import DebugLoggingThread +from nfv_common.debug._debug_defs import DEBUG_LEVEL +from nfv_common.debug._debug_config import DebugConfig +from nfv_common.debug._debug_thread import DebugLoggingThread @six.add_metaclass(Singleton) @@ -47,7 +47,8 @@ class Debug(object): """ Load debug configuration settings """ - from _debug_log import debug_get_logger, debug_set_loggers_level + from nfv_common.debug._debug_log import debug_get_logger + from nfv_common.debug._debug_log import debug_set_loggers_level if self._debug_config is not None: self._debug_config.load() @@ -61,7 +62,8 @@ class Debug(object): """ Reload debug configuration settings """ - from _debug_log import debug_get_logger, debug_set_loggers_level + from nfv_common.debug._debug_log import debug_get_logger + from nfv_common.debug._debug_log import debug_set_loggers_level if self._debug_config is not None: self._debug_config.load() diff --git a/nfv/nfv-common/nfv_common/debug/_debug_thread.py b/nfv/nfv-common/nfv_common/debug/_debug_thread.py index 12c6daec..98cbaf30 100755 --- a/nfv/nfv-common/nfv_common/debug/_debug_thread.py +++ b/nfv/nfv-common/nfv_common/debug/_debug_thread.py @@ -3,11 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # +import logging +import multiprocessing import six import sys -import logging import threading -import multiprocessing from logging.handlers import SysLogHandler diff --git a/nfv/nfv-common/nfv_common/event_log/__init__.py b/nfv/nfv-common/nfv_common/event_log/__init__.py index db979e93..e7efed5b 100755 --- a/nfv/nfv-common/nfv_common/event_log/__init__.py +++ b/nfv/nfv-common/nfv_common/event_log/__init__.py @@ -3,14 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from objects.v1 import EVENT_ID -from objects.v1 import EVENT_CONTEXT -from objects.v1 import EVENT_TYPE -from objects.v1 import EVENT_IMPORTANCE -from objects.v1 import EVENT_INITIATED_BY -from objects.v1 import EventLogStateData -from objects.v1 import EventLogThresholdData, EventLogData -from _event_log_module import event_log, event_log_subsystem_sane -from _event_log_module import event_log_initialize, event_log_finalize +from nfv_common.event_log.objects.v1 import EVENT_ID # 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_IMPORTANCE # noqa: F401 +from nfv_common.event_log.objects.v1 import EVENT_INITIATED_BY # 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_module.py b/nfv/nfv-common/nfv_common/event_log/_event_log_module.py index a7baa334..5d1b2794 100755 --- a/nfv/nfv-common/nfv_common/event_log/_event_log_module.py +++ b/nfv/nfv-common/nfv_common/event_log/_event_log_module.py @@ -9,7 +9,7 @@ def event_log(log_data): """ Log a particular event """ - from _event_log_thread import EventLogThread + from nfv_common.event_log._event_log_thread import EventLogThread EventLogThread().log(log_data) @@ -17,7 +17,7 @@ def event_log_subsystem_sane(): """ Returns true if the event log subsystem is healthy """ - from _event_log_thread import EventLogThread + from nfv_common.event_log._event_log_thread import EventLogThread return 600 >= EventLogThread().stall_elapsed_secs @@ -25,7 +25,7 @@ def event_log_initialize(config): """ Initialize the event log subsystem """ - from _event_log_thread import EventLogThread + from nfv_common.event_log._event_log_thread import EventLogThread EventLogThread(config).start() @@ -33,5 +33,5 @@ def event_log_finalize(): """ Finalize the event log subsystem """ - from _event_log_thread import EventLogThread + from nfv_common.event_log._event_log_thread import EventLogThread EventLogThread().stop(max_wait_in_seconds=5) 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 dc78c07f..4ba19bb9 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 @@ -9,7 +9,7 @@ from nfv_common import debug from nfv_common import thread from nfv_common.helpers import Singleton -from _event_log_handlers import EventLogHandlers +from nfv_common.event_log._event_log_handlers import EventLogHandlers DLOG = debug.debug_get_logger('nfv_common.event_log.event_log_thread') diff --git a/nfv/nfv-common/nfv_common/event_log/handlers/v1/__init__.py b/nfv/nfv-common/nfv_common/event_log/handlers/v1/__init__.py index 29930d0c..a658780d 100755 --- a/nfv/nfv-common/nfv_common/event_log/handlers/v1/__init__.py +++ b/nfv/nfv-common/nfv_common/event_log/handlers/v1/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _event_log_handler import EventLogHandler +from nfv_common.event_log.handlers.v1._event_log_handler import EventLogHandler # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/event_log/objects/__init__.py b/nfv/nfv-common/nfv_common/event_log/objects/__init__.py index 90b33192..77df7d75 100755 --- a/nfv/nfv-common/nfv_common/event_log/objects/__init__.py +++ b/nfv/nfv-common/nfv_common/event_log/objects/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import v1 +import nfv_common.event_log.objects.v1 # noqa: F401 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 a8ad418a..18214ec4 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,10 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _event_log_defs import EVENT_ID, EVENT_CONTEXT, EVENT_TYPE, EVENT_IMPORTANCE -from _event_log_defs import EVENT_INITIATED_BY -from _event_log_data import EventLogStateData -from _event_log_data import EventLogThresholdData -from _event_log_data import EventLogData +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 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 diff --git a/nfv/nfv-common/nfv_common/event_log/objects/v1/_event_log_defs.py b/nfv/nfv-common/nfv_common/event_log/objects/v1/_event_log_defs.py index 9d107361..63509f28 100755 --- a/nfv/nfv-common/nfv_common/event_log/objects/v1/_event_log_defs.py +++ b/nfv/nfv-common/nfv_common/event_log/objects/v1/_event_log_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/forensic/__init__.py b/nfv/nfv-common/nfv_common/forensic/__init__.py index 2b87fd9d..17f7c031 100755 --- a/nfv/nfv-common/nfv_common/forensic/__init__.py +++ b/nfv/nfv-common/nfv_common/forensic/__init__.py @@ -3,23 +3,22 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _evidence import evidence_from_files -from _analysis import analysis_instance_start_success -from _analysis import analysis_instance_stop_success -from _analysis import analysis_instance_pause_success -from _analysis import analysis_instance_unpause_success -from _analysis import analysis_instance_suspend_success -from _analysis import analysis_instance_resume_success -from _analysis import analysis_instance_reboot_success -from _analysis import analysis_instance_rebuild_success -from _analysis import analysis_instance_live_migrate_success -from _analysis import analysis_instance_cold_migrate_success -from _analysis import analysis_instance_cold_migrate_confirm_success -from _analysis import analysis_instance_cold_migrate_revert_success -from _analysis import analysis_instance_resize_success -from _analysis import analysis_instance_resize_confirm_success -from _analysis import analysis_instance_resize_revert_success -from _analysis import analysis_stdout -from _forensic_module import forensic_initialize, forensic_finalize +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_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_stdout # noqa: F401 +from nfv_common.forensic._forensic_module import forensic_initialize # noqa: F401 +from nfv_common.forensic._forensic_module import forensic_finalize # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/forensic/_analysis.py b/nfv/nfv-common/nfv_common/forensic/_analysis.py index c1322796..374c4e47 100755 --- a/nfv/nfv-common/nfv_common/forensic/_analysis.py +++ b/nfv/nfv-common/nfv_common/forensic/_analysis.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _defs import NFV_VIM +from nfv_common.forensic._defs import NFV_VIM DLOG = debug.debug_get_logger('forensic-analysis') diff --git a/nfv/nfv-common/nfv_common/forensic/_nfv_vim_parser.py b/nfv/nfv-common/nfv_common/forensic/_nfv_vim_parser.py index 6ae58151..241fdab2 100755 --- a/nfv/nfv-common/nfv_common/forensic/_nfv_vim_parser.py +++ b/nfv/nfv-common/nfv_common/forensic/_nfv_vim_parser.py @@ -3,13 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 # +import datetime import os import re import yaml -import datetime -from pyparsing import Word, Combine, Suppress, Literal, Regex -from pyparsing import nums, alphas +from pyparsing import alphas +from pyparsing import Combine +from pyparsing import Literal +from pyparsing import nums +from pyparsing import Regex +from pyparsing import Suppress +from pyparsing import Word class NfvVimParser(object): diff --git a/nfv/nfv-common/nfv_common/schedule/__init__.py b/nfv/nfv-common/nfv_common/schedule/__init__.py index d7f84472..153ad445 100755 --- a/nfv/nfv-common/nfv_common/schedule/__init__.py +++ b/nfv/nfv-common/nfv_common/schedule/__init__.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _schedule_module import schedule_function_call -from _schedule_module import schedule_initialize, schedule_finalize +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/selobj/__init__.py b/nfv/nfv-common/nfv_common/selobj/__init__.py index 074c19fc..59312033 100755 --- a/nfv/nfv-common/nfv_common/selobj/__init__.py +++ b/nfv/nfv-common/nfv_common/selobj/__init__.py @@ -3,9 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _selobj_module import selobj_add_read_obj, selobj_del_read_obj -from _selobj_module import selobj_add_write_obj, selobj_del_write_obj -from _selobj_module import selobj_add_error_callback, selobj_del_error_callback -from _selobj_module import selobj_dispatch, selobj_initialize, selobj_finalize +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_del_error_callback # 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 diff --git a/nfv/nfv-common/nfv_common/selobj/_selobj_module.py b/nfv/nfv-common/nfv_common/selobj/_selobj_module.py index 1adbdce9..0b21b72e 100755 --- a/nfv/nfv-common/nfv_common/selobj/_selobj_module.py +++ b/nfv/nfv-common/nfv_common/selobj/_selobj_module.py @@ -3,9 +3,9 @@ # # SPDX-License-Identifier: Apache-2.0 # -import socket -import select import errno +import select +import socket from nfv_common import debug @@ -85,7 +85,8 @@ def selobj_dispatch(timeout_in_ms): Dispatch selection objects that have become readable or writeable within the given time period """ - from nfv_common import timers, histogram + from nfv_common import histogram + from nfv_common import timers global _read_callbacks, _write_callbacks, _error_callbacks diff --git a/nfv/nfv-common/nfv_common/state_machine/__init__.py b/nfv/nfv-common/nfv_common/state_machine/__init__.py index b44ff531..1e8145de 100755 --- a/nfv/nfv-common/nfv_common/state_machine/__init__.py +++ b/nfv/nfv-common/nfv_common/state_machine/__init__.py @@ -3,12 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _state import State -from _state_task import StateTask -from _state_task_work import StateTaskWork -from _state_task_result import STATE_TASK_RESULT, state_task_result_update -from _state_task_work_result import STATE_TASK_WORK_RESULT -from _state_exception import StateException -from _state_machine import StateMachine +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 diff --git a/nfv/nfv-common/nfv_common/state_machine/_state_machine.py b/nfv/nfv-common/nfv_common/state_machine/_state_machine.py index 75bc0f04..42da2037 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_machine.py +++ b/nfv/nfv-common/nfv_common/state_machine/_state_machine.py @@ -7,7 +7,7 @@ import weakref from nfv_common import debug -from _state_exception import StateException +from nfv_common.state_machine._state_exception import StateException DLOG = debug.debug_get_logger('nfv_common.state_machine.state_machine') 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 78643f49..520e0d3b 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_task.py +++ b/nfv/nfv-common/nfv_common/state_machine/_state_task.py @@ -3,12 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_common import timers from nfv_common import debug +from nfv_common import timers from nfv_common.helpers import coroutine -from _state_task_result import STATE_TASK_RESULT, state_task_result_update -from _state_task_work_result import STATE_TASK_WORK_RESULT +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 +from nfv_common.state_machine._state_task_work_result import STATE_TASK_WORK_RESULT DLOG = debug.debug_get_logger('nfv_common.state_machine.state_task') diff --git a/nfv/nfv-common/nfv_common/state_machine/_state_task_result.py b/nfv/nfv-common/nfv_common/state_machine/_state_task_result.py index 5265adb2..a6693997 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_task_result.py +++ b/nfv/nfv-common/nfv_common/state_machine/_state_task_result.py @@ -5,9 +5,10 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton -from _state_task_work_result import STATE_TASK_WORK_RESULT +from nfv_common.state_machine._state_task_work_result import STATE_TASK_WORK_RESULT @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/state_machine/_state_task_work.py b/nfv/nfv-common/nfv_common/state_machine/_state_task_work.py index 8a245618..13cdee67 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_task_work.py +++ b/nfv/nfv-common/nfv_common/state_machine/_state_task_work.py @@ -7,7 +7,7 @@ import weakref from nfv_common import debug -from _state_task_result import STATE_TASK_WORK_RESULT +from nfv_common.state_machine._state_task_result import STATE_TASK_WORK_RESULT DLOG = debug.debug_get_logger('nfv_common.state_machine.state_task_work') diff --git a/nfv/nfv-common/nfv_common/state_machine/_state_task_work_result.py b/nfv/nfv-common/nfv_common/state_machine/_state_task_work_result.py index dec9746f..63676b53 100755 --- a/nfv/nfv-common/nfv_common/state_machine/_state_task_work_result.py +++ b/nfv/nfv-common/nfv_common/state_machine/_state_task_work_result.py @@ -5,7 +5,8 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/strategy/__init__.py b/nfv/nfv-common/nfv_common/strategy/__init__.py index 8c4bf407..226122b8 100755 --- a/nfv/nfv-common/nfv_common/strategy/__init__.py +++ b/nfv/nfv-common/nfv_common/strategy/__init__.py @@ -3,13 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _strategy_defs import STRATEGY_APPLY_TYPE, STRATEGY_STATE, STRATEGY_PHASE -from _strategy_defs import STRATEGY_ALARM_RESTRICTION_TYPES -from _strategy_result import STRATEGY_RESULT, STRATEGY_PHASE_RESULT -from _strategy_result import STRATEGY_STAGE_RESULT, STRATEGY_STEP_RESULT -from _strategy_step import StrategyStep -from _strategy_stage import StrategyStage -from _strategy_phase import StrategyPhase -from _strategy import Strategy +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_defs import STRATEGY_ALARM_RESTRICTION_TYPES # noqa: F401 +from nfv_common.strategy._strategy_result import STRATEGY_RESULT # noqa: F401 +from nfv_common.strategy._strategy_result import STRATEGY_PHASE_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 diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy.py b/nfv/nfv-common/nfv_common/strategy/_strategy.py index 783c1a5b..e55d6a49 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy.py @@ -7,9 +7,11 @@ import json from nfv_common import debug -from _strategy_defs import STRATEGY_PHASE, STRATEGY_STATE -from _strategy_result import STRATEGY_RESULT, strategy_result_update -from _strategy_phase import StrategyPhase +from nfv_common.strategy._strategy_defs import STRATEGY_PHASE +from nfv_common.strategy._strategy_defs import STRATEGY_STATE +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_defs.py b/nfv/nfv-common/nfv_common/strategy/_strategy_defs.py index 73a31768..cf58fcf5 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_defs.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py b/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py index 4eb13a36..a75ec826 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy_phase.py @@ -7,14 +7,15 @@ import weakref from datetime import datetime -from nfv_common import timers from nfv_common import debug +from nfv_common import timers from nfv_common.helpers import coroutine -from _strategy_defs import STRATEGY_PHASE -from _strategy_result import STRATEGY_PHASE_RESULT, STRATEGY_STAGE_RESULT -from _strategy_result import STRATEGY_STEP_RESULT -from _strategy_result import strategy_phase_result_update +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_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_result.py b/nfv/nfv-common/nfv_common/strategy/_strategy_result.py index 0ddfde70..55aa2685 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_result.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy_result.py @@ -5,7 +5,8 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py b/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py index b3c056f0..c520a082 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy_stage.py @@ -7,12 +7,13 @@ import weakref from datetime import datetime -from nfv_common import timers from nfv_common import debug +from nfv_common import timers from nfv_common.helpers import coroutine -from _strategy_result import STRATEGY_STAGE_RESULT, STRATEGY_STEP_RESULT -from _strategy_result import strategy_stage_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_stage_result_update DLOG = debug.debug_get_logger('nfv_common.strategy.stage') diff --git a/nfv/nfv-common/nfv_common/strategy/_strategy_step.py b/nfv/nfv-common/nfv_common/strategy/_strategy_step.py index a17f2bfa..f98c1c34 100755 --- a/nfv/nfv-common/nfv_common/strategy/_strategy_step.py +++ b/nfv/nfv-common/nfv_common/strategy/_strategy_step.py @@ -7,7 +7,7 @@ import weakref from nfv_common import debug -from _strategy_result import STRATEGY_STEP_RESULT +from nfv_common.strategy._strategy_result import STRATEGY_STEP_RESULT DLOG = debug.debug_get_logger('nfv_common.strategy.step') diff --git a/nfv/nfv-common/nfv_common/tasks/__init__.py b/nfv/nfv-common/nfv_common/tasks/__init__.py index 4de43fd4..29f1c925 100755 --- a/nfv/nfv-common/nfv_common/tasks/__init__.py +++ b/nfv/nfv-common/nfv_common/tasks/__init__.py @@ -3,9 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _task import TASK_PRIORITY, Task -from _task_future import TaskFuture -from _task_scheduler import TaskScheduler -from _task_worker_pool import TaskWorkerPool +from nfv_common.tasks._task import TASK_PRIORITY # noqa: F401 +from nfv_common.tasks._task import Task # 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.py b/nfv/nfv-common/nfv_common/tasks/_task.py index ec7fe837..f863d376 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task.py +++ b/nfv/nfv-common/nfv_common/tasks/_task.py @@ -3,13 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import collections +import six from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from _task_result import TaskResult +from nfv_common.tasks._task_result import TaskResult DLOG = debug.debug_get_logger('nfv_common.tasks.task') diff --git a/nfv/nfv-common/nfv_common/tasks/_task_future.py b/nfv/nfv-common/nfv_common/tasks/_task_future.py index e7828966..7a56b9ad 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_future.py +++ b/nfv/nfv-common/nfv_common/tasks/_task_future.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _task_work import TaskWork +from nfv_common.tasks._task_work import TaskWork DLOG = debug.debug_get_logger('nfv_common.tasks.task_future') diff --git a/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py b/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py index 8f225b78..93ef044f 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py +++ b/nfv/nfv-common/nfv_common/tasks/_task_scheduler.py @@ -3,18 +3,19 @@ # # SPDX-License-Identifier: Apache-2.0 # -import inspect import collections +import inspect from nfv_common import debug -from nfv_common import timers -from nfv_common import selobj -from nfv_common import selectable 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 _task import Task, TASK_PRIORITY -from _task_future import TaskFuture +from nfv_common.tasks._task import Task +from nfv_common.tasks._task import TASK_PRIORITY +from nfv_common.tasks._task_future import TaskFuture DLOG = debug.debug_get_logger('nfv_common.tasks.task_scheduler') diff --git a/nfv/nfv-common/nfv_common/tasks/_task_work.py b/nfv/nfv-common/nfv_common/tasks/_task_work.py index 0a35e964..faf6ac86 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_work.py +++ b/nfv/nfv-common/nfv_common/tasks/_task_work.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 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/_task_worker.py b/nfv/nfv-common/nfv_common/tasks/_task_worker.py index df87655d..7ae45367 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_worker.py +++ b/nfv/nfv-common/nfv_common/tasks/_task_worker.py @@ -3,10 +3,10 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_common import thread -from nfv_common import histogram -from nfv_common import timers from nfv_common import debug +from nfv_common import histogram +from nfv_common import thread +from nfv_common import timers DLOG = debug.debug_get_logger('nfv_common.tasks.task_worker') diff --git a/nfv/nfv-common/nfv_common/tasks/_task_worker_pool.py b/nfv/nfv-common/nfv_common/tasks/_task_worker_pool.py index 78bc559a..eac3d9de 100755 --- a/nfv/nfv-common/nfv_common/tasks/_task_worker_pool.py +++ b/nfv/nfv-common/nfv_common/tasks/_task_worker_pool.py @@ -7,7 +7,7 @@ import collections from nfv_common import debug -from _task_worker import TaskWorkerThread +from nfv_common.tasks._task_worker import TaskWorkerThread DLOG = debug.debug_get_logger('nfv_common.tasks.task_worker_pool') diff --git a/nfv/nfv-common/nfv_common/tasks/unit_test.py b/nfv/nfv-common/nfv_common/tasks/unit_test.py index f34b21af..61f091db 100755 --- a/nfv/nfv-common/nfv_common/tasks/unit_test.py +++ b/nfv/nfv-common/nfv_common/tasks/unit_test.py @@ -5,14 +5,14 @@ # import six -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 from nfv_common.helpers import coroutine -from _task_worker_pool import TaskWorkerPool -from _task_scheduler import TaskScheduler +from nfv_common.tasks._task_worker_pool import TaskWorkerPool +from nfv_common.tasks._task_scheduler import TaskScheduler DLOG = debug.debug_get_logger('unit_test', debug_level=debug.DEBUG_LEVEL.INFO) diff --git a/nfv/nfv-common/nfv_common/tcp/__init__.py b/nfv/nfv-common/nfv_common/tcp/__init__.py index f2824d31..dcd6f934 100755 --- a/nfv/nfv-common/nfv_common/tcp/__init__.py +++ b/nfv/nfv-common/nfv_common/tcp/__init__.py @@ -3,7 +3,5 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _tcp_connection import TCPConnection -from _tcp_server import TCPServer +from nfv_common.tcp._tcp_connection import TCPConnection # noqa: F401 +from nfv_common.tcp._tcp_server import TCPServer # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/tcp/_tcp_server.py b/nfv/nfv-common/nfv_common/tcp/_tcp_server.py index 9971fb49..305a2588 100755 --- a/nfv/nfv-common/nfv_common/tcp/_tcp_server.py +++ b/nfv/nfv-common/nfv_common/tcp/_tcp_server.py @@ -7,7 +7,7 @@ from nfv_common import debug from nfv_common import selobj from nfv_common.helpers import coroutine -from _tcp_connection import TCPConnection +from nfv_common.tcp._tcp_connection import TCPConnection DLOG = debug.debug_get_logger('nfv_common.tcp') diff --git a/nfv/nfv-common/nfv_common/tcp/unit_test.py b/nfv/nfv-common/nfv_common/tcp/unit_test.py index 02ed6bd8..62a85f97 100755 --- a/nfv/nfv-common/nfv_common/tcp/unit_test.py +++ b/nfv/nfv-common/nfv_common/tcp/unit_test.py @@ -3,15 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -import time import argparse +import time from nfv_common import debug from nfv_common import selobj from nfv_common import timers -from _tcp_server import TCPServer -from _tcp_connection import TCPConnection +from nfv_common.tcp._tcp_server import TCPServer +from nfv_common.tcp._tcp_connection import TCPConnection def message_handler(client_connection, msg): diff --git a/nfv/nfv-common/nfv_common/thread/__init__.py b/nfv/nfv-common/nfv_common/thread/__init__.py index 006cd625..8a507077 100755 --- a/nfv/nfv-common/nfv_common/thread/__init__.py +++ b/nfv/nfv-common/nfv_common/thread/__init__.py @@ -3,7 +3,5 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _thread import Thread -from _thread_worker import ThreadWorker +from nfv_common.thread._thread import Thread # noqa: F401 +from nfv_common.thread._thread_worker import ThreadWorker # noqa: F401 diff --git a/nfv/nfv-common/nfv_common/thread/_thread.py b/nfv/nfv-common/nfv_common/thread/_thread.py index 517774c3..e12df8e1 100755 --- a/nfv/nfv-common/nfv_common/thread/_thread.py +++ b/nfv/nfv-common/nfv_common/thread/_thread.py @@ -3,18 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 # -import sys import ctypes 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 import selectable from nfv_common.helpers import coroutine -from _thread_progress_marker import ThreadProgressMarker +from nfv_common.thread._thread_progress_marker import ThreadProgressMarker DLOG = debug.debug_get_logger('nfv_common.thread') diff --git a/nfv/nfv-common/nfv_common/thread/_thread_progress_marker.py b/nfv/nfv-common/nfv_common/thread/_thread_progress_marker.py index 0b2b0e8a..4a89e15b 100755 --- a/nfv/nfv-common/nfv_common/thread/_thread_progress_marker.py +++ b/nfv/nfv-common/nfv_common/thread/_thread_progress_marker.py @@ -4,7 +4,8 @@ # SPDX-License-Identifier: Apache-2.0 # from ctypes import c_ulonglong -from multiprocessing import RawValue, Lock +from multiprocessing import Lock +from multiprocessing import RawValue from nfv_common import debug diff --git a/nfv/nfv-common/nfv_common/timers/__init__.py b/nfv/nfv-common/nfv_common/timers/__init__.py index 9fe8666b..2afb878e 100755 --- a/nfv/nfv-common/nfv_common/timers/__init__.py +++ b/nfv/nfv-common/nfv_common/timers/__init__.py @@ -3,12 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _timestamp import get_monotonic_timestamp_in_ms -from _timer_module import interval_timer -from _timer_module import timers_create_timer, timers_delete_timer -from _timer_module import timers_reschedule_timer -from _timer_module import timers_scheduling_on_time, timers_schedule -from _timer_module import timers_register_interval_timers -from _timer_module import timers_initialize, timers_finalize +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 diff --git a/nfv/nfv-common/nfv_common/timers/_timer.py b/nfv/nfv-common/nfv_common/timers/_timer.py index 80f6d83b..53bbe4db 100755 --- a/nfv/nfv-common/nfv_common/timers/_timer.py +++ b/nfv/nfv-common/nfv_common/timers/_timer.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _timestamp import get_monotonic_timestamp_in_ms +from nfv_common.timers._timestamp import get_monotonic_timestamp_in_ms DLOG = debug.debug_get_logger('nfv_common.timers.timer') diff --git a/nfv/nfv-common/nfv_common/timers/_timer_module.py b/nfv/nfv-common/nfv_common/timers/_timer_module.py index a6bab99d..5766c0d8 100755 --- a/nfv/nfv-common/nfv_common/timers/_timer_module.py +++ b/nfv/nfv-common/nfv_common/timers/_timer_module.py @@ -7,8 +7,8 @@ import functools from nfv_common import debug -from _timer import Timer -from _timer_scheduler import TimerScheduler +from nfv_common.timers._timer import Timer +from nfv_common.timers._timer_scheduler import TimerScheduler DLOG = debug.debug_get_logger('nfv_common.timers.timer_module') diff --git a/nfv/nfv-common/nfv_common/timers/_timer_scheduler.py b/nfv/nfv-common/nfv_common/timers/_timer_scheduler.py index 975d7c09..0ce5f31d 100755 --- a/nfv/nfv-common/nfv_common/timers/_timer_scheduler.py +++ b/nfv/nfv-common/nfv_common/timers/_timer_scheduler.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import histogram -from _timestamp import get_monotonic_timestamp_in_ms +from nfv_common.timers._timestamp import get_monotonic_timestamp_in_ms DLOG = debug.debug_get_logger('nfv_common.timers.timer_scheduler') diff --git a/nfv/nfv-common/nfv_common/timers/_timestamp.py b/nfv/nfv-common/nfv_common/timers/_timestamp.py index 8c0c0bf0..aeaca523 100755 --- a/nfv/nfv-common/nfv_common/timers/_timestamp.py +++ b/nfv/nfv-common/nfv_common/timers/_timestamp.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import os import ctypes +import os from nfv_common import debug diff --git a/nfv/nfv-common/setup.py b/nfv/nfv-common/setup.py index e7bb7d5b..678e52fd 100755 --- a/nfv/nfv-common/setup.py +++ b/nfv/nfv-common/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='windriver-nfv_common-plugins', diff --git a/nfv/nfv-docs/doc_builder.py b/nfv/nfv-docs/doc_builder.py index 9fe80f32..a0cb4889 100755 --- a/nfv/nfv-docs/doc_builder.py +++ b/nfv/nfv-docs/doc_builder.py @@ -13,7 +13,8 @@ import shutil import six import yaml -from jinja2 import Environment, FileSystemLoader +from jinja2 import Environment +from jinja2 import FileSystemLoader CURRENT_DIR = os.path.dirname(os.path.abspath(__file__)) diff --git a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/file_storage.py b/nfv/nfv-plugins/nfv_plugins/alarm_handlers/file_storage.py index e412744f..d222bca9 100755 --- a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/file_storage.py +++ b/nfv/nfv-plugins/nfv_plugins/alarm_handlers/file_storage.py @@ -8,7 +8,7 @@ import six import nfv_common.alarm.handlers.v1 as alarm_handlers_v1 -import config +from nfv_plugins.alarm_handlers import config class FileStorage(alarm_handlers_v1.AlarmHandler): diff --git a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py b/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py index ce556145..c8d04f78 100755 --- a/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py +++ b/nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py @@ -11,7 +11,7 @@ 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 config +from nfv_plugins.alarm_handlers import config DLOG = debug.debug_get_logger('nfv_plugins.alarm_handlers.fm') diff --git a/nfv/nfv-plugins/nfv_plugins/event_log_handlers/file_storage.py b/nfv/nfv-plugins/nfv_plugins/event_log_handlers/file_storage.py index 7c3df3ed..44e6d16c 100755 --- a/nfv/nfv-plugins/nfv_plugins/event_log_handlers/file_storage.py +++ b/nfv/nfv-plugins/nfv_plugins/event_log_handlers/file_storage.py @@ -8,7 +8,7 @@ import six import nfv_common.event_log.handlers.v1 as event_log_handlers_v1 -import config +from nfv_plugins.event_log_handlers import config class FileStorage(event_log_handlers_v1.EventLogHandler): 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 aeb64a7e..563ea355 100755 --- a/nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py +++ b/nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py @@ -13,7 +13,7 @@ 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 config +from nfv_plugins.event_log_handlers import config DLOG = debug.debug_get_logger('nfv_plugins.event_log_handlers.fm') 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 c1487054..51a9f63b 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 @@ -9,11 +9,11 @@ from nfv_common import debug from nfv_vim import nfvi -import config -from openstack import exceptions -from openstack import openstack -from openstack import cinder -from openstack.objects import OPENSTACK_SERVICE +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 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 292d41d8..f05f8fa4 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 @@ -3,27 +3,28 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six -import uuid -import json -import socket -import httplib import collections +import httplib +import json +import six +import socket +import uuid from nfv_common import debug from nfv_common import timers -from nfv_common.helpers import Object, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Object from nfv_vim import nfvi from nfv_vim.nfvi.objects import v1 as nfvi_objs -import config -from openstack import rpc_listener -from openstack import exceptions -from openstack import openstack -from openstack import nova -from openstack import rest_api -from openstack.objects import OPENSTACK_SERVICE +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 rest_api +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 9e7251e5..36b725bb 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 @@ -10,11 +10,11 @@ from nfv_common import debug from nfv_vim import nfvi -import config -from openstack import rest_api -from openstack import exceptions -from openstack import openstack -from openstack import guest +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 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 09ac5254..c7488e86 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 @@ -10,10 +10,10 @@ from nfv_common import debug from nfv_vim import nfvi -import config -from openstack import exceptions -from openstack import openstack -from openstack import keystone +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 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 6671c865..ec21daf8 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 @@ -10,11 +10,11 @@ from nfv_common import debug from nfv_vim import nfvi from nfv_vim.nfvi.objects import v1 as nfvi_objs -import config -from openstack import exceptions -from openstack import openstack -from openstack import glance -from openstack.objects import OPENSTACK_SERVICE +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.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 8e84603f..95eef26f 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 @@ -12,18 +12,18 @@ from nfv_common import tcp from nfv_vim import nfvi -import config -from clients import kubernetes_client -from openstack import rest_api -from openstack import exceptions -from openstack import openstack -from openstack import sysinv -from openstack import fm -from openstack import mtc -from openstack import nova -from openstack import neutron -from openstack import guest -from openstack.objects import OPENSTACK_SERVICE +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 nova +from nfv_plugins.nfvi_plugins.openstack import neutron +from nfv_plugins.nfvi_plugins.openstack import guest +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 b898edd4..dfd4128c 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 @@ -9,11 +9,11 @@ from nfv_common import debug from nfv_vim import nfvi -import config -from openstack import exceptions -from openstack import openstack -from openstack import neutron -from openstack.objects import OPENSTACK_SERVICE +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.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/nfvi_sw_mgmt_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py index 400fcdcb..f3638b6a 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py @@ -9,10 +9,10 @@ from nfv_common import debug from nfv_vim import nfvi -import config -from openstack import exceptions -from openstack import openstack -from openstack import patching +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 patching DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.sw_mgmt_api') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/ceilometer.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/ceilometer.py index a89c5943..02221b6b 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/ceilometer.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/ceilometer.py @@ -7,8 +7,8 @@ import json from nfv_common import debug -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.ceilometer') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/cinder.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/cinder.py index 479c0018..d10352e4 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/cinder.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/cinder.py @@ -3,14 +3,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import json +import six from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.cinder') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py index 71202ddf..8f283b5e 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py @@ -6,8 +6,8 @@ from nfv_common import debug -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.fm') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/glance.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/glance.py index 114f3d89..b77d5616 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/glance.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/glance.py @@ -3,15 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # +import json import os import six -import json from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.glance') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/guest.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/guest.py index 7629f0a1..942b4406 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/guest.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/guest.py @@ -7,10 +7,12 @@ import json import six from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.guest') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/heat.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/heat.py index e6cbcefc..5cf69570 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/heat.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/heat.py @@ -5,8 +5,8 @@ # import json -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request def get_versions(token): diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/keystone.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/keystone.py index 3e746fa7..a8312c71 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/keystone.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/keystone.py @@ -5,8 +5,8 @@ # from nfv_common import debug -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.keystone') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/mtc.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/mtc.py index 9fcbbef1..710ea546 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/mtc.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/mtc.py @@ -3,14 +3,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import json +import six from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.mtc') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py index 7c934b8e..1c4beb56 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py @@ -3,15 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import json +import six import uuid from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.neutron') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py index 9ffcbe38..007f35cb 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py @@ -3,15 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 # -import six import json +import six from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from exceptions import NotFound -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request, rest_api_request_with_context +from nfv_plugins.nfvi_plugins.openstack.exceptions import NotFound +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request_with_context DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.nova') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py index e1ae7eb7..c0f644ad 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py @@ -3,13 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # +import datetime +import iso8601 import re import six -import iso8601 -import datetime from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.objects') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py index b9952f09..273ea6a1 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py @@ -8,7 +8,9 @@ import urllib2 from nfv_common import debug -from objects import OPENSTACK_SERVICE, Directory, Token +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.objects import Directory +from nfv_plugins.nfvi_plugins.openstack.objects import Token DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack_log.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack_log.py index f69bd69e..cfc02e64 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack_log.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack_log.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import fcntl import datetime +import fcntl NFVI_OPENSTACK_LOG = '/var/log/nfvi-openstack.log' diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/patching.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/patching.py index faaf7e45..6507d202 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/patching.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/patching.py @@ -5,8 +5,8 @@ # from nfv_common import debug -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.patching') diff --git a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py index 94066f99..71a6dda1 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py @@ -3,22 +3,27 @@ # # SPDX-License-Identifier: Apache-2.0 # -import re +import httplib import json +import re import socket import struct -import httplib import urllib2 -import SocketServer + import BaseHTTPServer +import SocketServer from nfv_common import debug from nfv_common import selobj from nfv_common import timers -from nfv_common.helpers import Result, Object, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Object +from nfv_common.helpers import Result -from openstack_log import log_info, log_error -from exceptions import OpenStackException, OpenStackRestAPIException +from nfv_plugins.nfvi_plugins.openstack.openstack_log import log_error +from nfv_plugins.nfvi_plugins.openstack.openstack_log import log_info +from nfv_plugins.nfvi_plugins.openstack.exceptions import OpenStackException +from nfv_plugins.nfvi_plugins.openstack.exceptions import OpenStackRestAPIException DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.rest_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 7b20bed4..9543f7dc 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 @@ -3,14 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # -import time import threading +import time from kombu.connection import Connection -from kombu import Exchange, Queue, Consumer, exceptions +from kombu import Consumer +from kombu import exceptions +from kombu import Exchange +from kombu import Queue from nfv_common import debug -from nfv_common import selobj 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-plugins/nfv_plugins/nfvi_plugins/openstack/sysinv.py b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/sysinv.py index a0aa4cae..d432ceda 100755 --- a/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/sysinv.py +++ b/nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/sysinv.py @@ -6,8 +6,8 @@ import json from nfv_common import debug -from objects import OPENSTACK_SERVICE -from rest_api import rest_api_request +from nfv_plugins.nfvi_plugins.openstack.objects import OPENSTACK_SERVICE +from nfv_plugins.nfvi_plugins.openstack.rest_api import rest_api_request DLOG = debug.debug_get_logger('nfv_plugins.nfvi_plugins.openstack.sysinv') diff --git a/nfv/nfv-plugins/setup.py b/nfv/nfv-plugins/setup.py index c7063dc7..ce3132cf 100755 --- a/nfv/nfv-plugins/setup.py +++ b/nfv/nfv-plugins/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='windriver-nfv-plugins', diff --git a/nfv/nfv-tests/nfv_scenario_tests/main.py b/nfv/nfv-tests/nfv_scenario_tests/main.py index d9f3fbb0..1934dc38 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/main.py +++ b/nfv/nfv-tests/nfv_scenario_tests/main.py @@ -3,22 +3,24 @@ # # SPDX-License-Identifier: Apache-2.0 # +import argparse +import codecs +import datetime import os +import shutil +import signal import sys +import tarfile import time +import traceback import uuid import yaml -import signal -import shutil -import codecs -import tarfile -import argparse -import datetime -import traceback -from jinja2 import Environment, FileSystemLoader -from nfv_common import forensic +from jinja2 import Environment +from jinja2 import FileSystemLoader + from nfv_common import debug +from nfv_common import forensic from nfv_plugins.nfvi_plugins import config import tests diff --git a/nfv/nfv-tests/nfv_scenario_tests/setup.py b/nfv/nfv-tests/nfv_scenario_tests/setup.py index 9c81c83e..8425735f 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/setup.py +++ b/nfv/nfv-tests/nfv_scenario_tests/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='nfv_scenario_tests', diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py b/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py index f8b542cf..388f7dfb 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py +++ b/nfv/nfv-tests/nfv_scenario_tests/tests/__init__.py @@ -3,18 +3,20 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _test_instances import TestInstanceStart, TestInstanceStop -from _test_instances import TestInstancePause, TestInstanceUnpause -from _test_instances import TestInstanceSuspend, TestInstanceResume -from _test_instances import TestInstanceReboot -from _test_instances import TestInstanceRebuild -from _test_instances import TestInstanceLiveMigrate -from _test_instances import TestInstanceColdMigrate -from _test_instances import TestInstanceColdMigrateConfirm -from _test_instances import TestInstanceColdMigrateRevert -from _test_instances import TestInstanceResize -from _test_instances import TestInstanceResizeConfirm -from _test_instances import TestInstanceResizeRevert -from _test_hosts import TestHostLock, TestHostUnlock +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_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 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 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 b6c1dfd3..9439ad05 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py +++ b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_hosts.py @@ -3,10 +3,10 @@ # # SPDX-License-Identifier: Apache-2.0 # -import os -import time -import shutil import datetime +import os +import shutil +import time from nfv_common import debug @@ -16,9 +16,9 @@ from nfv_plugins.nfvi_plugins.openstack import sysinv from nfv_plugins.nfvi_plugins.openstack import fm from nfv_plugins.nfvi_plugins.openstack import openstack -import _hosts -import _instances -import _test_base +from tests import _hosts +from tests import _instances +from tests import _test_base DLOG = debug.debug_get_logger('nfv_tests.test_hosts') diff --git a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py index 128760a2..561a079d 100755 --- a/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py +++ b/nfv/nfv-tests/nfv_scenario_tests/tests/_test_instances.py @@ -15,8 +15,8 @@ from nfv_plugins.nfvi_plugins.openstack import fm from nfv_plugins.nfvi_plugins.openstack import nova from nfv_plugins.nfvi_plugins.openstack import openstack -import _instances -import _test_base +from tests import _instances +from tests import _test_base DLOG = debug.debug_get_logger('nfv_tests.test_instances') diff --git a/nfv/nfv-tests/nfv_unit_tests/setup.py b/nfv/nfv-tests/nfv_unit_tests/setup.py index 4033e2ac..0137cf3f 100755 --- a/nfv/nfv-tests/nfv_unit_tests/setup.py +++ b/nfv/nfv-tests/nfv_unit_tests/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='nfv_unit_tests', 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 e173fd05..01230557 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 @@ -13,16 +13,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, SW_UPDATE_INSTANCE_ACTION +from nfv_vim.objects import SW_UPDATE_APPLY_TYPE +from nfv_vim.objects import SW_UPDATE_INSTANCE_ACTION from nfv_vim.objects import SW_UPDATE_ALARM_RESTRICTION -from nfv_vim.objects import HOST_PERSONALITY, SwPatch +from nfv_vim.objects import HOST_PERSONALITY +from nfv_vim.objects import SwPatch 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 SwPatchStrategy, strategy_rebuild_from_dict +from nfv_vim.strategy._strategy import strategy_rebuild_from_dict +from nfv_vim.strategy._strategy import SwPatchStrategy from . import testcase from . import utils 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 593e3b92..3c5dd7a8 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 @@ -16,14 +16,17 @@ 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, HOST_NAME, SwUpgrade +from nfv_vim.objects import HOST_PERSONALITY +from nfv_vim.objects import HOST_NAME +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, strategy_rebuild_from_dict +from nfv_vim.strategy._strategy import SwUpgradeStrategy +from nfv_vim.strategy._strategy import strategy_rebuild_from_dict from nfv_vim.nfvi.objects.v1 import UPGRADE_STATE diff --git a/nfv/nfv-tools/setup.py b/nfv/nfv-tools/setup.py index 10682491..0c2cbf3d 100755 --- a/nfv/nfv-tools/setup.py +++ b/nfv/nfv-tools/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='nfv_tools', diff --git a/nfv/nfv-vim/nfv_vim/alarm/__init__.py b/nfv/nfv-vim/nfv_vim/alarm/__init__.py index 0b373928..97f2061c 100755 --- a/nfv/nfv-vim/nfv_vim/alarm/__init__.py +++ b/nfv/nfv-vim/nfv_vim/alarm/__init__.py @@ -3,14 +3,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from nfv_common.alarm import * +from nfv_common.alarm import * # noqa: F401,F403 -from _general import raise_general_alarm, clear_general_alarm -from _host import host_raise_alarm, host_clear_alarm -from _instance import instance_raise_alarm, instance_clear_alarm -from _instance import instance_manage_alarms -from _instance_group import raise_instance_group_policy_alarm -from _instance_group import clear_instance_group_alarm -from _sw_update import raise_sw_update_alarm, clear_sw_update_alarm +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._host import host_clear_alarm # noqa: F401 +from nfv_vim.alarm._instance import instance_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_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._sw_update import clear_sw_update_alarm # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/api/__init__.py b/nfv/nfv-vim/nfv_vim/api/__init__.py index f4758059..eccfad45 100755 --- a/nfv/nfv-vim/nfv_vim/api/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _application import Application +from nfv_vim.api._application import Application # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/api/acl/__init__.py b/nfv/nfv-vim/nfv_vim/api/acl/__init__.py index c3f66202..d4b8da9b 100755 --- a/nfv/nfv-vim/nfv_vim/api/acl/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/acl/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _application import AuthenticationApplication +from nfv_vim.api.acl._application import AuthenticationApplication # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/root.py b/nfv/nfv-vim/nfv_vim/api/controllers/root.py index 1c5875c4..2d1db58d 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/root.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/root.py @@ -3,15 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from .._link import Link -from v1 import APIController +from nfv_vim.api.controllers.v1 import APIController class Root(wsme_types.Base): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/__init__.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/__init__.py index 8b4359bb..180f8795 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _controller import APIController +from nfv_vim.api.controllers.v1._controller import APIController # noqa: F401 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 b7ab3bef..676e5b4b 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/_controller.py @@ -3,17 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from ..._link import Link -import openstack -import orchestration -import virtualised_resources +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 class APIVersion(wsme_types.Base): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/__init__.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/__init__.py index bf950950..ae6c6a6b 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/openstack/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _controller import OpenStackAPI +from nfv_vim.api.controllers.v1.openstack._controller import OpenStackAPI # noqa: F401 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 89b195c5..3b25e355 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 @@ -3,14 +3,14 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from ...._link import Link -from _heat_api import HeatAPI +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/orchestration/__init__.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/__init__.py index 9a79c621..c3f6853c 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _controller import OrchestrationAPI +from nfv_vim.api.controllers.v1.orchestration._controller import OrchestrationAPI # noqa: F401 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 1afabb2a..78e34b4f 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 @@ -3,15 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from ...._link import Link -from sw_update import SwPatchAPI -from sw_update import SwUpgradeAPI +from nfv_vim.api.controllers.v1.orchestration.sw_update import SwPatchAPI +from nfv_vim.api.controllers.v1.orchestration.sw_update import SwUpgradeAPI class OrchestrationDescription(wsme_types.Base): diff --git a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/__init__.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/__init__.py index 41893a65..0da789f6 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/__init__.py @@ -3,7 +3,5 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _sw_patch import SwPatchAPI -from _sw_upgrade import SwUpgradeAPI +from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_patch import SwPatchAPI # noqa: F401 +from nfv_vim.api.controllers.v1.orchestration.sw_update._sw_upgrade import SwUpgradeAPI # noqa: F401 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 0a1443f9..ee7685ec 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 @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan @@ -13,7 +13,7 @@ from ....._link import Link from nfv_common import debug -from _sw_update_strategy import SwPatchStrategyAPI +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_defs.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_defs.py index 3fb5f93b..74f6dcd5 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_defs.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/orchestration/sw_update/_sw_update_defs.py @@ -6,7 +6,9 @@ import six from wsme import types as wsme_types -from nfv_common.helpers import Singleton, Constants, Constant +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) 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 b8db66ee..4080de9e 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,24 +3,28 @@ # # SPDX-License-Identifier: Apache-2.0 # +import httplib import json import pecan -import httplib from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan -from nfv_common import validate from nfv_common import debug +from nfv_common import validate from nfv_vim import rpc -from _sw_update_defs import SW_UPDATE_NAME, SW_UPDATE_APPLY_TYPE -from _sw_update_defs import SW_UPDATE_ACTION, SW_UPDATE_INSTANCE_ACTION -from _sw_update_defs import SW_UPDATE_ALARM_RESTRICTION_TYPES -from _sw_update_defs import SwUpdateNames, SwUpdateApplyTypes -from _sw_update_defs import SwUpdateActions, SwUpdateInstanceActionTypes -from _sw_update_defs import SwUpdateAlarmRestrictionTypes +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 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 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 cf8271db..daa678b7 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 @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan @@ -13,7 +13,7 @@ from ....._link import Link from nfv_common import debug -from _sw_update_strategy import SwUpgradeStrategyAPI +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/__init__.py b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/__init__.py index 45426813..b4b7c931 100755 --- a/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/controllers/v1/virtualised_resources/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _controller import VirtualisedResourcesAPI +from nfv_vim.api.controllers.v1.virtualised_resources._controller import VirtualisedResourcesAPI # noqa: F401 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 0756ac9d..8869b0d0 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 # +import httplib import json import pecan -import 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 1a8c8681..2805d22b 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 @@ -3,17 +3,17 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from pecan import rest from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from ...._link import Link -from _computes_api import ComputesAPI -from _networks_api import NetworksAPI -from _image_api import ImageAPI -from _volume_api import VolumeAPI +from nfv_vim.api.controllers.v1.virtualised_resources._computes_api import ComputesAPI +from nfv_vim.api.controllers.v1.virtualised_resources._networks_api import NetworksAPI +from nfv_vim.api.controllers.v1.virtualised_resources._image_api import ImageAPI +from nfv_vim.api.controllers.v1.virtualised_resources._volume_api import VolumeAPI 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 ba7b926a..044ee700 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,9 +3,9 @@ # # SPDX-License-Identifier: Apache-2.0 # +import httplib import json import pecan -import httplib from pecan import rest 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 6f87166b..57cdeae4 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,18 +2,23 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from wsme import types as wsme_types import wsmeext.pecan as wsme_pecan from nfv_common import debug -from _networks_model import NetworkResourceClass -from _networks_middleware import NetworkType, NetworkResourceType -from _networks_middleware import NetworkSubnetType, NetworkSubnetResourceType -from _networks_middleware import network_allocate, network_get, network_get_all -from _networks_middleware import network_update, network_delete +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_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 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 881f01df..3ac40d9e 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,14 +2,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -import pecan import httplib +import pecan from nfv_common import debug from nfv_vim import rpc -from _networks_model import NetworkSubnetType, NetworkSubnetResourceType -from _networks_model import NetworkType, NetworkResourceType +from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkResourceType +from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkSubnetResourceType +from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkSubnetType +from nfv_vim.api.controllers.v1.virtualised_resources._networks_model import NetworkType DLOG = debug.debug_get_logger('nfv_vim.api.virtualised_network') 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 dd17bcc1..77f78b79 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 # +import httplib import json import pecan -import 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 c513bd39..3c100bad 100755 --- a/nfv/nfv-vim/nfv_vim/api/openstack/__init__.py +++ b/nfv/nfv-vim/nfv_vim/api/openstack/__init__.py @@ -3,8 +3,10 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _config import CONF, config_load -from _openstack import OPENSTACK_SERVICE, get_directory, get_token, validate_token -from _rest_api import rest_api_request +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 OPENSTACK_SERVICE # 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/api/openstack/_objects.py b/nfv/nfv-vim/nfv_vim/api/openstack/_objects.py index 817e998f..d182aae8 100755 --- a/nfv/nfv-vim/nfv_vim/api/openstack/_objects.py +++ b/nfv/nfv-vim/nfv_vim/api/openstack/_objects.py @@ -3,13 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # +import datetime +import iso8601 import re import six -import iso8601 -import datetime from nfv_common import debug -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton DLOG = debug.debug_get_logger('nfv_vim.api.openstack') diff --git a/nfv/nfv-vim/nfv_vim/api/openstack/_openstack.py b/nfv/nfv-vim/nfv_vim/api/openstack/_openstack.py index 3a9fd75f..766b2fde 100755 --- a/nfv/nfv-vim/nfv_vim/api/openstack/_openstack.py +++ b/nfv/nfv-vim/nfv_vim/api/openstack/_openstack.py @@ -8,7 +8,9 @@ import urllib2 from nfv_common import debug -from _objects import OPENSTACK_SERVICE, Directory, Token +from nfv_vim.api.openstack._objects import OPENSTACK_SERVICE +from nfv_vim.api.openstack._objects import Directory +from nfv_vim.api.openstack._objects import Token DLOG = debug.debug_get_logger('nfv_vim.api.openstack') diff --git a/nfv/nfv-vim/nfv_vim/audits/__init__.py b/nfv/nfv-vim/nfv_vim/audits/__init__.py index a65d8633..d3e1e426 100755 --- a/nfv/nfv-vim/nfv_vim/audits/__init__.py +++ b/nfv/nfv-vim/nfv_vim/audits/__init__.py @@ -3,6 +3,5 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _audits_module import audits_initialize, audits_finalize +from nfv_vim.audits._audits_module import audits_initialize # noqa: F401 +from nfv_vim.audits._audits_module import audits_finalize # 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 2a7bdc19..3d0273c5 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 _vim_nfvi_audits import vim_nfvi_audits_initialize -from _vim_nfvi_audits import vim_nfvi_audits_finalize -from _vim_alarm_audits import vim_alarm_audits_initialize -from _vim_alarm_audits import vim_alarm_audits_finalize +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 def audits_initialize(): diff --git a/nfv/nfv-vim/nfv_vim/database/__init__.py b/nfv/nfv-vim/nfv_vim/database/__init__.py index adcebb7b..6b9a7c62 100755 --- a/nfv/nfv-vim/nfv_vim/database/__init__.py +++ b/nfv/nfv-vim/nfv_vim/database/__init__.py @@ -3,55 +3,56 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _database_identity_module import database_tenant_add -from _database_identity_module import database_tenant_delete -from _database_identity_module import database_tenant_get_list -from _database_image_module import database_image_add, database_image_delete -from _database_image_module import database_image_get_list -from _database_block_storage_module import database_volume_add -from _database_block_storage_module import database_volume_delete -from _database_block_storage_module import database_volume_get_list -from _database_block_storage_module import database_volume_snapshot_add -from _database_block_storage_module import database_volume_snapshot_delete -from _database_block_storage_module import database_volume_snapshot_get_list -from _database_network_module import database_subnet_add -from _database_network_module import database_subnet_delete -from _database_network_module import database_subnet_get_list -from _database_network_module import database_network_add -from _database_network_module import database_network_delete -from _database_network_module import database_network_get_list -from _database_infrastructure_module import database_system_add -from _database_infrastructure_module import database_system_delete -from _database_infrastructure_module import database_system_get_list -from _database_infrastructure_module import database_host_add -from _database_infrastructure_module import database_host_delete -from _database_infrastructure_module import database_host_get_list -from _database_infrastructure_module import database_host_group_add -from _database_infrastructure_module import database_host_group_delete -from _database_infrastructure_module import database_host_group_get_list -from _database_compute_module import database_service_host_add -from _database_compute_module import database_service_host_delete -from _database_compute_module import database_service_host_get_list -from _database_compute_module import database_hypervisor_add -from _database_compute_module import database_hypervisor_delete -from _database_compute_module import database_hypervisor_get_list -from _database_compute_module import database_instance_type_add -from _database_compute_module import database_instance_type_delete -from _database_compute_module import database_instance_type_get_list -from _database_compute_module import database_instance_add -from _database_compute_module import database_instance_delete -from _database_compute_module import database_instance_get_list -from _database_compute_module import database_instance_group_add -from _database_compute_module import database_instance_group_delete -from _database_compute_module import database_instance_group_get_list -from _database_compute_module import database_host_aggregate_add -from _database_compute_module import database_host_aggregate_delete -from _database_compute_module import database_host_aggregate_get_list -from _database_sw_update import database_sw_update_add -from _database_sw_update import database_sw_update_delete -from _database_sw_update import database_sw_update_get_list -from _database_module import database_migrate_data -from _database_module import database_dump_data, database_load_data -from _database_module import database_initialize, database_finalize +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_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_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 3963d73d..a8aabd44 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database.py +++ b/nfv/nfv-vim/nfv_vim/database/_database.py @@ -3,21 +3,25 @@ # # SPDX-License-Identifier: Apache-2.0 # -import os -import json import errno +import json +import os from sqlalchemy.engine import Engine -from sqlalchemy import create_engine, event, MetaData -from sqlalchemy.orm import sessionmaker, scoped_session +from sqlalchemy import create_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 model import Base, lookup_class_by_table -from _database_migrate import migrate_tables -from _database_upgrades import upgrade_table_row_data +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 _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 278efbd4..8f71bf99 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 @@ -8,8 +8,8 @@ import json from nfv_vim import nfvi from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_volume_add(volume_obj): 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 0d9a16f4..c33ccc6f 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_compute_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_compute_module.py @@ -8,8 +8,8 @@ import json from nfv_vim import nfvi from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_service_host_add(service_host_obj): 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 1eb7f970..6405851b 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_identity_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_identity_module.py @@ -5,8 +5,8 @@ # from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_tenant_add(tenant_obj): 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 e0aa509b..0946fff7 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_image_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_image_module.py @@ -8,8 +8,8 @@ import json from nfv_vim import nfvi from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_image_add(image_obj): 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 23d53bab..b0cbd9f5 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_infrastructure_module.py @@ -8,8 +8,8 @@ import json from nfv_vim import nfvi from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_system_add(system_obj): diff --git a/nfv/nfv-vim/nfv_vim/database/_database_migrate.py b/nfv/nfv-vim/nfv_vim/database/_database_migrate.py index ca4c3f35..3a6dca59 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_migrate.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_migrate.py @@ -5,7 +5,7 @@ # import json -import model +from nfv_vim.database import model from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/database/_database_module.py b/nfv/nfv-vim/nfv_vim/database/_database_module.py index 36a7ea48..9feff08c 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_module.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _database import database_get, database_create +from nfv_vim.database._database import database_create +from nfv_vim.database._database import database_get def database_dump_data(filename): 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 85b39830..460b1e3e 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_network_module.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_network_module.py @@ -7,8 +7,8 @@ import json from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_subnet_add(subnet_obj): 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 7418b79d..6e1d2f92 100755 --- a/nfv/nfv-vim/nfv_vim/database/_database_sw_update.py +++ b/nfv/nfv-vim/nfv_vim/database/_database_sw_update.py @@ -7,8 +7,8 @@ import json from nfv_vim import objects -import model -from _database import database_get +from nfv_vim.database import model +from nfv_vim.database._database import database_get def database_sw_update_add(sw_update_obj): diff --git a/nfv/nfv-vim/nfv_vim/database/model/__init__.py b/nfv/nfv-vim/nfv_vim/database/model/__init__.py index 50b1cc51..5bcbf8a1 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/__init__.py +++ b/nfv/nfv-vim/nfv_vim/database/model/__init__.py @@ -3,23 +3,22 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _base import lookup_class_by_table -from _base import Base -from _tenant import Tenant -from _image import Image -from _volume import Volume -from _volume_snapshot import VolumeSnapshot -from _system import System -from _host import Host_v5 -from _host_aggregate import HostAggregate -from _host_group import HostGroup -from _subnet import Subnet -from _network import Network -from _service_host import ServiceHost -from _hypervisor import Hypervisor -from _instance_type import InstanceType -from _instance_group import InstanceGroup -from _instance import Instance_v4, Instance_v5 -from _sw_update import SoftwareUpdate +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._host import Host_v5 # 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._instance import Instance_v4 # noqa: F401 +from nfv_vim.database.model._instance import Instance_v5 # noqa: F401 +from nfv_vim.database.model._sw_update import SoftwareUpdate # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/database/model/_host.py b/nfv/nfv-vim/nfv_vim/database/model/_host.py index bf1b0c8e..8ce2d311 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_host.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_host.py @@ -3,9 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Boolean +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Host_v5(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_host_aggregate.py b/nfv/nfv-vim/nfv_vim/database/model/_host_aggregate.py index 51939ab4..0ac09af6 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_host_aggregate.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_host_aggregate.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class HostAggregate(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_host_group.py b/nfv/nfv-vim/nfv_vim/database/model/_host_group.py index 864ac5e9..e98de508 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_host_group.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_host_group.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class HostGroup(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_hypervisor.py b/nfv/nfv-vim/nfv_vim/database/model/_hypervisor.py index c64b728b..ae3aeff7 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_hypervisor.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_hypervisor.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer, Boolean +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Hypervisor(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_image.py b/nfv/nfv-vim/nfv_vim/database/model/_image.py index 8b31f8c6..3197d855 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_image.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_image.py @@ -3,9 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Image(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_instance.py b/nfv/nfv-vim/nfv_vim/database/model/_instance.py index a5ec5eb4..96936f6b 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_instance.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_instance.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Boolean, Text +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import String +from sqlalchemy import Text -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Instance_v4(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_instance_group.py b/nfv/nfv-vim/nfv_vim/database/model/_instance_group.py index e3dcd5e5..390bea14 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_instance_group.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_instance_group.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class InstanceGroup(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_instance_type.py b/nfv/nfv-vim/nfv_vim/database/model/_instance_type.py index 7194387f..bd597695 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_instance_type.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer, Boolean +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class InstanceType(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_network.py b/nfv/nfv-vim/nfv_vim/database/model/_network.py index d1eefa70..1736c3d7 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_network.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_network.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer, Boolean +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Network(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_service_host.py b/nfv/nfv-vim/nfv_vim/database/model/_service_host.py index bb06ad2a..7508d019 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_service_host.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_service_host.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class ServiceHost(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_subnet.py b/nfv/nfv-vim/nfv_vim/database/model/_subnet.py index 464515a8..dd20dbb5 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_subnet.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_subnet.py @@ -3,9 +3,13 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer, Boolean +from sqlalchemy import Boolean +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Subnet(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_sw_update.py b/nfv/nfv-vim/nfv_vim/database/model/_sw_update.py index a6e180ca..41e09997 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_sw_update.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_sw_update.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class SoftwareUpdate(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_system.py b/nfv/nfv-vim/nfv_vim/database/model/_system.py index 42ac4b60..1432bf4b 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_system.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_system.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class System(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_tenant.py b/nfv/nfv-vim/nfv_vim/database/model/_tenant.py index 18fe2229..db4bb7cd 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_tenant.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_tenant.py @@ -3,9 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String +from sqlalchemy import Column +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Tenant(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_volume.py b/nfv/nfv-vim/nfv_vim/database/model/_volume.py index 1a3789db..12404d95 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_volume.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_volume.py @@ -3,9 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class Volume(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/database/model/_volume_snapshot.py b/nfv/nfv-vim/nfv_vim/database/model/_volume_snapshot.py index bfb867d7..99f327a1 100755 --- a/nfv/nfv-vim/nfv_vim/database/model/_volume_snapshot.py +++ b/nfv/nfv-vim/nfv_vim/database/model/_volume_snapshot.py @@ -3,9 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -from sqlalchemy import Column, String, Integer +from sqlalchemy import Column +from sqlalchemy import Integer +from sqlalchemy import String -from _base import Base, AsDictMixin +from nfv_vim.database.model._base import AsDictMixin +from nfv_vim.database.model._base import Base class VolumeSnapshot(AsDictMixin, Base): diff --git a/nfv/nfv-vim/nfv_vim/directors/__init__.py b/nfv/nfv-vim/nfv_vim/directors/__init__.py index d8722b7d..e6e44f38 100755 --- a/nfv/nfv-vim/nfv_vim/directors/__init__.py +++ b/nfv/nfv-vim/nfv_vim/directors/__init__.py @@ -3,12 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _image_director import get_image_director -from _volume_director import get_volume_director -from _instance_director import get_instance_director -from _network_director import get_network_director -from _sw_mgmt_director import get_sw_mgmt_director -from _host_director import get_host_director -from _directors_module import directors_initialize, directors_finalize +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 diff --git a/nfv/nfv-vim/nfv_vim/directors/_directors_defs.py b/nfv/nfv-vim/nfv_vim/directors/_directors_defs.py index fe21eb55..5f604773 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_directors_defs.py +++ b/nfv/nfv-vim/nfv_vim/directors/_directors_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/directors/_directors_module.py b/nfv/nfv-vim/nfv_vim/directors/_directors_module.py index f4659f78..3aea9bc7 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 _image_director import image_director_initialize -from _image_director import image_director_finalize -from _volume_director import volume_director_initialize -from _volume_director import volume_director_finalize -from _instance_director import instance_director_initialize -from _instance_director import instance_director_finalize -from _network_director import network_director_initialize -from _network_director import network_director_finalize -from _sw_mgmt_director import sw_mgmt_director_initialize -from _sw_mgmt_director import sw_mgmt_director_finalize -from _host_director import host_director_initialize -from _host_director import host_director_finalize +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 def directors_initialize(): diff --git a/nfv/nfv-vim/nfv_vim/directors/_host_director.py b/nfv/nfv-vim/nfv_vim/directors/_host_director.py index 48f0b27d..688a691b 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_host_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_host_director.py @@ -6,13 +6,16 @@ import six from nfv_common import debug -from nfv_common.helpers import Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Singleton from nfv_vim import nfvi from nfv_vim import objects from nfv_vim import tables -from _directors_defs import OPERATION_TYPE, OPERATION_STATE, Operation +from nfv_vim.directors._directors_defs import Operation +from nfv_vim.directors._directors_defs import OPERATION_STATE +from nfv_vim.directors._directors_defs import OPERATION_TYPE DLOG = debug.debug_get_logger('nfv_vim.host_director') diff --git a/nfv/nfv-vim/nfv_vim/directors/_image_director.py b/nfv/nfv-vim/nfv_vim/directors/_image_director.py index 28dc6228..df740d81 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_image_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_image_director.py @@ -6,11 +6,14 @@ import six from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton 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.image_director') diff --git a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py b/nfv/nfv-vim/nfv_vim/directors/_instance_director.py index 16f39f5a..66c952ea 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_instance_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_instance_director.py @@ -6,17 +6,20 @@ import os import six -from nfv_common import debug from nfv_common import config +from nfv_common import debug from nfv_common import timers -from nfv_common.helpers import Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Singleton from nfv_vim import dor from nfv_vim import nfvi from nfv_vim import objects from nfv_vim import tables -from _directors_defs import OPERATION_TYPE, OPERATION_STATE, Operation +from nfv_vim.directors._directors_defs import Operation +from nfv_vim.directors._directors_defs import OPERATION_STATE +from nfv_vim.directors._directors_defs import OPERATION_TYPE DLOG = debug.debug_get_logger('nfv_vim.instance_director') diff --git a/nfv/nfv-vim/nfv_vim/directors/_network_director.py b/nfv/nfv-vim/nfv_vim/directors/_network_director.py index 6c4427ff..35854a9d 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_network_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_network_director.py @@ -6,11 +6,12 @@ import six from nfv_common import debug -from nfv_common.helpers import Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Singleton 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.network_director') diff --git a/nfv/nfv-vim/nfv_vim/directors/_volume_director.py b/nfv/nfv-vim/nfv_vim/directors/_volume_director.py index fe3d8a92..5538ad77 100755 --- a/nfv/nfv-vim/nfv_vim/directors/_volume_director.py +++ b/nfv/nfv-vim/nfv_vim/directors/_volume_director.py @@ -6,11 +6,14 @@ import six from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton, coroutine +from nfv_common.helpers import coroutine +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton 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.volume_director') diff --git a/nfv/nfv-vim/nfv_vim/dor/__init__.py b/nfv/nfv-vim/nfv_vim/dor/__init__.py index 24f5e7f2..89ba311c 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 # -# flake8: noqa -# -from _dor_module import system_is_stabilized, dor_is_complete -from _dor_module import dor_initialize, dor_finalize +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 diff --git a/nfv/nfv-vim/nfv_vim/dor/_dor_module.py b/nfv/nfv-vim/nfv_vim/dor/_dor_module.py index 3892edca..17f05c02 100755 --- a/nfv/nfv-vim/nfv_vim/dor/_dor_module.py +++ b/nfv/nfv-vim/nfv_vim/dor/_dor_module.py @@ -5,17 +5,18 @@ # import os.path +from nfv_common import config from nfv_common import debug from nfv_common import timers -from nfv_common import config -from nfv_common.helpers import local_uptime_in_secs, process_uptime_in_secs from nfv_common.helpers import coroutine +from nfv_common.helpers import local_uptime_in_secs +from nfv_common.helpers import process_uptime_in_secs -from nfv_vim import nfvi -from nfv_vim import tables -from nfv_vim import objects from nfv_vim import alarm from nfv_vim import event_log +from nfv_vim import nfvi +from nfv_vim import objects +from nfv_vim import tables DLOG = debug.debug_get_logger('nfv_vim.dor') diff --git a/nfv/nfv-vim/nfv_vim/event_log/__init__.py b/nfv/nfv-vim/nfv_vim/event_log/__init__.py index ca7d61f6..a454c53c 100755 --- a/nfv/nfv-vim/nfv_vim/event_log/__init__.py +++ b/nfv/nfv-vim/nfv_vim/event_log/__init__.py @@ -3,12 +3,12 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from nfv_common.event_log import * +from nfv_common.event_log import * # noqa: F401,F403 -from _general import issue_general_log -from _host import host_issue_log, hypervisor_issue_log -from _instance import instance_issue_log, instance_last_event -from _instance import instance_manage_events -from _sw_update import sw_update_issue_log +from nfv_vim.event_log._general import issue_general_log # noqa: F401 +from nfv_vim.event_log._host import host_issue_log # noqa: F401 +from nfv_vim.event_log._host import hypervisor_issue_log # noqa: F401 +from nfv_vim.event_log._instance import instance_issue_log # noqa: F401 +from nfv_vim.event_log._instance import instance_last_event # noqa: F401 +from nfv_vim.event_log._instance import instance_manage_events # noqa: F401 +from nfv_vim.event_log._sw_update import sw_update_issue_log # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/events/__init__.py b/nfv/nfv-vim/nfv_vim/events/__init__.py index 965069f9..1bc8ccfd 100755 --- a/nfv/nfv-vim/nfv_vim/events/__init__.py +++ b/nfv/nfv-vim/nfv_vim/events/__init__.py @@ -3,6 +3,5 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _events_module import events_initialize, events_finalize +from nfv_vim.events._events_module import events_initialize # noqa: F401 +from nfv_vim.events._events_module import events_finalize # 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 3d77883c..9730b007 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 _vim_api_events import vim_api_events_initialize -from _vim_api_events import vim_api_events_finalize -from _vim_nfvi_events import vim_nfvi_events_initialize -from _vim_nfvi_events import vim_nfvi_events_finalize +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_nfvi_events import vim_nfvi_events_finalize 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 11278835..9b9fcdca 100755 --- a/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py +++ b/nfv/nfv-vim/nfv_vim/events/_vim_api_events.py @@ -9,59 +9,59 @@ from nfv_common import tcp from nfv_vim import rpc -from _vim_image_api_events import vim_image_api_initialize -from _vim_image_api_events import vim_image_api_finalize -from _vim_image_api_events import vim_image_api_create_image -from _vim_image_api_events import vim_image_api_delete_image -from _vim_image_api_events import vim_image_api_update_image -from _vim_image_api_events import vim_image_api_get_image -from _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_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_get_image +from nfv_vim.events._vim_image_api_events import vim_image_api_get_images -from _vim_volume_api_events import vim_volume_api_initialize -from _vim_volume_api_events import vim_volume_api_finalize -from _vim_volume_api_events import vim_volume_api_create_volume -from _vim_volume_api_events import vim_volume_api_delete_volume -from _vim_volume_api_events import vim_volume_api_update_volume -from _vim_volume_api_events import vim_volume_api_get_volume -from _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_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_get_volume +from nfv_vim.events._vim_volume_api_events import vim_volume_api_get_volumes -from _vim_instance_api_events import vim_instance_api_initialize -from _vim_instance_api_events import vim_instance_api_finalize -from _vim_instance_api_events import vim_instance_api_create_instance -from _vim_instance_api_events import vim_instance_api_start_instance -from _vim_instance_api_events import vim_instance_api_stop_instance -from _vim_instance_api_events import vim_instance_api_pause_instance -from _vim_instance_api_events import vim_instance_api_unpause_instance -from _vim_instance_api_events import vim_instance_api_suspend_instance -from _vim_instance_api_events import vim_instance_api_resume_instance -from _vim_instance_api_events import vim_instance_api_reboot_instance -from _vim_instance_api_events import vim_instance_api_live_migrate_instance -from _vim_instance_api_events import vim_instance_api_cold_migrate_instance -from _vim_instance_api_events import vim_instance_api_evacuate_instance -from _vim_instance_api_events import vim_instance_api_delete_instance -from _vim_instance_api_events import vim_instance_api_get_instance -from _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_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_delete_instance +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 _vim_network_api_events import vim_network_api_initialize -from _vim_network_api_events import vim_network_api_finalize -from _vim_network_api_events import vim_network_api_create_subnet -from _vim_network_api_events import vim_network_api_update_subnet -from _vim_network_api_events import vim_network_api_delete_subnet -from _vim_network_api_events import vim_network_api_get_subnet -from _vim_network_api_events import vim_network_api_get_subnets -from _vim_network_api_events import vim_network_api_create_network -from _vim_network_api_events import vim_network_api_update_network -from _vim_network_api_events import vim_network_api_delete_network -from _vim_network_api_events import vim_network_api_get_network -from _vim_network_api_events import vim_network_api_get_networks +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_delete_network +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 _vim_sw_update_api_events import vim_sw_update_api_create_strategy -from _vim_sw_update_api_events import vim_sw_update_api_apply_strategy -from _vim_sw_update_api_events import vim_sw_update_api_abort_strategy -from _vim_sw_update_api_events import vim_sw_update_api_delete_strategy -from _vim_sw_update_api_events import vim_sw_update_api_get_strategy -from _vim_sw_update_api_events import vim_sw_update_api_initialize -from _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_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_delete_strategy +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/host_fsm/__init__.py b/nfv/nfv-vim/nfv_vim/host_fsm/__init__.py index ae60dd1b..48525585 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/__init__.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/__init__.py @@ -3,7 +3,6 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _host_defs import HOST_EVENT, HOST_STATE -from _host_fsm import HostStateMachine +from nfv_vim.host_fsm._host_defs import HOST_EVENT # noqa: F401 +from nfv_vim.host_fsm._host_defs import HOST_STATE # noqa: F401 +from nfv_vim.host_fsm._host_fsm import HostStateMachine # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_defs.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_defs.py index 65d86cd9..c729ec90 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_defs.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) 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 1fc480dd..41814e34 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_fsm.py @@ -6,17 +6,17 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE -from _host_state_initial import InitialState -from _host_state_configure import ConfigureState -from _host_state_enabling import EnablingState -from _host_state_enabled import EnabledState -from _host_state_disabling import DisablingState -from _host_state_disabling_failed import DisablingFailedState -from _host_state_disabled import DisabledState -from _host_state_deleting import DeletingState -from _host_state_deleting_failed import DeletingFailedState -from _host_state_deleted import DeletedState +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_deleting import DeletingState +from nfv_vim.host_fsm._host_state_deleting_failed import DeletingFailedState +from nfv_vim.host_fsm._host_state_deleted import DeletedState DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_configure.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_configure.py index c9436e74..687ccde4 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_configure.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_configure.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import AddHostTask +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 AddHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting.py index d88a0094..c5a946a6 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting.py @@ -8,8 +8,9 @@ from nfv_common import debug from nfv_common import state_machine from nfv_common import timers -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import DeleteHostTask +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 DeleteHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting_failed.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting_failed.py index 325dedb9..2539054e 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting_failed.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_deleting_failed.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import NotifyDeleteFailedTask +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 NotifyDeleteFailedTask 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 10acf863..0cca9693 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 @@ -6,9 +6,11 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import FailHostTask, NotifyDisabledHostTask -from _host_tasks import AuditDisabledHostTask +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 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_state_disabling.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling.py index 529bbbcc..91e564e1 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import DisableHostTask +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 DisableHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling_failed.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling_failed.py index 455c0a5d..4b4d8a8f 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling_failed.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_disabling_failed.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import NotifyDisableFailedTask +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 NotifyDisableFailedTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabled.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabled.py index c546e861..ee4c7da0 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabled.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabled.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import AuditEnabledHostTask +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 AuditEnabledHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabling.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabling.py index aa1fc3b7..b96a2f5d 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabling.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_enabling.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT -from _host_tasks import EnableHostTask +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 EnableHostTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.host') diff --git a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_initial.py b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_initial.py index f5569243..8c027298 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_initial.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_state_initial.py @@ -6,7 +6,8 @@ from nfv_common import debug from nfv_common import state_machine -from _host_defs import HOST_STATE, HOST_EVENT +from nfv_vim.host_fsm._host_defs import HOST_EVENT +from nfv_vim.host_fsm._host_defs import HOST_STATE 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 319671ea..ec42b174 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 @@ -7,13 +7,13 @@ import weakref from nfv_common.helpers import coroutine from nfv_common import config -from nfv_common import state_machine from nfv_common import debug +from nfv_common import state_machine from nfv_common import timers from nfv_vim import nfvi -from _host_defs import HOST_EVENT +from nfv_vim.host_fsm._host_defs import HOST_EVENT DLOG = debug.debug_get_logger('nfv_vim.state_machine.host_task_work') 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 5aa51909..e1715387 100755 --- a/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py +++ b/nfv/nfv-vim/nfv_vim/host_fsm/_host_tasks.py @@ -8,24 +8,24 @@ import weakref from nfv_common import state_machine from nfv_common import debug -from _host_defs import HOST_EVENT -from _host_task_work import QueryHypervisorTaskWork -from _host_task_work import NotifyHostEnabledTaskWork -from _host_task_work import NotifyHostDisabledTaskWork -from _host_task_work import NotifyHostFailedTaskWork -from _host_task_work import CreateHostServicesTaskWork -from _host_task_work import DeleteHostServicesTaskWork -from _host_task_work import EnableHostServicesTaskWork -from _host_task_work import DisableHostServicesTaskWork -from _host_task_work import NotifyHostServicesEnabledTaskWork -from _host_task_work import NotifyHostServicesDisabledTaskWork -from _host_task_work import NotifyHostServicesDisableFailedTaskWork -from _host_task_work import NotifyHostServicesDeletedTaskWork -from _host_task_work import NotifyHostServicesDeleteFailedTaskWork -from _host_task_work import NotifyInstancesHostDisablingTaskWork -from _host_task_work import NotifyInstancesHostDisabledTaskWork -from _host_task_work import AuditHostServicesTaskWork -from _host_task_work import AuditInstancesTaskWork +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 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 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 NotifyInstancesHostDisabledTaskWork +from nfv_vim.host_fsm._host_task_work import AuditHostServicesTaskWork +from nfv_vim.host_fsm._host_task_work import AuditInstancesTaskWork 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 2362795b..33a47e52 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/__init__.py @@ -3,29 +3,28 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _instance_defs import INSTANCE_EVENT, INSTANCE_STATE -from _instance_fsm import LiveMigrateStateMachine -from _instance_fsm import ColdMigrateStateMachine -from _instance_fsm import ColdMigrateConfirmStateMachine -from _instance_fsm import ColdMigrateRevertStateMachine -from _instance_fsm import EvacuateStateMachine -from _instance_fsm import StartStateMachine -from _instance_fsm import StopStateMachine -from _instance_fsm import PauseStateMachine -from _instance_fsm import UnpauseStateMachine -from _instance_fsm import SuspendStateMachine -from _instance_fsm import ResumeStateMachine -from _instance_fsm import RebootStateMachine -from _instance_fsm import RebuildStateMachine -from _instance_fsm import FailStateMachine -from _instance_fsm import DeleteStateMachine -from _instance_fsm import ResizeStateMachine -from _instance_fsm import ResizeConfirmStateMachine -from _instance_fsm import ResizeRevertStateMachine -from _instance_fsm import GuestServicesCreateStateMachine -from _instance_fsm import GuestServicesEnableStateMachine -from _instance_fsm import GuestServicesDisableStateMachine -from _instance_fsm import GuestServicesSetStateMachine -from _instance_fsm import GuestServicesDeleteStateMachine +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 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 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 diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_defs.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_defs.py index b79e8045..2e791e00 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_defs.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_defs.py @@ -5,7 +5,8 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) 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 b4ca8adb..3965d4c8 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_fsm.py @@ -6,32 +6,32 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE -from _instance_state_initial import InitialState -from _instance_state_live_migrate import LiveMigrateState -from _instance_state_live_migrate_finish import LiveMigrateFinishState -from _instance_state_cold_migrate import ColdMigrateState -from _instance_state_cold_migrate_confirm import ColdMigrateConfirmState -from _instance_state_cold_migrate_revert import ColdMigrateRevertState -from _instance_state_evacuate import EvacuateState -from _instance_state_start import StartState -from _instance_state_stop import StopState -from _instance_state_pause import PauseState -from _instance_state_unpause import UnpauseState -from _instance_state_suspend import SuspendState -from _instance_state_resume import ResumeState -from _instance_state_reboot import RebootState -from _instance_state_rebuild import RebuildState -from _instance_state_fail import FailState -from _instance_state_resize import ResizeState -from _instance_state_resize_confirm import ResizeConfirmState -from _instance_state_resize_revert import ResizeRevertState -from _instance_state_delete import DeleteState -from _instance_state_guest_services_create import GuestServicesCreateState -from _instance_state_guest_services_enable import GuestServicesEnableState -from _instance_state_guest_services_disable import GuestServicesDisableState -from _instance_state_guest_services_set import GuestServicesSetState -from _instance_state_guest_services_delete import GuestServicesDeleteState +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_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_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 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 115da86c..d2fc4ec2 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 @@ -7,8 +7,9 @@ from nfv_common import debug from nfv_common import timers from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ColdMigrateTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ColdMigrateTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_confirm.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_confirm.py index 050adadf..2f45e66a 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_confirm.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_confirm.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ColdMigrateConfirmTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ColdMigrateConfirmTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_revert.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_revert.py index 291fe1b8..568a4bd9 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_revert.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_cold_migrate_revert.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ColdMigrateRevertTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ColdMigrateRevertTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_delete.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_delete.py index eadb02e1..af3e62dd 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_delete.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_delete.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import DeleteTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import DeleteTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_evacuate.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_evacuate.py index d12e0738..b3b6d2e9 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_evacuate.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_evacuate.py @@ -4,11 +4,12 @@ # 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 _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import EvacuateTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import EvacuateTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_fail.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_fail.py index 2eaca4f8..83d0aeb9 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_fail.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_fail.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import FailTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import FailTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_create.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_create.py index 1f1ad9ca..733efe04 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_create.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_create.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import GuestServicesCreateTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import GuestServicesCreateTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_delete.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_delete.py index 8ebb7a00..1c4814da 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_delete.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_delete.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import GuestServicesDeleteTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import GuestServicesDeleteTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_disable.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_disable.py index 431e9524..8f61f0d5 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_disable.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_disable.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import GuestServicesDisableTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import GuestServicesDisableTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_enable.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_enable.py index 6b2f6b25..39d3cb2d 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_enable.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_enable.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import GuestServicesEnableTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import GuestServicesEnableTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_set.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_set.py index dde2c981..d3bbfcfc 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_set.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_guest_services_set.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import GuestServicesSetTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import GuestServicesSetTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_initial.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_initial.py index 8672bc1b..558d00f6 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_initial.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_initial.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate.py index 70632998..01e2757c 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate.py @@ -4,11 +4,12 @@ # 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 _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import LiveMigrateTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import LiveMigrateTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate_finish.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate_finish.py index 84b8a671..b8cb03f3 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate_finish.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_live_migrate_finish.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import LiveMigrateFinishTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import LiveMigrateFinishTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_pause.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_pause.py index fd7bc8e8..0648106a 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_pause.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_pause.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import PauseTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import PauseTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_reboot.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_reboot.py index 7d3d315c..f1ea1edc 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_reboot.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_reboot.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import RebootTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import RebootTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_rebuild.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_rebuild.py index bcca2c92..0d5f56d3 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_rebuild.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_rebuild.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import RebuildTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import RebuildTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize.py index c3b5305d..24c10ae3 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ResizeTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ResizeTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_confirm.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_confirm.py index 69b1ab43..f64fd2cf 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_confirm.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_confirm.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ResizeConfirmTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ResizeConfirmTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_revert.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_revert.py index be2fe9b4..3ed49a55 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_revert.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resize_revert.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ResizeRevertTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ResizeRevertTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resume.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resume.py index f3a58108..28f4c07e 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resume.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_resume.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import ResumeTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import ResumeTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_start.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_start.py index 0fdad587..3b2fd85e 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_start.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_start.py @@ -7,8 +7,9 @@ from nfv_common import debug from nfv_common import state_machine from nfv_common import timers -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import StartTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import StartTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_stop.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_stop.py index e909cc38..f08dd150 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_stop.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_stop.py @@ -4,11 +4,12 @@ # 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 _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import StopTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import StopTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_suspend.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_suspend.py index 8ea05c43..d9db2cc5 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_suspend.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_suspend.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import SuspendTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import SuspendTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_unpause.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_unpause.py index bc323062..a1c3955b 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_unpause.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_state_unpause.py @@ -6,8 +6,9 @@ from nfv_common import debug from nfv_common import state_machine -from _instance_defs import INSTANCE_STATE, INSTANCE_EVENT -from _instance_tasks import UnpauseTask +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_STATE +from nfv_vim.instance_fsm._instance_tasks import UnpauseTask DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance') diff --git a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_task_work.py b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_task_work.py index 1549b803..c332e729 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_task_work.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_task_work.py @@ -7,12 +7,12 @@ import weakref from nfv_common.helpers import coroutine -from nfv_common import state_machine from nfv_common import debug +from nfv_common import state_machine from nfv_vim import nfvi -from _instance_defs import INSTANCE_EVENT +from nfv_vim.instance_fsm._instance_defs import INSTANCE_EVENT DLOG = debug.debug_get_logger('nfv_vim.state_machine.instance_task_work') 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 40e755d3..b27e605e 100755 --- a/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py +++ b/nfv/nfv-vim/nfv_vim/instance_fsm/_instance_tasks.py @@ -5,37 +5,37 @@ # import weakref -from nfv_common import state_machine from nfv_common import debug +from nfv_common import state_machine -from _instance_defs import INSTANCE_EVENT -from _instance_task_work import QueryHypervisorTaskWork -from _instance_task_work import LiveMigrateTaskWork -from _instance_task_work import ColdMigrateTaskWork -from _instance_task_work import ColdMigrateConfirmTaskWork -from _instance_task_work import ColdMigrateRevertTaskWork -from _instance_task_work import ResizeTaskWork -from _instance_task_work import ResizeConfirmTaskWork -from _instance_task_work import ResizeRevertTaskWork -from _instance_task_work import EvacuateTaskWork -from _instance_task_work import StartTaskWork -from _instance_task_work import StopTaskWork -from _instance_task_work import PauseTaskWork -from _instance_task_work import UnpauseTaskWork -from _instance_task_work import SuspendTaskWork -from _instance_task_work import ResumeTaskWork -from _instance_task_work import RebootTaskWork -from _instance_task_work import RebuildTaskWork -from _instance_task_work import FailTaskWork -from _instance_task_work import DeleteTaskWork -from _instance_task_work import GuestServicesCreateTaskWork -from _instance_task_work import GuestServicesEnableTaskWork -from _instance_task_work import GuestServicesDisableTaskWork -from _instance_task_work import GuestServicesSetTaskWork -from _instance_task_work import GuestServicesDeleteTaskWork -from _instance_task_work import GuestServicesVoteTaskWork -from _instance_task_work import GuestServicesPreNotifyTaskWork -from _instance_task_work import GuestServicesPostNotifyTaskWork +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 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 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 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 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 0fc17665..a233f0fe 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/__init__.py @@ -3,117 +3,116 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import api -import objects +import nfv_vim.nfvi.api # noqa: F401 +import nfv_vim.nfvi.objects # noqa: F401 -from _nfvi_defs import NFVI_ERROR_CODE -from _nfvi_identity_module import nfvi_get_tenants -from _nfvi_guest_module import nfvi_guest_services_create -from _nfvi_guest_module import nfvi_guest_services_set -from _nfvi_guest_module import nfvi_guest_services_delete -from _nfvi_guest_module import nfvi_guest_services_query -from _nfvi_guest_module import nfvi_guest_services_vote -from _nfvi_guest_module import nfvi_guest_services_notify -from _nfvi_guest_module import nfvi_register_host_services_query_callback -from _nfvi_guest_module import nfvi_register_guest_services_query_callback -from _nfvi_guest_module import nfvi_register_guest_services_state_notify_callback -from _nfvi_guest_module import nfvi_register_guest_services_alarm_notify_callback -from _nfvi_guest_module import nfvi_register_guest_services_action_notify_callback -from _nfvi_infrastructure_module import nfvi_get_system_info -from _nfvi_infrastructure_module import nfvi_get_system_state -from _nfvi_infrastructure_module import nfvi_get_hosts -from _nfvi_infrastructure_module import nfvi_get_host -from _nfvi_infrastructure_module import nfvi_get_upgrade -from _nfvi_infrastructure_module import nfvi_upgrade_start -from _nfvi_infrastructure_module import nfvi_upgrade_activate -from _nfvi_infrastructure_module import nfvi_upgrade_complete -from _nfvi_infrastructure_module import nfvi_create_host_services -from _nfvi_infrastructure_module import nfvi_delete_host_services -from _nfvi_infrastructure_module import nfvi_enable_host_services -from _nfvi_infrastructure_module import nfvi_disable_host_services -from _nfvi_infrastructure_module import nfvi_query_host_services -from _nfvi_infrastructure_module import nfvi_notify_host_services_enabled -from _nfvi_infrastructure_module import nfvi_notify_host_services_disabled -from _nfvi_infrastructure_module import nfvi_notify_host_services_disable_extend -from _nfvi_infrastructure_module import nfvi_notify_host_services_disable_failed -from _nfvi_infrastructure_module import nfvi_notify_host_services_deleted -from _nfvi_infrastructure_module import nfvi_notify_host_services_delete_failed -from _nfvi_infrastructure_module import nfvi_notify_host_enabled -from _nfvi_infrastructure_module import nfvi_notify_host_disabled -from _nfvi_infrastructure_module import nfvi_notify_host_failed -from _nfvi_infrastructure_module import nfvi_lock_host -from _nfvi_infrastructure_module import nfvi_unlock_host -from _nfvi_infrastructure_module import nfvi_reboot_host -from _nfvi_infrastructure_module import nfvi_upgrade_host -from _nfvi_infrastructure_module import nfvi_swact_from_host -from _nfvi_infrastructure_module import nfvi_get_alarms -from _nfvi_infrastructure_module import nfvi_get_logs -from _nfvi_infrastructure_module import nfvi_get_alarm_history -from _nfvi_infrastructure_module import nfvi_register_host_add_callback -from _nfvi_infrastructure_module import nfvi_register_host_action_callback -from _nfvi_infrastructure_module import nfvi_register_host_state_change_callback -from _nfvi_infrastructure_module import nfvi_register_host_get_callback -from _nfvi_infrastructure_module import nfvi_register_host_upgrade_callback -from _nfvi_infrastructure_module import nfvi_register_host_notification_callback -from _nfvi_image_module import nfvi_get_images -from _nfvi_image_module import nfvi_create_image -from _nfvi_image_module import nfvi_delete_image -from _nfvi_image_module import nfvi_update_image -from _nfvi_image_module import nfvi_get_image -from _nfvi_block_storage_module import nfvi_get_volumes -from _nfvi_block_storage_module import nfvi_create_volume -from _nfvi_block_storage_module import nfvi_delete_volume -from _nfvi_block_storage_module import nfvi_update_volume -from _nfvi_block_storage_module import nfvi_get_volume -from _nfvi_block_storage_module import nfvi_get_volume_snapshots -from _nfvi_network_module import nfvi_get_networks -from _nfvi_network_module import nfvi_create_network -from _nfvi_network_module import nfvi_update_network -from _nfvi_network_module import nfvi_delete_network -from _nfvi_network_module import nfvi_get_network -from _nfvi_network_module import nfvi_create_subnet -from _nfvi_network_module import nfvi_update_subnet -from _nfvi_network_module import nfvi_delete_subnet -from _nfvi_network_module import nfvi_get_subnet -from _nfvi_network_module import nfvi_get_subnets -from _nfvi_compute_module import nfvi_get_host_aggregates -from _nfvi_compute_module import nfvi_get_hypervisors -from _nfvi_compute_module import nfvi_get_hypervisor -from _nfvi_compute_module import nfvi_get_instance_types -from _nfvi_compute_module import nfvi_create_instance_type -from _nfvi_compute_module import nfvi_delete_instance_type -from _nfvi_compute_module import nfvi_get_instance_type -from _nfvi_compute_module import nfvi_get_instance_groups -from _nfvi_compute_module import nfvi_get_instances -from _nfvi_compute_module import nfvi_create_instance -from _nfvi_compute_module import nfvi_live_migrate_instance -from _nfvi_compute_module import nfvi_cold_migrate_instance -from _nfvi_compute_module import nfvi_cold_migrate_confirm_instance -from _nfvi_compute_module import nfvi_cold_migrate_revert_instance -from _nfvi_compute_module import nfvi_resize_instance -from _nfvi_compute_module import nfvi_resize_confirm_instance -from _nfvi_compute_module import nfvi_resize_revert_instance -from _nfvi_compute_module import nfvi_evacuate_instance -from _nfvi_compute_module import nfvi_reboot_instance -from _nfvi_compute_module import nfvi_rebuild_instance -from _nfvi_compute_module import nfvi_fail_instance -from _nfvi_compute_module import nfvi_pause_instance -from _nfvi_compute_module import nfvi_unpause_instance -from _nfvi_compute_module import nfvi_suspend_instance -from _nfvi_compute_module import nfvi_resume_instance -from _nfvi_compute_module import nfvi_start_instance -from _nfvi_compute_module import nfvi_stop_instance -from _nfvi_compute_module import nfvi_delete_instance -from _nfvi_compute_module import nfvi_get_instance -from _nfvi_compute_module import nfvi_reject_instance_action -from _nfvi_compute_module import nfvi_register_instance_delete_callback -from _nfvi_compute_module import nfvi_register_instance_state_change_callback -from _nfvi_compute_module import nfvi_register_instance_action_change_callback -from _nfvi_compute_module import nfvi_register_instance_action_callback -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_updates -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_query_hosts -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_host -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_update_hosts -from _nfvi_module import nfvi_initialize, nfvi_finalize +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_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_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_create_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_delete_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_enable_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_disable_host_services # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_query_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_enabled # noqa: F401 +from nfv_vim.nfvi._nfvi_infrastructure_module import nfvi_notify_host_disabled # 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_notification_callback # 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_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_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_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_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_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_module import nfvi_initialize # noqa: F401 +from nfv_vim.nfvi._nfvi_module import nfvi_finalize # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_module.py index 4dbeb0b2..4a7dcbff 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_block_storage_plugin import NFVIBlockStoragePlugin +from nfv_vim.nfvi._nfvi_block_storage_plugin import NFVIBlockStoragePlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_block_storage_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_plugin.py index 44b2b47c..c82b6b88 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_block_storage_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_block_storage_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_module.py index 799f010c..b98b6683 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_compute_plugin import NFVIComputePlugin +from nfv_vim.nfvi._nfvi_compute_plugin import NFVIComputePlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_compute_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_plugin.py index 53d6670a..b86f18a2 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_compute_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_compute_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_defs.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_defs.py index a6185e30..79142831 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_defs.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_module.py index b397244c..72bfca84 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_guest_plugin import NFVIGuestPlugin +from nfv_vim.nfvi._nfvi_guest_plugin import NFVIGuestPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_guest_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_plugin.py index bba20a1c..e54ab3d2 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_guest_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_guest_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_module.py index 16ccb3bf..96171473 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_identity_plugin import NFVIIdentityPlugin +from nfv_vim.nfvi._nfvi_identity_plugin import NFVIIdentityPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_identity_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_plugin.py index 773cd0e7..f74ff3d8 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_identity_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_identity_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_module.py index 1aadfbc6..1c2ff808 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_image_plugin import NFVIImagePlugin +from nfv_vim.nfvi._nfvi_image_plugin import NFVIImagePlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_image_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_plugin.py index f66814a3..2de747d7 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_image_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_image_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_module.py index b54457fd..fa699b48 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_infrastructure_plugin import NFVIInfrastructurePlugin +from nfv_vim.nfvi._nfvi_infrastructure_plugin import NFVIInfrastructurePlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_infrastructure_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_plugin.py index 22a49280..d8e65705 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_infrastructure_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_infrastructure_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py index 1438b773..941b5780 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_module.py @@ -6,19 +6,22 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_identity_module import nfvi_identity_initialize -from _nfvi_identity_module import nfvi_identity_finalize -from _nfvi_image_module import nfvi_image_initialize, nfvi_image_finalize -from _nfvi_block_storage_module import nfvi_block_storage_initialize -from _nfvi_block_storage_module import nfvi_block_storage_finalize -from _nfvi_network_module import nfvi_network_initialize, nfvi_network_finalize -from _nfvi_compute_module import nfvi_compute_initialize, nfvi_compute_finalize -from _nfvi_guest_module import nfvi_guest_initialize -from _nfvi_guest_module import nfvi_guest_finalize -from _nfvi_infrastructure_module import nfvi_infrastructure_initialize -from _nfvi_infrastructure_module import nfvi_infrastructure_finalize -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_initialize -from _nfvi_sw_mgmt_module import nfvi_sw_mgmt_finalize +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_compute_module import nfvi_compute_finalize +from nfv_vim.nfvi._nfvi_guest_module import nfvi_guest_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_infrastructure_module import nfvi_infrastructure_finalize +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_initialize +from nfv_vim.nfvi._nfvi_sw_mgmt_module import nfvi_sw_mgmt_finalize DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_module.py index 3ccb64d8..ddbe4f20 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_network_plugin import NFVINetworkPlugin +from nfv_vim.nfvi._nfvi_network_plugin import NFVINetworkPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_network_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_plugin.py index 47199d05..ddff4e63 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_network_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_network_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_module.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_module.py index 09998d9b..00b5a9cb 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_module.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_module.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _nfvi_sw_mgmt_plugin import NFVISwMgmtPlugin +from nfv_vim.nfvi._nfvi_sw_mgmt_plugin import NFVISwMgmtPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_sw_mgmt_module') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_plugin.py b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_plugin.py index d2b22f52..c72cc4c0 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_plugin.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/_nfvi_sw_mgmt_plugin.py @@ -6,7 +6,7 @@ from nfv_common import debug from nfv_common import tasks -from _nfvi_plugin import NFVIPlugin +from nfv_vim.nfvi._nfvi_plugin import NFVIPlugin DLOG = debug.debug_get_logger('nfv_vim.nfvi.nfvi_sw_mgmt_plugin') diff --git a/nfv/nfv-vim/nfv_vim/nfvi/api/__init__.py b/nfv/nfv-vim/nfv_vim/nfvi/api/__init__.py index 90b33192..5496e062 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/api/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/api/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import v1 +import nfv_vim.nfvi.api.v1 # noqa: F401 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 d474728e..bc346f94 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/api/v1/__init__.py @@ -3,13 +3,11 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _nfvi_identity_api import NFVIIdentityAPI -from _nfvi_image_api import NFVIImageAPI -from _nfvi_block_storage_api import NFVIBlockStorageAPI -from _nfvi_network_api import NFVINetworkAPI -from _nfvi_compute_api import NFVIComputeAPI -from _nfvi_infrastructure_api import NFVIInfrastructureAPI -from _nfvi_guest_api import NFVIGuestAPI -from _nfvi_sw_mgmt_api import NFVISwMgmtAPI +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_sw_mgmt_api import NFVISwMgmtAPI # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/__init__.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/__init__.py index 90b33192..4fba8cf7 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -import v1 +import nfv_vim.nfvi.objects.v1 # 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 8a13f155..4a089038 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/__init__.py @@ -3,37 +3,63 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _paging import Paging -from _tenant import Tenant -from _image import IMAGE_AVAIL_STATUS, IMAGE_ACTION, IMAGE_PROPERTY -from _image import ImageAttributes, Image -from _volume import VOLUME_AVAIL_STATUS, VOLUME_ACTION, Volume -from _volume_snapshot import VolumeSnapshot -from _subnet import Subnet -from _network import NETWORK_ADMIN_STATE, NETWORK_OPER_STATE -from _network import NETWORK_AVAIL_STATUS, NetworkProviderData, Network -from _service_host import ServiceHost -from _hypervisor import HYPERVISOR_ADMIN_STATE, HYPERVISOR_OPER_STATE -from _hypervisor import Hypervisor -from _instance import INSTANCE_ADMIN_STATE, INSTANCE_OPER_STATE -from _instance import INSTANCE_AVAIL_STATUS, INSTANCE_ACTION -from _instance import INSTANCE_ACTION_TYPE, INSTANCE_ACTION_STATE -from _instance import INSTANCE_REBUILD_OPTION, INSTANCE_RESIZE_OPTION -from _instance import INSTANCE_REBOOT_OPTION, INSTANCE_LIVE_MIGRATE_OPTION -from _instance import INSTANCE_GUEST_SERVICE_STATE, Instance, InstanceActionData -from _instance_type import STORAGE_TYPE, INSTANCE_TYPE_EXTENSION -from _instance_type import InstanceTypeAttributes, InstanceType -from _instance_group import INSTANCE_GROUP_POLICY, InstanceGroup -from _host import HOST_ADMIN_STATE, HOST_OPER_STATE -from _host import HOST_AVAIL_STATUS, HOST_ACTION, HOST_NOTIFICATIONS, Host -from _host_aggregate import HostAggregate -from _host_group import HOST_GROUP_POLICY, HostGroup -from _system import System -from _upgrade import UPGRADE_STATE, Upgrade -from _guest_service import GUEST_SERVICE_NAME, GUEST_SERVICE_ADMIN_STATE -from _guest_service import GUEST_SERVICE_OPER_STATE, GuestService -from _host_sw_patch import HostSwPatch -from _sw_patch import SwPatch -from _alarm import ALARM_SEVERITY, Alarm +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._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 # 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._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 diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_alarm.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_alarm.py index b22c66c7..9560c930 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_alarm.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_alarm.py @@ -5,9 +5,11 @@ # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_guest_service.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_guest_service.py index c03b255e..f7ee3ad1 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_guest_service.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_guest_service.py @@ -5,9 +5,11 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host.py index 3bc41abb..4abf0690 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host.py @@ -5,9 +5,11 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_aggregate.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_aggregate.py index 268e0275..a2660d0b 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_aggregate.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_aggregate.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class HostAggregate(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_group.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_group.py index b0789b95..2e69419b 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_group.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_group.py @@ -5,9 +5,11 @@ # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_sw_patch.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_sw_patch.py index 48ef8f24..40b5f206 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_sw_patch.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_host_sw_patch.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class HostSwPatch(ObjectData): 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 6c42d3ab..f9664b5a 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_hypervisor.py @@ -4,9 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_image.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_image.py index 4f1b9645..9cb42876 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_image.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_image.py @@ -5,9 +5,11 @@ # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @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 b9921be3..28bd9a8b 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance.py @@ -6,10 +6,13 @@ import six from datetime import datetime -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._instance_type import INSTANCE_TYPE_EXTENSION +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Object, Constant, Constants, Singleton -from _instance_type import INSTANCE_TYPE_EXTENSION +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Object +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_group.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_group.py index d0a5f7fe..f4623a74 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_group.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_instance_group.py @@ -5,9 +5,11 @@ # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) 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 27c4e250..b76bd453 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,8 +4,10 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +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 @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 e92e7730..4891a366 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_network.py @@ -4,9 +4,11 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_service_host.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_service_host.py index 396b06f1..b7b8f6ae 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_service_host.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_service_host.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class ServiceHost(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_subnet.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_subnet.py index 5935a533..970976f8 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_subnet.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_subnet.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class Subnet(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_sw_patch.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_sw_patch.py index a53dd4c4..b7a7d41a 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_sw_patch.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_sw_patch.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class SwPatch(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_system.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_system.py index 818eadee..a7cd63ff 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_system.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_system.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class System(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_tenant.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_tenant.py index a1647afd..00254153 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_tenant.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_tenant.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class Tenant(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_upgrade.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_upgrade.py index 897ee346..e01bd484 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_upgrade.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_upgrade.py @@ -5,9 +5,11 @@ # import six -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume.py index b6d9612e..5e714448 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume.py @@ -5,9 +5,11 @@ # import six -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume_snapshot.py b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume_snapshot.py index c3c87f20..028b0ba4 100755 --- a/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume_snapshot.py +++ b/nfv/nfv-vim/nfv_vim/nfvi/objects/v1/_volume_snapshot.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.nfvi.objects.v1._object import ObjectData class VolumeSnapshot(ObjectData): diff --git a/nfv/nfv-vim/nfv_vim/objects/__init__.py b/nfv/nfv-vim/nfv_vim/objects/__init__.py index 6699aacf..09214a50 100755 --- a/nfv/nfv-vim/nfv_vim/objects/__init__.py +++ b/nfv/nfv-vim/nfv_vim/objects/__init__.py @@ -3,29 +3,40 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _tenant import Tenant -from _system import System -from _host import HOST_PERSONALITY, HOST_NAME, HOST_SERVICE_STATE, Host -from _host_group import HOST_GROUP_POLICY, HostGroup -from _image import ImageAttributes, Image -from _volume import Volume -from _volume_snapshot import VolumeSnapshot -from _service_host import ServiceHost -from _host_aggregate import HostAggregate -from _hypervisor import Hypervisor -from _instance import INSTANCE_ACTION_TYPE, INSTANCE_ACTION_STATE -from _instance import INSTANCE_ACTION_INITIATED_BY -from _instance import InstanceActionData, Instance -from _instance_type import STORAGE_TYPE, INSTANCE_TYPE_EXTENSION -from _instance_type import InstanceType, InstanceTypeAttributes -from _instance_group import INSTANCE_GROUP_POLICY, InstanceGroup -from _subnet import Subnet -from _network import NetworkProviderData, Network -from _guest_services import GuestServices -from _sw_update import SW_UPDATE_TYPE, SW_UPDATE_APPLY_TYPE -from _sw_update import SW_UPDATE_INSTANCE_ACTION, SwUpdate -from _sw_update import SW_UPDATE_ALARM_RESTRICTION -from _sw_patch import SwPatch -from _sw_upgrade import SwUpgrade +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._host import HOST_NAME # noqa: F401 +from nfv_vim.objects._host import HOST_SERVICE_STATE # noqa: F401 +from nfv_vim.objects._host import Host # 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._instance import Instance # noqa: F401 +from nfv_vim.objects._instance_type import STORAGE_TYPE # 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._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._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 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 diff --git a/nfv/nfv-vim/nfv_vim/objects/_guest_services.py b/nfv/nfv-vim/nfv_vim/objects/_guest_services.py index 2638c318..9ba53358 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_guest_services.py +++ b/nfv/nfv-vim/nfv_vim/objects/_guest_services.py @@ -6,9 +6,10 @@ import six from nfv_common import debug -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_vim import nfvi diff --git a/nfv/nfv-vim/nfv_vim/objects/_host.py b/nfv/nfv-vim/nfv_vim/objects/_host.py index f9a2419c..43e03e51 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_host.py +++ b/nfv/nfv-vim/nfv_vim/objects/_host.py @@ -6,16 +6,17 @@ import six from nfv_common import debug -from nfv_common import timers from nfv_common import state_machine -from nfv_common.helpers import Constant, Singleton +from nfv_common import timers +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton -from _object import ObjectData +from nfv_vim.objects._object import ObjectData -from nfv_vim import nfvi -from nfv_vim import host_fsm from nfv_vim import alarm from nfv_vim import event_log +from nfv_vim import host_fsm +from nfv_vim import nfvi DLOG = debug.debug_get_logger('nfv_vim.objects.host') diff --git a/nfv/nfv-vim/nfv_vim/objects/_host_aggregate.py b/nfv/nfv-vim/nfv_vim/objects/_host_aggregate.py index 8b23df0f..5988500a 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_host_aggregate.py +++ b/nfv/nfv-vim/nfv_vim/objects/_host_aggregate.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_host_group.py b/nfv/nfv-vim/nfv_vim/objects/_host_group.py index 2a5d2980..ee464c82 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_host_group.py +++ b/nfv/nfv-vim/nfv_vim/objects/_host_group.py @@ -4,10 +4,12 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton DLOG = debug.debug_get_logger('nfv_vim.objects.host_group') diff --git a/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py b/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py index 0e610895..d21df88d 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py +++ b/nfv/nfv-vim/nfv_vim/objects/_hypervisor.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_image.py b/nfv/nfv-vim/nfv_vim/objects/_image.py index c475de4b..04a70faa 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_image.py +++ b/nfv/nfv-vim/nfv_vim/objects/_image.py @@ -4,11 +4,13 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug from nfv_common import state_machine -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton from nfv_vim import nfvi diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance.py b/nfv/nfv-vim/nfv_vim/objects/_instance.py index 34f0ce64..2981470f 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance.py @@ -3,27 +3,29 @@ # # SPDX-License-Identifier: Apache-2.0 # +import collections +import datetime import six import uuid import weakref -import collections -import datetime -from _object import ObjectData +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.helpers import Singleton, Constant, Constants +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton -from nfv_vim import nfvi from nfv_vim import alarm from nfv_vim import event_log from nfv_vim import instance_fsm +from nfv_vim import nfvi -from _instance_type import STORAGE_TYPE -from _guest_services import GuestServices +from nfv_vim.objects._instance_type import STORAGE_TYPE +from nfv_vim.objects._guest_services import GuestServices DLOG = debug.debug_get_logger('nfv_vim.objects.instance') MAX_EVENT_REASON_LENGTH = 255 diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance_group.py b/nfv/nfv-vim/nfv_vim/objects/_instance_group.py index b7ba6f34..30e7b57f 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance_group.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance_group.py @@ -4,10 +4,12 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton from nfv_vim import alarm diff --git a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py index b041d959..07ff8bc3 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_instance_type.py +++ b/nfv/nfv-vim/nfv_vim/objects/_instance_type.py @@ -4,10 +4,12 @@ # SPDX-License-Identifier: Apache-2.0 # import six -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton DLOG = debug.debug_get_logger('nfv_vim.objects.instance_type') diff --git a/nfv/nfv-vim/nfv_vim/objects/_network.py b/nfv/nfv-vim/nfv_vim/objects/_network.py index 1d028efe..788e241e 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_network.py +++ b/nfv/nfv-vim/nfv_vim/objects/_network.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_service_host.py b/nfv/nfv-vim/nfv_vim/objects/_service_host.py index 2daed0a8..94cb8b88 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_service_host.py +++ b/nfv/nfv-vim/nfv_vim/objects/_service_host.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_subnet.py b/nfv/nfv-vim/nfv_vim/objects/_subnet.py index 74c7317d..227ab677 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_subnet.py +++ b/nfv/nfv-vim/nfv_vim/objects/_subnet.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py b/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py index 39844a0b..06d239e6 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_patch.py @@ -3,16 +3,18 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_common import timers 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 _sw_update import SwUpdate, SW_UPDATE_TYPE, SW_UPDATE_ALARM_TYPES -from _sw_update import SW_UPDATE_EVENT_IDS +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 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 7b33b75c..0969aa8d 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_update.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_update.py @@ -6,14 +6,17 @@ import six import uuid -from nfv_common import timers from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton, coroutine +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_vim import alarm from nfv_vim import event_log -from _object import ObjectData +from nfv_vim.objects._object import ObjectData DLOG = debug.debug_get_logger('nfv_vim.objects.sw_update') diff --git a/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py b/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py index 32c89c8a..b06944b7 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py +++ b/nfv/nfv-vim/nfv_vim/objects/_sw_upgrade.py @@ -10,8 +10,10 @@ from nfv_vim import alarm from nfv_vim import event_log from nfv_vim import nfvi -from _sw_update import SwUpdate, SW_UPDATE_TYPE, SW_UPDATE_ALARM_TYPES -from _sw_update import SW_UPDATE_EVENT_IDS +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 DLOG = debug.debug_get_logger('nfv_vim.objects.sw_upgrade') diff --git a/nfv/nfv-vim/nfv_vim/objects/_system.py b/nfv/nfv-vim/nfv_vim/objects/_system.py index 5b0ecfb0..142ecbda 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_system.py +++ b/nfv/nfv-vim/nfv_vim/objects/_system.py @@ -5,7 +5,7 @@ # from nfv_common import debug -from _object import ObjectData +from nfv_vim.objects._object import ObjectData DLOG = debug.debug_get_logger('nfv_vim.objects.system') diff --git a/nfv/nfv-vim/nfv_vim/objects/_tenant.py b/nfv/nfv-vim/nfv_vim/objects/_tenant.py index a0fbff1a..e5258943 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_tenant.py +++ b/nfv/nfv-vim/nfv_vim/objects/_tenant.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_volume.py b/nfv/nfv-vim/nfv_vim/objects/_volume.py index c44d95d4..a569ef9b 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_volume.py +++ b/nfv/nfv-vim/nfv_vim/objects/_volume.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/objects/_volume_snapshot.py b/nfv/nfv-vim/nfv_vim/objects/_volume_snapshot.py index 19412efd..359529dd 100755 --- a/nfv/nfv-vim/nfv_vim/objects/_volume_snapshot.py +++ b/nfv/nfv-vim/nfv_vim/objects/_volume_snapshot.py @@ -3,7 +3,7 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _object import ObjectData +from nfv_vim.objects._object import ObjectData from nfv_common import debug diff --git a/nfv/nfv-vim/nfv_vim/rpc/__init__.py b/nfv/nfv-vim/nfv_vim/rpc/__init__.py index a23c7365..a87932eb 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/__init__.py +++ b/nfv/nfv-vim/nfv_vim/rpc/__init__.py @@ -3,72 +3,82 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +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_message import RPCMessage # noqa: F401 -from _rpc_message_image import APIRequestCreateImage, APIResponseCreateImage -from _rpc_message_image import APIRequestUpdateImage, APIResponseUpdateImage -from _rpc_message_image import APIRequestDeleteImage, APIResponseDeleteImage -from _rpc_message_image import APIRequestGetImage, APIResponseGetImage +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 APIResponseGetImage # noqa: F401 -from _rpc_message_volume import APIRequestCreateVolume, APIResponseCreateVolume -from _rpc_message_volume import APIRequestUpdateVolume, APIResponseUpdateVolume -from _rpc_message_volume import APIRequestDeleteVolume, APIResponseDeleteVolume -from _rpc_message_volume import APIRequestGetVolume, APIResponseGetVolume +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 APIResponseGetVolume # noqa: F401 -from _rpc_message_instance import APIRequestCreateInstance -from _rpc_message_instance import APIResponseCreateInstance -from _rpc_message_instance import APIRequestStartInstance -from _rpc_message_instance import APIResponseStartInstance -from _rpc_message_instance import APIRequestStopInstance -from _rpc_message_instance import APIResponseStopInstance -from _rpc_message_instance import APIRequestPauseInstance -from _rpc_message_instance import APIResponsePauseInstance -from _rpc_message_instance import APIRequestUnpauseInstance -from _rpc_message_instance import APIResponseUnpauseInstance -from _rpc_message_instance import APIRequestSuspendInstance -from _rpc_message_instance import APIResponseSuspendInstance -from _rpc_message_instance import APIRequestResumeInstance -from _rpc_message_instance import APIResponseResumeInstance -from _rpc_message_instance import APIRequestRebootInstance -from _rpc_message_instance import APIResponseRebootInstance -from _rpc_message_instance import APIRequestLiveMigrateInstance -from _rpc_message_instance import APIResponseLiveMigrateInstance -from _rpc_message_instance import APIRequestColdMigrateInstance -from _rpc_message_instance import APIResponseColdMigrateInstance -from _rpc_message_instance import APIRequestEvacuateInstance -from _rpc_message_instance import APIResponseEvacuateInstance -from _rpc_message_instance import APIRequestDeleteInstance -from _rpc_message_instance import APIResponseDeleteInstance -from _rpc_message_instance import APIRequestGetInstance -from _rpc_message_instance import APIResponseGetInstance +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 APIRequestDeleteInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIRequestGetInstance # noqa: F401 +from nfv_vim.rpc._rpc_message_instance import APIResponseGetInstance # noqa: F401 -from _rpc_message_subnet import APIRequestCreateSubnet -from _rpc_message_subnet import APIResponseCreateSubnet -from _rpc_message_subnet import APIRequestUpdateSubnet -from _rpc_message_subnet import APIResponseUpdateSubnet -from _rpc_message_subnet import APIRequestDeleteSubnet -from _rpc_message_subnet import APIResponseDeleteSubnet -from _rpc_message_subnet import APIRequestGetSubnet, APIResponseGetSubnet +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 APIResponseGetSubnet # noqa: F401 -from _rpc_message_network import APIRequestCreateNetwork -from _rpc_message_network import APIResponseCreateNetwork -from _rpc_message_network import APIRequestUpdateNetwork -from _rpc_message_network import APIResponseUpdateNetwork -from _rpc_message_network import APIRequestDeleteNetwork -from _rpc_message_network import APIResponseDeleteNetwork -from _rpc_message_network import APIRequestGetNetwork, APIResponseGetNetwork +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 APIResponseGetNetwork # noqa: F401 -from _rpc_message_sw_update import APIRequestCreateSwUpdateStrategy -from _rpc_message_sw_update import APIRequestCreateSwUpgradeStrategy -from _rpc_message_sw_update import APIResponseCreateSwUpdateStrategy -from _rpc_message_sw_update import APIRequestApplySwUpdateStrategy -from _rpc_message_sw_update import APIResponseApplySwUpdateStrategy -from _rpc_message_sw_update import APIRequestAbortSwUpdateStrategy -from _rpc_message_sw_update import APIResponseAbortSwUpdateStrategy -from _rpc_message_sw_update import APIRequestDeleteSwUpdateStrategy -from _rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy -from _rpc_message_sw_update import APIRequestGetSwUpdateStrategy -from _rpc_message_sw_update import APIResponseGetSwUpdateStrategy +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 APIResponseGetSwUpdateStrategy # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_defs.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_defs.py index 69838d40..f09c3247 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_defs.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_defs.py @@ -5,7 +5,9 @@ # import six -from nfv_common.helpers import Constants, Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py index 97a0a2f3..b3599841 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message.py @@ -7,7 +7,9 @@ import json from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION DLOG = debug.debug_get_logger('nfv_vim.rpc') @@ -76,80 +78,80 @@ class RPCMessageFactory(object): """ RPC Message Factory """ - from _rpc_message_image import APIRequestCreateImage - from _rpc_message_image import APIResponseCreateImage - from _rpc_message_image import APIRequestUpdateImage - from _rpc_message_image import APIResponseUpdateImage - from _rpc_message_image import APIRequestDeleteImage - from _rpc_message_image import APIResponseDeleteImage - from _rpc_message_image import APIRequestGetImage - from _rpc_message_image import APIResponseGetImage + 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 APIResponseGetImage - from _rpc_message_volume import APIRequestCreateVolume - from _rpc_message_volume import APIResponseCreateVolume - from _rpc_message_volume import APIRequestUpdateVolume - from _rpc_message_volume import APIResponseUpdateVolume - from _rpc_message_volume import APIRequestDeleteVolume - from _rpc_message_volume import APIResponseDeleteVolume - from _rpc_message_volume import APIRequestGetVolume - from _rpc_message_volume import APIResponseGetVolume + 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 APIResponseGetVolume - from _rpc_message_instance import APIRequestCreateInstance - from _rpc_message_instance import APIResponseCreateInstance - from _rpc_message_instance import APIRequestStartInstance - from _rpc_message_instance import APIResponseStartInstance - from _rpc_message_instance import APIRequestStopInstance - from _rpc_message_instance import APIResponseStopInstance - from _rpc_message_instance import APIRequestPauseInstance - from _rpc_message_instance import APIResponsePauseInstance - from _rpc_message_instance import APIRequestUnpauseInstance - from _rpc_message_instance import APIResponseUnpauseInstance - from _rpc_message_instance import APIRequestSuspendInstance - from _rpc_message_instance import APIResponseSuspendInstance - from _rpc_message_instance import APIRequestResumeInstance - from _rpc_message_instance import APIResponseResumeInstance - from _rpc_message_instance import APIRequestRebootInstance - from _rpc_message_instance import APIResponseRebootInstance - from _rpc_message_instance import APIRequestLiveMigrateInstance - from _rpc_message_instance import APIResponseLiveMigrateInstance - from _rpc_message_instance import APIRequestColdMigrateInstance - from _rpc_message_instance import APIResponseColdMigrateInstance - from _rpc_message_instance import APIRequestEvacuateInstance - from _rpc_message_instance import APIResponseEvacuateInstance - from _rpc_message_instance import APIRequestDeleteInstance - from _rpc_message_instance import APIResponseDeleteInstance - from _rpc_message_instance import APIRequestGetInstance - from _rpc_message_instance import APIResponseGetInstance + 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 APIRequestDeleteInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseDeleteInstance + from nfv_vim.rpc._rpc_message_instance import APIRequestGetInstance + from nfv_vim.rpc._rpc_message_instance import APIResponseGetInstance - from _rpc_message_subnet import APIRequestCreateSubnet - from _rpc_message_subnet import APIResponseCreateSubnet - from _rpc_message_subnet import APIRequestUpdateSubnet - from _rpc_message_subnet import APIResponseUpdateSubnet - from _rpc_message_subnet import APIRequestDeleteSubnet - from _rpc_message_subnet import APIResponseDeleteSubnet - from _rpc_message_subnet import APIRequestGetSubnet - from _rpc_message_subnet import APIResponseGetSubnet + 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 APIResponseGetSubnet - from _rpc_message_network import APIRequestCreateNetwork - from _rpc_message_network import APIResponseCreateNetwork - from _rpc_message_network import APIRequestUpdateNetwork - from _rpc_message_network import APIResponseUpdateNetwork - from _rpc_message_network import APIRequestDeleteNetwork - from _rpc_message_network import APIResponseDeleteNetwork - from _rpc_message_network import APIRequestGetNetwork - from _rpc_message_network import APIResponseGetNetwork + 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 APIResponseGetNetwork - from _rpc_message_sw_update import APIRequestCreateSwUpdateStrategy - from _rpc_message_sw_update import APIRequestCreateSwUpgradeStrategy - from _rpc_message_sw_update import APIResponseCreateSwUpdateStrategy - from _rpc_message_sw_update import APIRequestApplySwUpdateStrategy - from _rpc_message_sw_update import APIResponseApplySwUpdateStrategy - from _rpc_message_sw_update import APIRequestAbortSwUpdateStrategy - from _rpc_message_sw_update import APIResponseAbortSwUpdateStrategy - from _rpc_message_sw_update import APIRequestDeleteSwUpdateStrategy - from _rpc_message_sw_update import APIResponseDeleteSwUpdateStrategy - from _rpc_message_sw_update import APIRequestGetSwUpdateStrategy - from _rpc_message_sw_update import APIResponseGetSwUpdateStrategy + 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 APIResponseGetSwUpdateStrategy _rpc_msg_class_map = { # Image Mapping diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_image.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_image.py index 0c5f493f..14d23067 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_image.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_image.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.image') diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_instance.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_instance.py index c31674dc..c6ed445a 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_instance.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_instance.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.instance') diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_network.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_network.py index 464708f3..d0816fda 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_network.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_network.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.network') diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_subnet.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_subnet.py index 4eb24613..cefd1f03 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_subnet.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_subnet.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.subnet') diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_sw_update.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_sw_update.py index a7950cd8..295b0ebd 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_sw_update.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_sw_update.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.sw_update') diff --git a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_volume.py b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_volume.py index 078cbd88..c65fe270 100755 --- a/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_volume.py +++ b/nfv/nfv-vim/nfv_vim/rpc/_rpc_message_volume.py @@ -5,8 +5,10 @@ # from nfv_common import debug -from _rpc_defs import RPC_MSG_VERSION, RPC_MSG_TYPE, RPC_MSG_RESULT -from _rpc_message import RPCMessage +from nfv_vim.rpc._rpc_defs import RPC_MSG_RESULT +from nfv_vim.rpc._rpc_defs import RPC_MSG_TYPE +from nfv_vim.rpc._rpc_defs import RPC_MSG_VERSION +from nfv_vim.rpc._rpc_message import RPCMessage DLOG = debug.debug_get_logger('nfv_vim.rpc.volume') diff --git a/nfv/nfv-vim/nfv_vim/strategy/__init__.py b/nfv/nfv-vim/nfv_vim/strategy/__init__.py index 8756acfe..04b0b48b 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/__init__.py +++ b/nfv/nfv-vim/nfv_vim/strategy/__init__.py @@ -3,19 +3,29 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from nfv_common.strategy import * -from _strategy_defs import STRATEGY_EVENT -from _strategy import SwPatchStrategy, SwUpgradeStrategy, strategy_rebuild_from_dict -from _strategy_stages import STRATEGY_STAGE_NAME -from _strategy_steps import LockHostsStep, UnlockHostsStep, RebootHostsStep -from _strategy_steps import SwactHostsStep, UpgradeHostsStep, UpgradeStartStep -from _strategy_steps import UpgradeActivateStep, UpgradeCompleteStep -from _strategy_steps import SwPatchHostsStep, MigrateInstancesStep -from _strategy_steps import StopInstancesStep, StartInstancesStep -from _strategy_steps import SystemStabilizeStep, QueryAlarmsStep -from _strategy_steps import QuerySwPatchesStep, QuerySwPatchHostsStep -from _strategy_steps import WaitDataSyncStep, QueryUpgradeStep -from _strategy_steps import DisableHostServicesStep -from _strategy_steps import STRATEGY_STEP_NAME +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 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_stages import STRATEGY_STAGE_NAME # 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 STRATEGY_STEP_NAME # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py index 642fe8bb..ec53ead9 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py @@ -8,10 +8,16 @@ import weakref from nfv_common import debug from nfv_common import strategy -from nfv_common.helpers import Constant, Constants, Singleton, get_local_host_name +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, SW_UPDATE_INSTANCE_ACTION -from nfv_vim.objects import HOST_PERSONALITY, HOST_GROUP_POLICY, 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_vim.objects import HOST_GROUP_POLICY +from nfv_vim.objects import HOST_NAME from nfv_vim.objects import INSTANCE_GROUP_POLICY from nfv_vim.nfvi.objects.v1 import UPGRADE_STATE @@ -1600,7 +1606,7 @@ def strategy_rebuild_from_dict(data): """ Returns the strategy object initialized using the given dictionary """ - from _strategy_phases import strategy_phase_rebuild_from_dict + from nfv_vim.strategy._strategy_phases import strategy_phase_rebuild_from_dict if not data: return None diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_defs.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_defs.py index 0a927276..0d08e642 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_defs.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_defs.py @@ -5,7 +5,8 @@ # import six -from nfv_common.helpers import Constant, Singleton +from nfv_common.helpers import Constant +from nfv_common.helpers import Singleton @six.add_metaclass(Singleton) diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_phases.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_phases.py index 3133edae..540ebb4b 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_phases.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_phases.py @@ -3,8 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from nfv_common import strategy from nfv_common import debug +from nfv_common import strategy DLOG = debug.debug_get_logger('nfv_vim.strategy.phase') @@ -13,7 +13,7 @@ def strategy_phase_rebuild_from_dict(data): """ Returns the strategy phase object initialized using the given dictionary """ - from _strategy_stages import strategy_stage_rebuild_from_dict + from nfv_vim.strategy._strategy_stages import strategy_stage_rebuild_from_dict if not data: return None diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py index 3d147833..f27a170e 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_stages.py @@ -5,9 +5,11 @@ # import six -from nfv_common import strategy from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton +from nfv_common import strategy +from nfv_common.helpers import Constant +from nfv_common.helpers import Constants +from nfv_common.helpers import Singleton DLOG = debug.debug_get_logger('nfv_vim.strategy.stage') @@ -38,7 +40,7 @@ def strategy_stage_rebuild_from_dict(data): """ Returns the strategy stage object initialized using the given dictionary """ - from _strategy_steps import strategy_step_rebuild_from_dict + from nfv_vim.strategy._strategy_steps import strategy_step_rebuild_from_dict steps = list() for step_data in data['steps']: diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py index 1afe11bb..d4ea5a9a 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy_steps.py @@ -8,12 +8,15 @@ import six from nfv_common import strategy from nfv_common import timers from nfv_common import debug -from nfv_common.helpers import Constant, Constants, Singleton, coroutine +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_vim import objects from nfv_vim import tables -from _strategy_defs import STRATEGY_EVENT +from nfv_vim.strategy._strategy_defs import STRATEGY_EVENT 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 2a555c6c..e8b23c95 100755 --- a/nfv/nfv-vim/nfv_vim/tables/__init__.py +++ b/nfv/nfv-vim/nfv_vim/tables/__init__.py @@ -3,21 +3,20 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _image_table import tables_get_image_table -from _volume_table import tables_get_volume_table -from _volume_snapshot_table import tables_get_volume_snapshot_table -from _tenant_table import tables_get_tenant_table -from _system_table import tables_get_system_table -from _host_group_table import tables_get_host_group_table -from _host_table import tables_get_host_table -from _subnet_table import tables_get_subnet_table -from _network_table import tables_get_network_table -from _service_host_table import tables_get_service_host_table -from _hypervisor_table import tables_get_hypervisor_table -from _instance_type_table import tables_get_instance_type_table -from _instance_group_table import tables_get_instance_group_table -from _instance_table import tables_get_instance_table -from _host_aggregate_table import tables_get_host_aggregate_table -from _tables_module import tables_initialize, tables_finalize +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_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._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._tables_module import tables_finalize # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/tables/_host_aggregate_table.py b/nfv/nfv-vim/nfv_vim/tables/_host_aggregate_table.py index 52bc65b6..47716dfe 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_host_aggregate_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_host_aggregate_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _host_aggregate_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_host_group_table.py b/nfv/nfv-vim/nfv_vim/tables/_host_group_table.py index 73713df2..b47e4a14 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_host_group_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_host_group_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _host_group_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_host_table.py b/nfv/nfv-vim/nfv_vim/tables/_host_table.py index 6db93577..27898834 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_host_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_host_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _host_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_hypervisor_table.py b/nfv/nfv-vim/nfv_vim/tables/_hypervisor_table.py index 56de9287..d20939ea 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_hypervisor_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_hypervisor_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _hypervisor_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_image_table.py b/nfv/nfv-vim/nfv_vim/tables/_image_table.py index 51772673..053ae8c6 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_image_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_image_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _image_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_instance_group_table.py b/nfv/nfv-vim/nfv_vim/tables/_instance_group_table.py index 6f367ec6..617d2122 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_instance_group_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_instance_group_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _instance_group_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_instance_table.py b/nfv/nfv-vim/nfv_vim/tables/_instance_table.py index a8845309..f031bdc3 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_instance_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_instance_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _instance_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_instance_type_table.py b/nfv/nfv-vim/nfv_vim/tables/_instance_type_table.py index 5d476495..e8dbfb15 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_instance_type_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_instance_type_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _instance_type_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_network_table.py b/nfv/nfv-vim/nfv_vim/tables/_network_table.py index cce46530..2f4c08fd 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_network_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_network_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _network_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_service_host_table.py b/nfv/nfv-vim/nfv_vim/tables/_service_host_table.py index 27bd81d2..2aa8fbe2 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_service_host_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_service_host_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _service_host_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_subnet_table.py b/nfv/nfv-vim/nfv_vim/tables/_subnet_table.py index 3aa1f81c..cfafd90e 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_subnet_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_subnet_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _subnet_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_system_table.py b/nfv/nfv-vim/nfv_vim/tables/_system_table.py index a6bf18d1..97678f96 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_system_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_system_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _system_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_tables_module.py b/nfv/nfv-vim/nfv_vim/tables/_tables_module.py index 94ce6899..96020a99 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_tables_module.py +++ b/nfv/nfv-vim/nfv_vim/tables/_tables_module.py @@ -3,28 +3,36 @@ # # SPDX-License-Identifier: Apache-2.0 # -from _image_table import image_table_initialize, image_table_finalize -from _volume_table import volume_table_initialize, volume_table_finalize -from _volume_snapshot_table import volume_snapshot_table_initialize -from _volume_snapshot_table import volume_snapshot_table_finalize -from _tenant_table import tenant_table_initialize, tenant_table_finalize -from _system_table import system_table_initialize, system_table_finalize -from _host_table import host_table_initialize, host_table_finalize -from _host_group_table import host_group_table_initialize -from _host_group_table import host_group_table_finalize -from _hypervisor_table import hypervisor_table_initialize -from _hypervisor_table import hypervisor_table_finalize -from _instance_table import instance_table_initialize, instance_table_finalize -from _instance_type_table import instance_type_table_initialize -from _instance_type_table import instance_type_table_finalize -from _instance_group_table import instance_group_table_initialize -from _instance_group_table import instance_group_table_finalize -from _service_host_table import service_host_table_initialize -from _service_host_table import service_host_table_finalize -from _host_aggregate_table import host_aggregate_table_initialize -from _host_aggregate_table import host_aggregate_table_finalize -from _subnet_table import subnet_table_initialize, subnet_table_finalize -from _network_table import network_table_initialize, network_table_finalize +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._network_table import network_table_finalize def tables_initialize(): diff --git a/nfv/nfv-vim/nfv_vim/tables/_tenant_table.py b/nfv/nfv-vim/nfv_vim/tables/_tenant_table.py index ac1f5d7a..f6ba12e5 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_tenant_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_tenant_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _tenant_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_volume_snapshot_table.py b/nfv/nfv-vim/nfv_vim/tables/_volume_snapshot_table.py index d7727882..ec98772f 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_volume_snapshot_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_volume_snapshot_table.py @@ -4,7 +4,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _volume_snapshot_table = None diff --git a/nfv/nfv-vim/nfv_vim/tables/_volume_table.py b/nfv/nfv-vim/nfv_vim/tables/_volume_table.py index db8da10f..27da8449 100755 --- a/nfv/nfv-vim/nfv_vim/tables/_volume_table.py +++ b/nfv/nfv-vim/nfv_vim/tables/_volume_table.py @@ -5,7 +5,7 @@ # from nfv_vim import database -from _table import Table +from nfv_vim.tables._table import Table _volume_table = None diff --git a/nfv/nfv-vim/nfv_vim/webserver/__init__.py b/nfv/nfv-vim/nfv_vim/webserver/__init__.py index 1728d832..2e081bb7 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/__init__.py +++ b/nfv/nfv-vim/nfv_vim/webserver/__init__.py @@ -3,6 +3,4 @@ # # SPDX-License-Identifier: Apache-2.0 # -# flake8: noqa -# -from _webserver import SimpleHttpServer +from nfv_vim.webserver._webserver import SimpleHttpServer # noqa: F401 diff --git a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py index 66afdc39..d55b76e4 100755 --- a/nfv/nfv-vim/nfv_vim/webserver/_webserver.py +++ b/nfv/nfv-vim/nfv_vim/webserver/_webserver.py @@ -3,14 +3,15 @@ # # SPDX-License-Identifier: Apache-2.0 # -import re -import json -import httplib import datetime -import threading +import httplib +import json +import re import socket +import threading from SocketServer import ThreadingMixIn -from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer +from BaseHTTPServer import BaseHTTPRequestHandler +from BaseHTTPServer import HTTPServer from nfv_common import debug from nfv_plugins.nfvi_plugins import config diff --git a/nfv/nfv-vim/setup.py b/nfv/nfv-vim/setup.py index 54471233..025dd78c 100755 --- a/nfv/nfv-vim/setup.py +++ b/nfv/nfv-vim/setup.py @@ -3,7 +3,8 @@ # # SPDX-License-Identifier: Apache-2.0 # -from setuptools import setup, find_packages +from setuptools import find_packages +from setuptools import setup setup( name='nfv_vim', diff --git a/nfv/tox.ini b/nfv/tox.ini index 97340dd9..e63d46d5 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 -# H301: one import per line # H306: imports not in alphabetical order # H401: docstring should not start with a space # H404: multi line docstring should start without a leading new line @@ -79,7 +78,7 @@ verbosity=2 # B007 Loop control variable 'X' not used within the loop body. If this is intended, start the name with an underscore. # B301 Python 3 does not include `.iter*` methods on dictionaries. ignore = E121,E122,E123,E124,E126,E127,E128,E129,E501, - H104,H301,H306,H401,H404,H405,H501, + H104,H306,H401,H404,H405,H501, F821, B007, B301 # H106 Don’t put vim configuration in source files (off by default). @@ -102,6 +101,7 @@ commands = [testenv:pylint] deps = {[nfv]deps} + {[nfv]nfv_test_dir}/nfv_scenario_tests fixtures jinja2 mock