diff --git a/nova/objects/host_mapping.py b/nova/objects/host_mapping.py index 9c8acf4a3a..3114c66f61 100644 --- a/nova/objects/host_mapping.py +++ b/nova/objects/host_mapping.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_versionedobjects import base as ovo from sqlalchemy.orm import joinedload from nova.db.sqlalchemy import api as db_api @@ -27,10 +26,8 @@ def _cell_id_in_updates(updates): updates["cell_id"] = cell_mapping_obj.id -# NOTE(danms): Maintain Dict compatibility because of ovo bug 1474952 @base.NovaObjectRegistry.register -class HostMapping(base.NovaTimestampObject, base.NovaObject, - ovo.VersionedObjectDictCompat): +class HostMapping(base.NovaTimestampObject, base.NovaObject): # Version 1.0: Initial version VERSION = '1.0' diff --git a/nova/objects/instance_mapping.py b/nova/objects/instance_mapping.py index 16f92d6397..1b75c1317e 100644 --- a/nova/objects/instance_mapping.py +++ b/nova/objects/instance_mapping.py @@ -10,7 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo_versionedobjects import base as ovo from sqlalchemy.orm import joinedload from nova.db.sqlalchemy import api as db_api @@ -22,10 +21,8 @@ from nova.objects import cell_mapping from nova.objects import fields -# NOTE(danms): Maintain Dict compatibility because of ovo bug 1474952 @base.NovaObjectRegistry.register -class InstanceMapping(base.NovaTimestampObject, base.NovaObject, - ovo.VersionedObjectDictCompat): +class InstanceMapping(base.NovaTimestampObject, base.NovaObject): # Version 1.0: Initial version VERSION = '1.0'