From b8c0cca7ca0c524598062fd1dc99643b7d3802f3 Mon Sep 17 00:00:00 2001 From: Boden R Date: Mon, 22 Jul 2019 13:08:51 -0600 Subject: [PATCH] use object common_types from neutron-lib Switch over to neutron-lib for OVO common_types. Also update lower constraints to pass gates Depends-On: https://review.opendev.org/#/c/664646/ Change-Id: I8d3175f95f567a4ca4ae9d06de09a57ea4656b6a --- lower-constraints.txt | 4 ++-- neutron_classifier/objects/classifications.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index c101170..1c9bcb5 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -4,9 +4,9 @@ fixtures==3.0.0 flake8-import-order==0.12 flake8==2.6.2 hacking==1.1.0 -keystoneauth1==3.14.0 +keystoneauth1==3.18.0 mock==2.0.0 -neutron-lib==1.28.0 +neutron-lib==1.29.1 oslo.utils==3.40.2 oslotest==3.2.0 pbr==4.0.0 diff --git a/neutron_classifier/objects/classifications.py b/neutron_classifier/objects/classifications.py index 0f14cb8..7c08839 100644 --- a/neutron_classifier/objects/classifications.py +++ b/neutron_classifier/objects/classifications.py @@ -19,9 +19,9 @@ from oslo_versionedobjects import base as obj_base from oslo_versionedobjects import fields as obj_fields from neutron.objects import base -from neutron.objects import common_types from neutron.objects import rbac_db from neutron_lib.db import api as db_api +from neutron_lib.objects import common_types from neutron_classifier.db import models from neutron_classifier.db.rbac_db_models import ClassificationGroupRBAC