From ce3b86eef33adc7c94cad5dbec49e206d32f622e Mon Sep 17 00:00:00 2001 From: Nurmatov Mamatisa Date: Mon, 13 Sep 2021 17:13:51 +0300 Subject: [PATCH] Use neutron-lib standard_attr Now only neutron uses neutron/db/standard_attr.py Shim can be removed Change-Id: I980265335c5f3f6b5ee2e5fbcad9491aad91defe --- neutron/db/models/address_group.py | 2 +- neutron/db/models/l3.py | 2 +- neutron/db/models/loggingapi.py | 3 +-- neutron/db/models/network_segment_range.py | 3 +-- neutron/db/models/port_forwarding.py | 2 +- neutron/db/models/provisioning_block.py | 3 +-- neutron/db/models/securitygroup.py | 2 +- neutron/db/models/segment.py | 2 +- neutron/db/models/tag.py | 3 +-- neutron/db/models_v2.py | 2 +- neutron/db/ovn_revision_numbers_db.py | 2 +- neutron/db/qos/models.py | 2 +- neutron/db/standard_attr.py | 23 ------------------- neutron/db/standardattrdescription_db.py | 3 +-- neutron/extensions/stdattrs_common.py | 2 +- neutron/extensions/tagging.py | 2 +- neutron/objects/base.py | 2 +- neutron/objects/stdattrs.py | 2 +- neutron/objects/tag.py | 2 +- neutron/services/revisions/revision_plugin.py | 2 +- neutron/services/tag/tag_plugin.py | 2 +- neutron/services/timestamp/timestamp_db.py | 2 +- neutron/services/trunk/models.py | 2 +- .../tests/unit/db/test_db_base_plugin_v2.py | 2 +- 24 files changed, 23 insertions(+), 51 deletions(-) delete mode 100644 neutron/db/standard_attr.py diff --git a/neutron/db/models/address_group.py b/neutron/db/models/address_group.py index f279507c17b..0e147bed06d 100644 --- a/neutron/db/models/address_group.py +++ b/neutron/db/models/address_group.py @@ -13,11 +13,11 @@ from neutron_lib.api.definitions import address_group as ag from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from neutron.db import rbac_db_models -from neutron.db import standard_attr class AddressAssociation(model_base.BASEV2): diff --git a/neutron/db/models/l3.py b/neutron/db/models/l3.py index 55be2af0665..1a9c5b900d7 100644 --- a/neutron/db/models/l3.py +++ b/neutron/db/models/l3.py @@ -13,12 +13,12 @@ from neutron_lib.api.definitions import l3 as l3_apidef from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from neutron.db.models import l3agent as rb_model from neutron.db import models_v2 -from neutron.db import standard_attr class RouterPort(model_base.BASEV2): diff --git a/neutron/db/models/loggingapi.py b/neutron/db/models/loggingapi.py index bd77fd3030e..6d6408810f3 100644 --- a/neutron/db/models/loggingapi.py +++ b/neutron/db/models/loggingapi.py @@ -15,10 +15,9 @@ from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa -from neutron.db import standard_attr - class Log(standard_attr.HasStandardAttributes, model_base.BASEV2, model_base.HasId, model_base.HasProject): diff --git a/neutron/db/models/network_segment_range.py b/neutron/db/models/network_segment_range.py index 992ab779a6f..1ab585d6e3d 100644 --- a/neutron/db/models/network_segment_range.py +++ b/neutron/db/models/network_segment_range.py @@ -16,10 +16,9 @@ from neutron_lib.api.definitions import network_segment_range as range_apidef from neutron_lib import constants from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa -from neutron.db import standard_attr - class NetworkSegmentRange(standard_attr.HasStandardAttributes, model_base.BASEV2, model_base.HasId, diff --git a/neutron/db/models/port_forwarding.py b/neutron/db/models/port_forwarding.py index 9b11551cd81..8c2f509682d 100644 --- a/neutron/db/models/port_forwarding.py +++ b/neutron/db/models/port_forwarding.py @@ -14,12 +14,12 @@ # under the License. from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from neutron.db.models import l3 from neutron.db import models_v2 -from neutron.db import standard_attr from neutron_lib.api.definitions import fip_pf_description as apidef from neutron_lib.db import constants as db_const diff --git a/neutron/db/models/provisioning_block.py b/neutron/db/models/provisioning_block.py index e71825b1375..65f1ab2a2cf 100644 --- a/neutron/db/models/provisioning_block.py +++ b/neutron/db/models/provisioning_block.py @@ -11,10 +11,9 @@ # under the License. from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa -from neutron.db import standard_attr - class ProvisioningBlock(model_base.BASEV2): # the standard attr id of the thing we want to block diff --git a/neutron/db/models/securitygroup.py b/neutron/db/models/securitygroup.py index acd325bac48..75baec49bb2 100644 --- a/neutron/db/models/securitygroup.py +++ b/neutron/db/models/securitygroup.py @@ -14,13 +14,13 @@ from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy import sql from neutron.db import models_v2 from neutron.db import rbac_db_models -from neutron.db import standard_attr from neutron.extensions import securitygroup as sg diff --git a/neutron/db/models/segment.py b/neutron/db/models/segment.py index df37fbf450b..5d1b2b6abc8 100644 --- a/neutron/db/models/segment.py +++ b/neutron/db/models/segment.py @@ -16,11 +16,11 @@ from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from neutron.db import models_v2 -from neutron.db import standard_attr from neutron.extensions import segment diff --git a/neutron/db/models/tag.py b/neutron/db/models/tag.py index 7f4fdaa1c86..55195340d03 100644 --- a/neutron/db/models/tag.py +++ b/neutron/db/models/tag.py @@ -13,11 +13,10 @@ # from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm -from neutron.db import standard_attr - class Tag(model_base.BASEV2): standard_attr_id = sa.Column( diff --git a/neutron/db/models_v2.py b/neutron/db/models_v2.py index 63e76978eaa..70acf2e86a2 100644 --- a/neutron/db/models_v2.py +++ b/neutron/db/models_v2.py @@ -20,13 +20,13 @@ from neutron_lib.api.definitions import subnetpool as subnetpool_def from neutron_lib import constants from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from sqlalchemy import orm from sqlalchemy import sql from neutron.db.network_dhcp_agent_binding import models as ndab_model from neutron.db import rbac_db_models -from neutron.db import standard_attr # NOTE(ralonsoh): move to neutron_lib.db.model_base diff --git a/neutron/db/ovn_revision_numbers_db.py b/neutron/db/ovn_revision_numbers_db.py index 133e6601fe1..f9a67711097 100644 --- a/neutron/db/ovn_revision_numbers_db.py +++ b/neutron/db/ovn_revision_numbers_db.py @@ -16,6 +16,7 @@ import datetime from neutron_lib.db import api as db_api +from neutron_lib.db import standard_attr from neutron_lib import exceptions as n_exc from oslo_config import cfg from oslo_log import log @@ -28,7 +29,6 @@ from neutron.db.models import l3 # noqa from neutron.db.models import ovn as ovn_models from neutron.db.models import securitygroup # noqa from neutron.db import models_v2 # noqa -from neutron.db import standard_attr LOG = log.getLogger(__name__) CONF = cfg.CONF diff --git a/neutron/db/qos/models.py b/neutron/db/qos/models.py index 7d2345fc116..8d55878c03c 100644 --- a/neutron/db/qos/models.py +++ b/neutron/db/qos/models.py @@ -16,12 +16,12 @@ from neutron_lib import constants from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr import sqlalchemy as sa from neutron.db.models import l3 from neutron.db import models_v2 from neutron.db import rbac_db_models -from neutron.db import standard_attr class QosPolicy(standard_attr.HasStandardAttributes, model_base.BASEV2, diff --git a/neutron/db/standard_attr.py b/neutron/db/standard_attr.py deleted file mode 100644 index 9786907a483..00000000000 --- a/neutron/db/standard_attr.py +++ /dev/null @@ -1,23 +0,0 @@ -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or -# implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from neutron_lib.db import standard_attr - - -# TODO(boden): remove shims when all consumers use lib for this module -StandardAttribute = standard_attr.StandardAttribute -HasStandardAttributes = standard_attr.HasStandardAttributes -get_standard_attr_resource_model_map = ( - standard_attr.get_standard_attr_resource_model_map) -get_tag_resource_parent_map = standard_attr.get_tag_resource_parent_map diff --git a/neutron/db/standardattrdescription_db.py b/neutron/db/standardattrdescription_db.py index 0cf18a55721..8578eccf15b 100644 --- a/neutron/db/standardattrdescription_db.py +++ b/neutron/db/standardattrdescription_db.py @@ -13,8 +13,7 @@ # under the License. from neutron_lib.db import resource_extend - -from neutron.db import standard_attr +from neutron_lib.db import standard_attr @resource_extend.has_resource_extenders diff --git a/neutron/extensions/stdattrs_common.py b/neutron/extensions/stdattrs_common.py index e116a5bd6fc..8379da2fbfe 100644 --- a/neutron/extensions/stdattrs_common.py +++ b/neutron/extensions/stdattrs_common.py @@ -15,7 +15,7 @@ import itertools -from neutron.db import standard_attr +from neutron_lib.db import standard_attr def stdattrs_extended_resources(attributes): diff --git a/neutron/extensions/tagging.py b/neutron/extensions/tagging.py index 162f55ceb83..30b5b063698 100644 --- a/neutron/extensions/tagging.py +++ b/neutron/extensions/tagging.py @@ -18,6 +18,7 @@ from neutron_lib.api.definitions import port from neutron_lib.api import extensions as api_extensions from neutron_lib.api import faults from neutron_lib.api import validators +from neutron_lib.db import standard_attr from neutron_lib import exceptions from neutron_lib.plugins import directory from neutron_lib import rpc as n_rpc @@ -27,7 +28,6 @@ import webob.exc from neutron._i18n import _ from neutron.api import extensions from neutron.api.v2 import resource as api_resource -from neutron.db import standard_attr TAG = 'tag' diff --git a/neutron/objects/base.py b/neutron/objects/base.py index 2cb8564c70c..c724e44b03d 100644 --- a/neutron/objects/base.py +++ b/neutron/objects/base.py @@ -18,6 +18,7 @@ import functools import itertools from neutron_lib.db import api as db_api +from neutron_lib.db import standard_attr from neutron_lib import exceptions as n_exc from neutron_lib.objects import exceptions as o_exc from neutron_lib.objects.extensions import standardattributes @@ -34,7 +35,6 @@ from sqlalchemy import orm from sqlalchemy.orm import query as sqla_query from neutron._i18n import _ -from neutron.db import standard_attr from neutron.objects.db import api as obj_db_api diff --git a/neutron/objects/stdattrs.py b/neutron/objects/stdattrs.py index b2aa9ca0cd6..67c6fe768e1 100644 --- a/neutron/objects/stdattrs.py +++ b/neutron/objects/stdattrs.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. +from neutron_lib.db import standard_attr from neutron_lib.objects.extensions import standardattributes as stdattr_obj from oslo_versionedobjects import fields as obj_fields -from neutron.db import standard_attr from neutron.objects import base diff --git a/neutron/objects/tag.py b/neutron/objects/tag.py index c919663f04f..963c5762196 100644 --- a/neutron/objects/tag.py +++ b/neutron/objects/tag.py @@ -13,12 +13,12 @@ import functools from neutron_lib.db import model_query +from neutron_lib.db import standard_attr from sqlalchemy.orm import aliased from oslo_versionedobjects import fields as obj_fields from neutron.db.models import tag as tag_model -from neutron.db import standard_attr from neutron.objects import base diff --git a/neutron/services/revisions/revision_plugin.py b/neutron/services/revisions/revision_plugin.py index 93c415fe2fd..cedf5298a6a 100644 --- a/neutron/services/revisions/revision_plugin.py +++ b/neutron/services/revisions/revision_plugin.py @@ -14,6 +14,7 @@ from neutron_lib.api.definitions import revisionifmatch from neutron_lib.db import api as db_api from neutron_lib.db import resource_extend +from neutron_lib.db import standard_attr from neutron_lib.services import base as service_base from oslo_log import log as logging import sqlalchemy @@ -22,7 +23,6 @@ from sqlalchemy.orm import session as se import webob.exc from neutron._i18n import _ -from neutron.db import standard_attr LOG = logging.getLogger(__name__) diff --git a/neutron/services/tag/tag_plugin.py b/neutron/services/tag/tag_plugin.py index b38d2edf57a..650ad6294c0 100644 --- a/neutron/services/tag/tag_plugin.py +++ b/neutron/services/tag/tag_plugin.py @@ -15,12 +15,12 @@ from neutron_lib.db import api as db_api from neutron_lib.db import model_query from neutron_lib.db import resource_extend +from neutron_lib.db import standard_attr from neutron_lib.objects import exceptions as obj_exc from neutron_lib.plugins import directory from oslo_log import helpers as log_helpers from sqlalchemy.orm import exc -from neutron.db import standard_attr from neutron.extensions import tagging from neutron.objects import tag as tag_obj diff --git a/neutron/services/timestamp/timestamp_db.py b/neutron/services/timestamp/timestamp_db.py index 5ab105698d5..0af01b4ecc7 100644 --- a/neutron/services/timestamp/timestamp_db.py +++ b/neutron/services/timestamp/timestamp_db.py @@ -15,11 +15,11 @@ from neutron_lib.db import api as db_api from neutron_lib.db import model_query from neutron_lib.db import resource_extend +from neutron_lib.db import standard_attr from neutron_lib import exceptions as n_exc from oslo_utils import timeutils from sqlalchemy.orm import session as se -from neutron.db import standard_attr CHANGED_SINCE = 'changed_since' TIME_FORMAT_WHOLE_SECONDS = '%Y-%m-%dT%H:%M:%S' diff --git a/neutron/services/trunk/models.py b/neutron/services/trunk/models.py index f1de56bd0fb..0fe81dec49b 100644 --- a/neutron/services/trunk/models.py +++ b/neutron/services/trunk/models.py @@ -15,12 +15,12 @@ from neutron_lib.db import constants as db_const from neutron_lib.db import model_base +from neutron_lib.db import standard_attr from neutron_lib.services.trunk import constants import sqlalchemy as sa from sqlalchemy import sql from neutron.db import models_v2 -from neutron.db import standard_attr class Trunk(standard_attr.HasStandardAttributes, model_base.BASEV2, diff --git a/neutron/tests/unit/db/test_db_base_plugin_v2.py b/neutron/tests/unit/db/test_db_base_plugin_v2.py index 30679c225c4..3ff2f5cfab9 100644 --- a/neutron/tests/unit/db/test_db_base_plugin_v2.py +++ b/neutron/tests/unit/db/test_db_base_plugin_v2.py @@ -27,6 +27,7 @@ from neutron_lib.callbacks import registry from neutron_lib import constants from neutron_lib import context from neutron_lib.db import api as db_api +from neutron_lib.db import standard_attr from neutron_lib import exceptions as lib_exc from neutron_lib import fixture from neutron_lib.plugins import directory @@ -57,7 +58,6 @@ from neutron.db import ipam_backend_mixin from neutron.db.models import l3 as l3_models from neutron.db.models import securitygroup as sg_models from neutron.db import models_v2 -from neutron.db import standard_attr from neutron.ipam.drivers.neutrondb_ipam import driver as ipam_driver from neutron.ipam import exceptions as ipam_exc from neutron.objects import network as network_obj