From 9c2e55cf8eb0eb3db7d9cbd731ea32b994f26775 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 and requirements to pass gates Depends-On: https://review.opendev.org/#/c/664646/ Change-Id: I8d3175f95f567a4ca4ae9d06de09a57ea4656b6a --- lower-constraints.txt | 4 ++-- neutron_classifier/objects/classifications.py | 2 +- requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 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 diff --git a/requirements.txt b/requirements.txt index bd5e623..435928b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ pbr>=4.0.0 # Apache-2.0 -keystoneauth1>=3.14.0 # Apache-2.0 +keystoneauth1>=3.18.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 python-openstackclient>=3.16.0 # Apache-2.0 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT -neutron-lib>=1.28.0 # Apache-2.0 +neutron-lib>=1.29.1 # Apache-2.0 oslo.utils>=3.40.2 # Apache-2. # These repos are installed from git in OpenStack CI if the job