adopt isort

this isort config tries to mimic the hacking behvior
as close as is practical given the existing constraits

Change-Id: I94214be9143271a4357d630b7594cf883d3c08bc
Signed-off-by: Sean Mooney <work@seanmooney.info>
This commit is contained in:
Sean Mooney
2026-03-03 15:09:21 +00:00
parent 8eb3a5a4b2
commit 26dec650a9
143 changed files with 351 additions and 182 deletions
+4 -1
View File
@@ -12,9 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from sqlalchemy import Column, Integer, String
from sqlalchemy import Column
from sqlalchemy import Integer
from sqlalchemy import String
from sqlalchemy.ext.declarative import declarative_base
Base = declarative_base()
+2
View File
@@ -15,7 +15,9 @@
"""Accelerator base exception handling."""
import collections
from http import HTTPStatus
from oslo_log import log as logging
from oslo_serialization import jsonutils
+1
View File
@@ -17,6 +17,7 @@
from oslo_config import cfg
CONF = cfg.CONF
SHARED_CONF_GROUP = 'backend_defaults'
@@ -10,10 +10,12 @@
# License for the specific language governing permissions and limitations
# under the License.
import re
from oslo_concurrency import processutils
from oslo_serialization import jsonutils
import re
import cyborg.privsep
from cyborg.accelerator.common import utils
from cyborg.accelerator.drivers.driver import GenericDriver
@@ -22,7 +24,7 @@ from cyborg.objects.driver_objects import driver_attach_handle
from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
import cyborg.privsep
PCI_INFO_PATTERN = re.compile(
r"(?P<slot>[0-9a-f]{4}:[0-9a-f]{2}:"
+1
View File
@@ -14,6 +14,7 @@
import re
import os_resource_classes as orc
from oslo_serialization import jsonutils
from cyborg.accelerator.drivers.driver import GenericDriver
@@ -22,6 +22,7 @@ from oslo_log import log as logging
from cyborg.accelerator.drivers.fpga.base import FPGADriver
from cyborg.accelerator.drivers.fpga.inspur import sysinfo
LOG = logging.getLogger(__name__)
@@ -22,6 +22,8 @@ import re
from oslo_concurrency import processutils
from oslo_serialization import jsonutils
import cyborg.privsep
from cyborg.accelerator.common import utils
from cyborg.common import constants
from cyborg.conf import CONF
@@ -30,7 +32,7 @@ from cyborg.objects.driver_objects import driver_attribute
from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
import cyborg.privsep
INSPUR_FPGA_FLAGS = [
"Inspur Electronic Information Industry Co., Ltd.",
@@ -20,10 +20,12 @@ Cyborg Intel FPGA driver implementation.
from oslo_concurrency import processutils
from oslo_log import log as logging
import cyborg.privsep
from cyborg.accelerator.drivers.fpga.base import FPGADriver
from cyborg.accelerator.drivers.fpga.intel import sysinfo
from cyborg.common import exception
import cyborg.privsep
LOG = logging.getLogger(__name__)
@@ -19,10 +19,11 @@ Cyborg Xilinx FPGA driver implementation.
from oslo_concurrency import processutils
import cyborg.privsep
from cyborg.accelerator.drivers.fpga.base import FPGADriver
from cyborg.accelerator.drivers.fpga.xilinx import sysinfo
from cyborg.common import exception
import cyborg.privsep
@cyborg.privsep.sys_admin_pctxt.entrypoint
@@ -32,6 +32,7 @@ from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
from cyborg.privsep import sys_admin_pctxt
LOG = logging.getLogger(__name__)
XILINX_FPGA_FLAGS = ["Xilinx Corporation Device", "Processing accelerators"]
@@ -18,12 +18,12 @@
Cyborg NVIDIA GPU driver implementation.
"""
from oslo_log import log as logging
from oslo_serialization import jsonutils
import collections
import os
from oslo_log import log as logging
from oslo_serialization import jsonutils
import cyborg.conf
from cyborg.accelerator.common import utils
@@ -37,6 +37,7 @@ from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
LOG = logging.getLogger(__name__)
+3 -2
View File
@@ -15,15 +15,16 @@
Utils for GPU driver.
"""
import re
from oslo_concurrency import processutils
from oslo_log import log as logging
import re
import cyborg.common.exception as exception
import cyborg.conf
import cyborg.privsep
LOG = logging.getLogger(__name__)
GPU_FLAGS = ["VGA compatible controller", "3D controller"]
@@ -17,9 +17,11 @@
Cyborg Generic driver modules implementation.
"""
from oslo_log import log as logging
from cyborg.accelerator.common import exception
from cyborg.common.i18n import _
from oslo_log import log as logging
LOG = logging.getLogger(__name__)
@@ -25,15 +25,16 @@ from oslo_config import cfg
from oslo_log import log as logging
from oslo_serialization import jsonutils
from cyborg.accelerator.common import utils
import cyborg.conf
from cyborg.accelerator.common import utils
from cyborg.objects.driver_objects import driver_attach_handle
from cyborg.objects.driver_objects import driver_attribute
from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
LOG = logging.getLogger(__name__)
PCI_DEVICES_PATH_PATTERN = "/sys/bus/pci/devices/*"
+1 -1
View File
@@ -15,11 +15,11 @@ import abc
import re
import string
from cyborg.accelerator.drivers.pci import utils
from cyborg.common import exception
from cyborg.common.i18n import _
MAX_VENDOR_ID = 0xFFFF
MAX_PRODUCT_ID = 0xFFFF
MAX_FUNC = 0x7
@@ -22,17 +22,19 @@ import re
from oslo_log import log as logging
from oslo_serialization import jsonutils
import cyborg.conf
from cyborg.accelerator.common import utils
from cyborg.accelerator.drivers.pci import utils as pci_utils
from cyborg.accelerator.drivers.pci import whitelist
from cyborg.common import constants
import cyborg.conf
from cyborg.objects.driver_objects import driver_attach_handle
from cyborg.objects.driver_objects import driver_attribute
from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
LOG = logging.getLogger(__name__)
CONF = cyborg.conf.CONF
+3 -1
View File
@@ -19,9 +19,11 @@ import re
from oslo_concurrency import processutils
from oslo_log import log as logging
from cyborg.common import exception
import cyborg.privsep
from cyborg.common import exception
LOG = logging.getLogger(__name__)
PCI_VENDOR_PATTERN = "^(hex{4})$".replace("hex", r"[\da-fA-F]")
@@ -21,6 +21,8 @@ import glob
import os
import socket
from oslo_serialization import jsonutils
from cyborg.accelerator.common import utils
from cyborg.common import constants
from cyborg.objects.driver_objects import driver_attach_handle
@@ -29,8 +31,6 @@ from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
from oslo_serialization import jsonutils
PCI_DEVICES_PATH = "/sys/bus/pci/devices"
KNOW_QATS = [("0x8086", "0x37c8")]
@@ -23,6 +23,7 @@ from cyborg.accelerator.drivers.spdk.util import common_fun
from cyborg.accelerator.drivers.spdk.util.pyspdk.nvmf_client import NvmfTgt
from cyborg.accelerator.drivers.spdk.util.pyspdk.py_spdk import PySPDK
LOG = logging.getLogger(__name__)
+1
View File
@@ -17,6 +17,7 @@ Cyborg SPDK driver modules implementation.
from oslo_log import log as logging
LOG = logging.getLogger(__name__)
@@ -22,13 +22,14 @@ import re
from oslo_config import cfg
from oslo_log import log as logging
from cyborg.accelerator.common import exception
from cyborg.accelerator import configuration
from cyborg.accelerator.common import exception
from cyborg.accelerator.drivers.spdk.util.pyspdk.nvmf_client import NvmfTgt
from cyborg.accelerator.drivers.spdk.util.pyspdk.py_spdk import PySPDK
from cyborg.accelerator.drivers.spdk.util.pyspdk.vhost_client import VhostTgt
from cyborg.common.i18n import _
LOG = logging.getLogger(__name__)
accelerator_opts = [
@@ -14,6 +14,7 @@
from oslo_log import log as logging
from oslo_serialization import jsonutils
LOG = logging.getLogger(__name__)
@@ -12,14 +12,16 @@
# under the License.
import os
import psutil
import re
import psutil
from oslo_concurrency import processutils
from oslo_log import log as logging
import cyborg.privsep
LOG = logging.getLogger(__name__)
@@ -14,6 +14,7 @@
from oslo_log import log as logging
from oslo_serialization import jsonutils
LOG = logging.getLogger(__name__)
@@ -22,6 +22,7 @@ from cyborg.accelerator.drivers.spdk.util import common_fun
from cyborg.accelerator.drivers.spdk.util.pyspdk.py_spdk import PySPDK
from cyborg.accelerator.drivers.spdk.util.pyspdk.vhost_client import VhostTgt
LOG = logging.getLogger(__name__)
+1
View File
@@ -22,6 +22,7 @@ from oslo_log import log as logging
from cyborg.accelerator.common import utils as pci_utils
from cyborg.accelerator.drivers.ssd import utils
LOG = logging.getLogger(__name__)
VENDOR_MAPS = pci_utils.get_vendor_maps()
@@ -19,6 +19,7 @@ Cyborg Inspur NVMe SSD driver implementation.
from cyborg.accelerator.drivers.ssd import utils
VENDOR_ID = '1bd4'
+4 -2
View File
@@ -17,11 +17,13 @@
Utils for SSD driver.
"""
import re
from oslo_concurrency import processutils
from oslo_log import log as logging
from oslo_serialization import jsonutils
import re
import cyborg.privsep
from cyborg.accelerator.common import utils
from cyborg.common import constants
@@ -31,7 +33,7 @@ from cyborg.objects.driver_objects import driver_attribute
from cyborg.objects.driver_objects import driver_controlpath_id
from cyborg.objects.driver_objects import driver_deployable
from cyborg.objects.driver_objects import driver_device
import cyborg.privsep
LOG = logging.getLogger(__name__)
+2 -1
View File
@@ -16,9 +16,10 @@ import tempfile
import time
import urllib.parse
import oslo_messaging as messaging
from keystoneauth1 import exceptions as ks_exc
from oslo_log import log as logging
import oslo_messaging as messaging
from oslo_service import periodic_task
from oslo_utils import uuidutils
+3 -2
View File
@@ -13,14 +13,15 @@
"""Client side of the Agent RPC API."""
from oslo_config import cfg
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_log import log
from cyborg.common import constants
from cyborg.common import rpc
from cyborg.objects import base as objects_base
from oslo_log import log
LOG = log.getLogger(__name__)
+3 -1
View File
@@ -14,16 +14,18 @@
# under the License.
import os
import pecan
from oslo_config import cfg
from oslo_log import log
from paste import deploy
import cyborg.conf
from cyborg.api import config
from cyborg.api import hooks
from cyborg.api import middleware
import cyborg.conf
CONF = cyborg.conf.CONF
+3 -2
View File
@@ -15,15 +15,16 @@
import datetime
import functools
import inspect
import pecan
import wsme
from pecan import rest
from webob import exc
import wsme
from wsme import types as wtypes
API_V2 = 'v2'
# name of attribute to keep version method information
+1
View File
@@ -14,6 +14,7 @@
# under the License.
import pecan
from wsme import types as wtypes
from cyborg.api.controllers import base
+3 -1
View File
@@ -14,14 +14,16 @@
# under the License.
import importlib
import pecan
from pecan import rest
from wsme import types as wtypes
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import v2
from cyborg.api import expose
class APIStatus:
+2 -1
View File
@@ -15,10 +15,11 @@
import inspect
import wsme
from oslo_serialization import jsonutils
from oslo_utils import strutils
from oslo_utils import uuidutils
import wsme
from wsme import types as wtypes
from cyborg.common import exception
-1
View File
@@ -16,7 +16,6 @@
import jsonpatch
import wsme
from cyborg.common.i18n import _
+1 -2
View File
@@ -16,12 +16,12 @@
"""Version 2 of the Cyborg API"""
import pecan
from pecan import rest
from webob import exc
from wsme import types as wtypes
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers.v2 import arqs
@@ -29,7 +29,6 @@ from cyborg.api.controllers.v2 import attributes
from cyborg.api.controllers.v2 import deployables
from cyborg.api.controllers.v2 import device_profiles
from cyborg.api.controllers.v2 import devices
from cyborg.api.controllers.v2 import versions
+5 -3
View File
@@ -14,23 +14,25 @@
# under the License.
from http import HTTPStatus
import pecan
import wsme
from wsme import types as wtypes
from oslo_log import log
from wsme import types as wtypes
from cyborg import objects
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import types
from cyborg.api.controllers.v2 import utils
from cyborg.api.controllers.v2 import versions
from cyborg.api import expose
from cyborg.common import authorize_wsgi
from cyborg.common import constants
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg import objects
LOG = log.getLogger(__name__)
+5 -3
View File
@@ -14,18 +14,20 @@
# under the License.
from http import HTTPStatus
import pecan
import wsme
from wsme import types as wtypes
from oslo_log import log
from wsme import types as wtypes
from cyborg import objects
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import types
from cyborg.api import expose
from cyborg.common import authorize_wsgi
from cyborg import objects
LOG = log.getLogger(__name__)
+3 -3
View File
@@ -15,18 +15,18 @@
import pecan
import wsme
from wsme import types as wtypes
from oslo_serialization import jsonutils
from wsme import types as wtypes
from cyborg import objects
from cyborg.agent.rpcapi import AgentAPI
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import types
from cyborg.api import expose
from cyborg.common import authorize_wsgi
from cyborg.common import exception as exc
from cyborg import objects
class Deployable(base.APIBase):
+8 -5
View File
@@ -31,26 +31,29 @@ The objects layer does the conversion.
"""
import copy
from http import HTTPStatus
import pecan
import re
from http import HTTPStatus
import pecan
import wsme
from wsme import types as wtypes
from oslo_log import log
from oslo_utils import uuidutils
from wsme import types as wtypes
from cyborg import api
from cyborg import objects
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import types
from cyborg.api.controllers.v2 import versions
from cyborg.api import expose
from cyborg.common import authorize_wsgi
from cyborg.common import constants
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg import objects
LOG = log.getLogger(__name__)
+5 -4
View File
@@ -14,22 +14,23 @@
# under the License.
from http import HTTPStatus
import pecan
import wsme
from wsme import types as wtypes
from oslo_log import log
from wsme import types as wtypes
from cyborg.accelerator.common import exception
from cyborg import api
from cyborg import objects
from cyborg.accelerator.common import exception
from cyborg.api import expose
from cyborg.api.controllers import base
from cyborg.api.controllers import link
from cyborg.api.controllers import types
from cyborg.api.controllers.v2 import versions
from cyborg.api import expose
from cyborg.common import authorize_wsgi
from cyborg.common import placement_client
from cyborg import objects
LOG = log.getLogger(__name__)
+1 -1
View File
@@ -17,9 +17,9 @@ from oslo_config import cfg
from oslo_serialization import jsonutils
from pecan import hooks
from cyborg import context
from cyborg.common import exception
from cyborg.conductor import rpcapi
from cyborg import context
class ConfigHook(hooks.PecanHook):
+1 -1
View File
@@ -19,8 +19,8 @@ from keystonemiddleware import auth_token
from oslo_log import log
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg.common import utils
from cyborg.common.i18n import _
LOG = log.getLogger(__name__)
+2 -1
View File
@@ -20,8 +20,9 @@ Script for running cyborg-api under Apache2.
import sys
from oslo_config import cfg
import oslo_i18n as i18n
from oslo_config import cfg
from oslo_log import log
from cyborg.api import app
+1
View File
@@ -23,5 +23,6 @@ so this module runs before any service code.
import oslo_i18n as i18n
import oslo_service.backend as service
service.init_backend(service.BackendType.THREADING)
i18n.install('cyborg')
+1
View File
@@ -23,6 +23,7 @@ from oslo_service import service
from cyborg.common import constants
from cyborg.common import service as cyborg_service
CONF = cfg.CONF
+1 -1
View File
@@ -21,8 +21,8 @@ import sys
from oslo_config import cfg
from cyborg.common.i18n import _
from cyborg.common import service
from cyborg.common.i18n import _
from cyborg.conf import CONF
from cyborg.db import migration
+4 -3
View File
@@ -14,16 +14,17 @@
import functools
import sys
import pecan
import wsme
from oslo_concurrency import lockutils
from oslo_config import cfg
from oslo_log import log
from oslo_policy import policy
from oslo_versionedobjects import base as object_base
import pecan
import wsme
from cyborg.common import exception
from cyborg import policies
from cyborg.common import exception
_ENFORCER = None
+1 -1
View File
@@ -15,8 +15,8 @@
from oslo_config import cfg
from cyborg.common import rpc
from cyborg import version
from cyborg.common import rpc
def parse_args(argv, default_config_files=None):
+1
View File
@@ -14,6 +14,7 @@
# under the License.
import os_resource_classes as orc
CONDUCTOR_TOPIC = 'cyborg-conductor'
AGENT_TOPIC = 'cyborg-agent'
DEVICE_GPU = 'GPU'
+1
View File
@@ -20,6 +20,7 @@ SHOULD include dedicated exception logging.
"""
from http import HTTPStatus
from oslo_log import log
from cyborg.common.i18n import _
+5 -3
View File
@@ -12,11 +12,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg.common import utils
from oslo_log import log as logging
from cyborg.common import exception
from cyborg.common import utils
from cyborg.common.i18n import _
LOG = logging.getLogger(__name__)
+5 -3
View File
@@ -13,13 +13,15 @@
# License for the specific language governing permissions and limitations
# under the License.
from cyborg.common import exception
from cyborg.common import utils
from keystoneauth1 import exceptions as ks_exc
import os_resource_classes as orc
from keystoneauth1 import exceptions as ks_exc
from oslo_log import log as logging
from oslo_middleware import request_id
from cyborg.common import exception
from cyborg.common import utils
LOG = logging.getLogger(__name__)
NESTED_PROVIDER_API_VERSION = '1.14'
+2
View File
@@ -19,6 +19,8 @@ new policies are implemented.
"""
from oslo_policy import policy
# NOTE: to follow policy-in-code spec, we define defaults for
# the granular policies in code, rather than in policy.yaml.
# All of these may be overridden by configuration, but we can
+3 -2
View File
@@ -13,12 +13,13 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_config import cfg
import oslo_messaging as messaging
from oslo_config import cfg
from oslo_messaging.rpc import dispatcher
from cyborg.common import exception
from cyborg import context as cyborg_context
from cyborg.common import exception
CONF = cfg.CONF
+5 -4
View File
@@ -13,21 +13,22 @@
# License for the specific language governing permissions and limitations
# under the License.
import oslo_messaging as messaging
from oslo_concurrency import processutils
from oslo_log import log
import oslo_messaging as messaging
from oslo_service import service
from oslo_service import wsgi
from oslo_utils import importutils
from cyborg import context
from cyborg import objects
from cyborg.api import app
from cyborg.common import config
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg.common import rpc
from cyborg.common.i18n import _
from cyborg.conf import CONF
from cyborg import context
from cyborg import objects
from cyborg.objects import base as objects_base
+5 -3
View File
@@ -15,11 +15,12 @@
"""Utilities and helper functions."""
from concurrent import futures
from functools import wraps
import time
import traceback
from concurrent import futures
from functools import wraps
from keystoneauth1 import exceptions as ks_exc
from keystoneauth1 import loading as ks_loading
from openstack import connection
@@ -28,9 +29,10 @@ from os_service_types import service_types
from oslo_concurrency import lockutils
from oslo_log import log
import cyborg.conf
from cyborg.common import exception
from cyborg.common.i18n import _
import cyborg.conf
LOG = log.getLogger(__name__)
+5 -2
View File
@@ -13,10 +13,12 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_log import log as logging
import oslo_messaging as messaging
import uuid
import oslo_messaging as messaging
from oslo_log import log as logging
from cyborg.common import exception
from cyborg.common import placement_client
from cyborg.conf import CONF
@@ -29,6 +31,7 @@ from cyborg.objects.driver_objects.driver_device import DriverDeployable
from cyborg.objects.driver_objects.driver_device import DriverDevice
from cyborg.objects.ext_arq import ExtARQ
LOG = logging.getLogger(__name__)
+2 -1
View File
@@ -15,9 +15,10 @@
"""Client side of the conductor RPC API."""
from oslo_config import cfg
import oslo_messaging as messaging
from oslo_config import cfg
from cyborg.common import constants
from cyborg.common import rpc
from cyborg.objects import base as objects_base
+1
View File
@@ -26,6 +26,7 @@ from cyborg.conf import nova
from cyborg.conf import placement
from cyborg.conf import service_token
CONF = cfg.CONF
api.register_opts(CONF)
+1
View File
@@ -14,6 +14,7 @@
from oslo_config import cfg
pci_group = cfg.OptGroup(name='pci', title='PCI passthrough options')
pci_opts = [cfg.MultiStrOpt('passthrough_whitelist', default=[], help=" ")]
+1
View File
@@ -19,6 +19,7 @@ import importlib
import os
import pkgutil
LIST_OPTS_FUNC_NAME = "list_opts"
+1
View File
@@ -13,6 +13,7 @@
from keystoneauth1 import loading as ks_loading
from oslo_config import cfg
SERVICE_USER_GROUP = 'service_user'
service_user = cfg.OptGroup(
+1 -1
View File
@@ -15,8 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from keystoneauth1.access import service_catalog as ksa_service_catalog
from keystoneauth1 import plugin
from keystoneauth1.access import service_catalog as ksa_service_catalog
from oslo_context import context
from oslo_db.sqlalchemy import enginefacade
from oslo_utils import timeutils
+2
View File
@@ -15,6 +15,7 @@ from logging import config as log_config
from alembic import context
from oslo_db.sqlalchemy import enginefacade
try:
# NOTE(whaom): This is to register the DB2 alembic code which
# is an optional runtime dependency.
@@ -24,6 +25,7 @@ except ImportError:
from cyborg.db.sqlalchemy import models
# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
@@ -6,9 +6,11 @@ Create Date: 2021-02-15 16:02:58.856126
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '4cc1d79978fc'
down_revision = '899cead40bc9'
@@ -6,9 +6,11 @@ Create Date: 2019-05-22 06:01:08.292535
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '589ff20545b7'
down_revision = 'ede4e3f1a232'
@@ -6,9 +6,11 @@ Create Date: 2020-01-19 16:15:04.231512
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '60d8ac91fd20'
down_revision = '7a4fd0fc3f8c'
@@ -6,9 +6,11 @@ Create Date: 2023-08-15 23:05:31.918963
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '6c77bd6afea5'
down_revision = '4cc1d79978fc'
@@ -6,9 +6,11 @@ Create Date: 2019-07-17 04:21:52.055863
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '7e6f1f107f2b'
down_revision = '60d8ac91fd20'
@@ -6,9 +6,11 @@ Create Date: 2020-09-18 02:33:42.640673
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = '899cead40bc9'
down_revision = '7e6f1f107f2b'
@@ -19,11 +19,13 @@ Create Date: 2019-07-11 22:13:45.773499
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
from cyborg.common import constants
# revision identifiers, used by Alembic.
revision = 'c1b5abada09c'
down_revision = '589ff20545b7'
@@ -18,9 +18,11 @@ Create Date: 2018-04-28 03:07:06.857245
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = 'd6f033d8fa5b'
down_revision = 'f50980397351'
@@ -6,9 +6,11 @@ Create Date: 2018-11-27 22:00:52.080713
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = 'ede4e3f1a232'
down_revision = 'd6f033d8fa5b'
@@ -19,9 +19,11 @@ Create Date: 2017-08-15 08:44:36.010417
"""
from alembic import op
import sqlalchemy as sa
from alembic import op
# revision identifiers, used by Alembic.
revision = 'f50980397351'
down_revision = None
+2 -1
View File
@@ -26,14 +26,15 @@ from oslo_log import log
from oslo_utils import strutils
from oslo_utils import timeutils
from oslo_utils import uuidutils
from sqlalchemy.orm.exc import NoResultFound
from sqlalchemy.orm import load_only
from sqlalchemy.orm.exc import NoResultFound
from cyborg.common import exception
from cyborg.common.i18n import _
from cyborg.db import api
from cyborg.db.sqlalchemy import models
LOG = log.getLogger(__name__)
main_context_manager = enginefacade.transaction_context()
+2 -1
View File
@@ -16,8 +16,9 @@
import os
import alembic
from alembic import config as alembic_config
import alembic.migration as alembic_migration
from alembic import config as alembic_config
from oslo_db import exception as db_exc
from oslo_db.sqlalchemy import enginefacade
+5 -4
View File
@@ -15,6 +15,8 @@
"""SQLAlchemy models for accelerator service."""
import urllib.parse as urlparse
from oslo_db import options as db_options
from oslo_db.sqlalchemy import models
from oslo_utils import timeutils
@@ -22,15 +24,14 @@ from sqlalchemy import Boolean
from sqlalchemy import Column
from sqlalchemy import DateTime
from sqlalchemy import Enum
from sqlalchemy.ext.declarative import declarative_base
from sqlalchemy import ForeignKey
from sqlalchemy import Index
from sqlalchemy import Integer
from sqlalchemy import orm
from sqlalchemy import schema
from sqlalchemy import String
from sqlalchemy import Text
import urllib.parse as urlparse
from sqlalchemy import orm
from sqlalchemy import schema
from sqlalchemy.ext.declarative import declarative_base
from cyborg.common import constants
from cyborg.common import paths
+3 -1
View File
@@ -15,9 +15,11 @@ Main abstraction layer for retrieving and storing information about accelerator
images used by the cyborg agent layer.
"""
from cyborg.image import glance
from oslo_log import log
from cyborg.image import glance
LOG = log.getLogger(__name__)
+6 -4
View File
@@ -24,10 +24,11 @@ import sys
import time
import cryptography
from cursive import exception as cursive_exception
from cursive import signature_utils
import glanceclient
import glanceclient.exc
from cursive import exception as cursive_exception
from cursive import signature_utils
from glanceclient.v2 import schemas
from keystoneauth1 import loading as ks_loading
from oslo_log import log as logging
@@ -35,11 +36,12 @@ from oslo_serialization import jsonutils
from oslo_utils import excutils
from oslo_utils import timeutils
from cyborg.common import exception
from cyborg.common import utils
import cyborg.conf
from cyborg import objects
from cyborg import service_auth
from cyborg.common import exception
from cyborg.common import utils
LOG = logging.getLogger(__name__)
+1
View File
@@ -21,6 +21,7 @@ from cyborg.db import api as dbapi
from cyborg.objects import base
from cyborg.objects import fields as object_fields
LOG = logging.getLogger(__name__)
+1
View File
@@ -16,6 +16,7 @@
"""Cyborg common internal object model"""
import netaddr
from oslo_log import log as logging
from oslo_utils import versionutils
from oslo_versionedobjects import base as object_base
+1
View File
@@ -22,6 +22,7 @@ from cyborg.db import api as dbapi
from cyborg.objects import base
from cyborg.objects import fields as object_fields
LOG = logging.getLogger(__name__)
+1
View File
@@ -20,6 +20,7 @@ from cyborg.db import api as dbapi
from cyborg.objects import base
from cyborg.objects import fields as object_fields
LOG = logging.getLogger(__name__)
@@ -16,9 +16,10 @@
from oslo_log import log as logging
from oslo_versionedobjects import base as object_base
from cyborg.objects.attach_handle import AttachHandle
from cyborg.objects import base
from cyborg.objects import fields as object_fields
from cyborg.objects.attach_handle import AttachHandle
LOG = logging.getLogger(__name__)
@@ -15,9 +15,9 @@
from oslo_versionedobjects import base as object_base
from cyborg.objects.attribute import Attribute
from cyborg.objects import base
from cyborg.objects import fields as object_fields
from cyborg.objects.attribute import Attribute
@base.CyborgObjectRegistry.register
@@ -16,8 +16,8 @@
from oslo_versionedobjects import base as object_base
from cyborg.objects import base
from cyborg.objects.control_path import ControlpathID
from cyborg.objects import fields as object_fields
from cyborg.objects.control_path import ControlpathID
@base.CyborgObjectRegistry.register
@@ -16,12 +16,12 @@
from oslo_versionedobjects import base as object_base
from cyborg.objects import base
from cyborg.objects import fields as object_fields
from cyborg.objects.deployable import Deployable
from cyborg.objects.driver_objects.driver_attach_handle import (
DriverAttachHandle,
)
from cyborg.objects.driver_objects.driver_attribute import DriverAttribute
from cyborg.objects import fields as object_fields
@base.CyborgObjectRegistry.register
@@ -16,13 +16,13 @@
from oslo_versionedobjects import base as object_base
from cyborg.objects import base
from cyborg.objects import fields as object_fields
from cyborg.objects.control_path import ControlpathID
from cyborg.objects.device import Device
from cyborg.objects.driver_objects.driver_controlpath_id import (
DriverControlPathID,
)
from cyborg.objects.driver_objects.driver_deployable import DriverDeployable
from cyborg.objects import fields as object_fields
@base.CyborgObjectRegistry.register
+4 -4
View File
@@ -20,19 +20,19 @@ from oslo_log import log as logging
from oslo_utils import versionutils
from oslo_versionedobjects import base as object_base
from cyborg import objects
from cyborg.agent.rpcapi import AgentAPI
from cyborg.common import constants
from cyborg.common.constants import ARQ_STATES_TRANSFORM_MATRIX
from cyborg.common import exception
from cyborg.common import utils
from cyborg.common.constants import ARQ_STATES_TRANSFORM_MATRIX
from cyborg.conf import CONF
from cyborg.db import api as dbapi
from cyborg import objects
from cyborg.objects.attach_handle import AttachHandle
from cyborg.objects import base
from cyborg.objects import fields as object_fields
from cyborg.objects.attach_handle import AttachHandle
from cyborg.objects.device_profile import DeviceProfile
from cyborg.objects.extarq.ext_arq_job import ExtARQJobMixin
from cyborg.objects import fields as object_fields
LOG = logging.getLogger(__name__)
+2 -2
View File
@@ -15,13 +15,13 @@
from oslo_log import log as logging
from cyborg import objects
from cyborg.common import constants
from cyborg.common.constants import ARQ_STATES_TRANSFORM_MATRIX
from cyborg.common import exception
from cyborg.common import nova_client
from cyborg.common import utils
from cyborg.common.constants import ARQ_STATES_TRANSFORM_MATRIX
from cyborg.conf import CONF
from cyborg import objects
LOG = logging.getLogger(__name__)
-1
View File
@@ -21,7 +21,6 @@ from openstack import connection
from oslo_log import log as logging
from oslo_serialization import jsonutils
from cyborg.agent.rpcapi import AgentAPI
from cyborg.common import constants
from cyborg.common import exception
+1
View File
@@ -17,6 +17,7 @@ from oslo_versionedobjects import fields as object_fields
from cyborg.common import constants
# Import fields from oslo_versionedobjects
EnumField = object_fields.EnumField
IntegerField = object_fields.IntegerField
+1
View File
@@ -16,6 +16,7 @@
from oslo_log import versionutils
from oslo_policy import policy
# All legacy policy and new policy mapping for all V2 APIs can be found
# here:https://wiki.openstack.org/wiki/Cyborg/Policy
+1
View File
@@ -16,6 +16,7 @@
from oslo_privsep import capabilities
from oslo_privsep import priv_context
sys_admin_pctxt = priv_context.PrivContext(
'cyborg',
cfg_section='cyborg_sys_admin',
+3 -1
View File
@@ -13,12 +13,14 @@
# under the License.
import datetime
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import timeutils
from cyborg.common import exception
from cyborg import db as db_api
from cyborg.common import exception
LOG = logging.getLogger(__name__)
+4 -3
View File
@@ -14,8 +14,11 @@
# under the License.
import os
from unittest import mock
import testtools
from oslo_config import cfg
from oslo_config import fixture as config_fixture
from oslo_db import options
@@ -23,10 +26,8 @@ from oslo_log import log
from oslo_utils import excutils
from oslotest import base
import testtools
from cyborg.common import config as cyborg_config
from cyborg import context as cyborg_context
from cyborg.common import config as cyborg_config
from cyborg.tests import post_mortem_debug
from cyborg.tests.unit import policy_fixture
+1
View File
@@ -25,6 +25,7 @@ import oslo_service.backend as service
from cyborg import objects
service.init_backend(service.BackendType.THREADING)
# Make sure we have all of the objects loaded. We do this
@@ -14,9 +14,10 @@
# under the License.
from cyborg.accelerator.common import utils
import unittest
from cyborg.accelerator.common import utils
class TestUtils(unittest.TestCase):
def setUp(self):

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