starlingx/nfv
Code Issues Proposed changes

Clean up imports based on flake8

Browse Source 
A number of changes were done to the imports in the files.
 - Clean up flake8 H301 multiple imports per line
 - Remove noqa from top of files, allowing flake8 to run
on all files.
 - Clean up relative imports in most places. This will
simplify python3 support later.
 - Partially sort the imports. A later commit will
enable that check since doing that here would have made
the changeset even bigger.

Story: 2003499
Task: 26561
Change-Id: Id5f95559f0d4604f4db1a1d74098063fd510142c
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2018-09-18 19:39:21 -05:00
parent 2d39affda2
commit 65a8eca8e1
321 changed files with 1759 additions and 1444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nfv/nfv-client/nfv_client/openstack/openstack.py
View File

@ -6,7 +6,7 @@
import json
import urllib2
from objects import Token
from nfv_client.openstack.objects import Token
class OpenStackServices(object):

2
nfv/nfv-client/nfv_client/openstack/sw_update.py
View File

@ -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):

30
nfv/nfv-client/nfv_client/sw_update/__init__.py
View File

@ -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

3
nfv/nfv-client/setup.py
View File

@ -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',

27
nfv/nfv-common/nfv_common/alarm/__init__.py
View File

@ -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

10
nfv/nfv-common/nfv_common/alarm/_alarm_module.py
View File

@ -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)

7
nfv/nfv-common/nfv_common/alarm/_alarm_thread.py
View File

@ -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')

4
nfv/nfv-common/nfv_common/alarm/handlers/v1/__init__.py
View File

@ -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

4
nfv/nfv-common/nfv_common/alarm/objects/__init__.py
View File

@ -3,6 +3,4 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# flake8: noqa
#
import v1
import nfv_common.alarm.objects.v1 # noqa: F401

14
nfv/nfv-common/nfv_common/alarm/objects/v1/__init__.py
View File

@ -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

4
nfv/nfv-common/nfv_common/alarm/objects/v1/_alarm_defs.py
View File

@ -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)

4
nfv/nfv-common/nfv_common/catalog/__init__.py
View File

@ -3,6 +3,4 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# flake8: noqa
#
import model
import nfv_common.catalog.model # noqa: F401

2
nfv/nfv-common/nfv_common/catalog/_catalog_module.py
View File

@ -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

16
nfv/nfv-common/nfv_common/catalog/model/__init__.py
View File

@ -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

3
nfv/nfv-common/nfv_common/catalog/model/_defs.py
View File

@ -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)

3
nfv/nfv-common/nfv_common/catalog/model/_vnf_descriptor.py
View File

@ -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

5
nfv/nfv-common/nfv_common/catalog/plugin/v1/_catalog_plugin.py
View File

@ -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)

18
nfv/nfv-common/nfv_common/debug/__init__.py
View File

@ -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

2
nfv/nfv-common/nfv_common/debug/_debug_config.py
View File

@ -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

3
nfv/nfv-common/nfv_common/debug/_debug_defs.py
View File

@ -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)

14
nfv/nfv-common/nfv_common/debug/_debug_log.py
View File

@ -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 = {}

12
nfv/nfv-common/nfv_common/debug/_debug_module.py
View File

@ -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()

4
nfv/nfv-common/nfv_common/debug/_debug_thread.py
View File

@ -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

23
nfv/nfv-common/nfv_common/event_log/__init__.py
View File

@ -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

8
nfv/nfv-common/nfv_common/event_log/_event_log_module.py
View File

@ -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)

2
nfv/nfv-common/nfv_common/event_log/_event_log_thread.py
View File

@ -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')

4
nfv/nfv-common/nfv_common/event_log/handlers/v1/__init__.py
View File

@ -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

4
nfv/nfv-common/nfv_common/event_log/objects/__init__.py
View File

@ -3,6 +3,4 @@
#
# SPDX-License-Identifier: Apache-2.0
#
# flake8: noqa
#
import v1
import nfv_common.event_log.objects.v1 # noqa: F401

15
nfv/nfv-common/nfv_common/event_log/objects/v1/__init__.py
View File

@ -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

4
nfv/nfv-common/nfv_common/event_log/objects/v1/_event_log_defs.py
View File

@ -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)

39
nfv/nfv-common/nfv_common/forensic/__init__.py
View File

@ -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

2
nfv/nfv-common/nfv_common/forensic/_analysis.py
View File

@ -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')

11
nfv/nfv-common/nfv_common/forensic/_nfv_vim_parser.py
View File

@ -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):

7
nfv/nfv-common/nfv_common/schedule/__init__.py
View File

@ -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

15
nfv/nfv-common/nfv_common/selobj/__init__.py
View File

@ -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

7
nfv/nfv-common/nfv_common/selobj/_selobj_module.py
View File

@ -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

17
nfv/nfv-common/nfv_common/state_machine/__init__.py
View File

@ -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

2
nfv/nfv-common/nfv_common/state_machine/_state_machine.py
View File

@ -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')

7
nfv/nfv-common/nfv_common/state_machine/_state_task.py
View File

@ -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')

5
nfv/nfv-common/nfv_common/state_machine/_state_task_result.py
View File

@ -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)

2
nfv/nfv-common/nfv_common/state_machine/_state_task_work.py
View File

@ -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')

3
nfv/nfv-common/nfv_common/state_machine/_state_task_work_result.py
View File

@ -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)

22
nfv/nfv-common/nfv_common/strategy/__init__.py
View File

@ -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

8
nfv/nfv-common/nfv_common/strategy/_strategy.py
View File

@ -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')

4
nfv/nfv-common/nfv_common/strategy/_strategy_defs.py
View File

@ -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)

11
nfv/nfv-common/nfv_common/strategy/_strategy_phase.py
View File

@ -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')

3
nfv/nfv-common/nfv_common/strategy/_strategy_result.py
View File

@ -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)

7
nfv/nfv-common/nfv_common/strategy/_strategy_stage.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/strategy/_strategy_step.py
View File

@ -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')

11
nfv/nfv-common/nfv_common/tasks/__init__.py
View File

@ -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

8
nfv/nfv-common/nfv_common/tasks/_task.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/tasks/_task_future.py
View File

@ -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')

13
nfv/nfv-common/nfv_common/tasks/_task_scheduler.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/tasks/_task_work.py
View File

@ -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')

6
nfv/nfv-common/nfv_common/tasks/_task_worker.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/tasks/_task_worker_pool.py
View File

@ -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')

6
nfv/nfv-common/nfv_common/tasks/unit_test.py
View File

@ -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)

6
nfv/nfv-common/nfv_common/tcp/__init__.py
View File

@ -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

2
nfv/nfv-common/nfv_common/tcp/_tcp_server.py
View File

@ -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')

6
nfv/nfv-common/nfv_common/tcp/unit_test.py
View File

@ -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):

6
nfv/nfv-common/nfv_common/thread/__init__.py
View File

@ -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

6
nfv/nfv-common/nfv_common/thread/_thread.py
View File

@ -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')

3
nfv/nfv-common/nfv_common/thread/_thread_progress_marker.py
View File

@ -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

19
nfv/nfv-common/nfv_common/timers/__init__.py
View File

@ -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

2
nfv/nfv-common/nfv_common/timers/_timer.py
View File

@ -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')

4
nfv/nfv-common/nfv_common/timers/_timer_module.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/timers/_timer_scheduler.py
View File

@ -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')

2
nfv/nfv-common/nfv_common/timers/_timestamp.py
View File

@ -3,8 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
#
import os
import ctypes
import os
from nfv_common import debug

3
nfv/nfv-common/setup.py
View File

@ -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',

3
nfv/nfv-docs/doc_builder.py
View File

@ -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__))

2
nfv/nfv-plugins/nfv_plugins/alarm_handlers/file_storage.py
View File

@ -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):

2
nfv/nfv-plugins/nfv_plugins/alarm_handlers/fm.py
View File

@ -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')

2
nfv/nfv-plugins/nfv_plugins/event_log_handlers/file_storage.py
View File

@ -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):

2
nfv/nfv-plugins/nfv_plugins/event_log_handlers/fm.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_block_storage_api.py
View File

@ -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')

27
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_compute_api.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_guest_api.py
View File

@ -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')

8
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_identity_api.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_image_api.py
View File

@ -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')

24
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_infrastructure_api.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_network_api.py
View File

@ -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')

8
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/nfvi_sw_mgmt_api.py
View File

@ -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')

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/ceilometer.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/cinder.py
View File

@ -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')

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/fm.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/glance.py
View File

@ -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')

8
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/guest.py
View File

@ -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')

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/heat.py
View File

@ -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):

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/keystone.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/mtc.py
View File

@ -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')

10
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/neutron.py
View File

@ -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')

13
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/nova.py
View File

@ -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')

8
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/objects.py
View File

@ -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')

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack.py
View File

@ -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')

2
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/openstack_log.py
View File

@ -3,8 +3,8 @@
#
# SPDX-License-Identifier: Apache-2.0
#
import fcntl
import datetime
import fcntl
NFVI_OPENSTACK_LOG = '/var/log/nfvi-openstack.log'

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/patching.py
View File

@ -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')

17
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rest_api.py
View File

@ -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')

9
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/rpc_listener.py
View File

@ -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')

4
nfv/nfv-plugins/nfv_plugins/nfvi_plugins/openstack/sysinv.py
View File

@ -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')

3
nfv/nfv-plugins/setup.py
View File

@ -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',

Some files were not shown because too many files have changed in this diff Show More