Browse Source

Fix gate failure

Bumped a bunch of constraints and requirements to fix
a gate failure with recent pip update. Required
moving minimum neutron version to Ussuri (16.0.0).
Fix associated new warnings.

Change-Id: Ic6b1dca1c58f982562333a5ae762b1b596355ede
changes/72/765872/32
Brian Haley 6 months ago
parent
commit
b882a7f69d
7 changed files with 66 additions and 52 deletions
  1. +49
    -29
      lower-constraints.txt
  2. +1
    -1
      ovn_octavia_provider/driver.py
  3. +2
    -4
      ovn_octavia_provider/event.py
  4. +2
    -2
      ovn_octavia_provider/helper.py
  5. +0
    -2
      ovn_octavia_provider/tests/functional/requirements.txt
  6. +8
    -8
      requirements.txt
  7. +4
    -6
      test-requirements.txt

+ 49
- 29
lower-constraints.txt View File

@ -1,8 +1,9 @@
alabaster==0.7.10
alembic==0.9.6
amqp==2.1.1
amqp==5.0.2
appdirs==1.4.3
astroid==2.1.0
astroid==2.4.0
Babel==2.9.0
bandit==1.1.0
beautifulsoup4==4.6.0
cachetools==2.0.0
@ -10,20 +11,30 @@ cffi==1.14.0
chardet==3.0.4
cliff==2.8.0
cmd2==0.8.0
contextlib2==0.5.5
coverage==4.0
cryptography==3.0
debtcollector==1.2.0
debtcollector==1.19.0
decorator==4.0.0
deprecation==1.0
docutils==0.11
dogpile.cache==0.8.0
eventlet==0.21.0
entrypoints==0.3
enum-compat==0.0.3
eventlet==0.22.1
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==3.7.9
flake8-import-order==0.12
future==0.16.0
futurist==1.2.0
gitdb==4.0.5
gitdb2==2.0.3
GitPython==3.1.11
greenlet==0.4.15
hacking==3.0.1
httplib2==0.18.1
idna==2.6
iso8601==0.1.11
isort==4.3.21
@ -32,63 +43,72 @@ jmespath==0.9.0
jsonpatch==1.16
jsonpointer==1.13
jsonschema==2.6.0
keystoneauth1==3.4.0
keystoneauth1==3.14.0
keystonemiddleware==4.17.0
kombu==4.6.1
kombu==5.0.2
linecache2==1.0.0
logutils==0.3.5
Mako==0.4.0
MarkupSafe==1.1.1
monotonic==0.6
mccabe==0.6.1
mock==4.0.2
monotonic==1.4
mox3==1.1.0
msgpack==1.0.0
msgpack-python==0.4.0
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4
neutron==15.0.0
neutron-lib==2.1.0
octavia-lib==1.3.1
openstacksdk==0.11.2
neutron==16.0.0
neutron-lib==2.2.0
octavia-lib==2.2.0
openstacksdk==0.31.2
os-client-config==1.28.0
os-service-types==1.2.0
os-xenapi==0.3.1
os-service-types==1.7.0
os-traits==2.4.0
os-vif==2.3.0
os-xenapi==0.3.4
osc-lib==1.8.0
oslo.cache==1.26.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.config==6.0.0
oslo.context==2.19.2
oslo.db==8.5.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==12.4.0
oslo.middleware==3.31.0
oslo.policy==1.30.0
oslo.privsep==1.23.0
oslo.privsep==2.3.0
oslo.reports==1.18.0
oslo.rootwrap==5.8.0
oslo.serialization==2.28.1
oslo.service==1.24.0
oslo.utils==3.33.0
oslo.versionedobjects==1.31.2
oslo.service==1.31.0
oslo.upgradecheck==1.2.0
oslo.utils==4.5.0
oslo.versionedobjects==1.35.1
oslotest==3.2.0
osprofiler==2.3.0
ovs==2.8.0
ovsdbapp==0.17.0
ovsdbapp==1.3.0
Paste==2.0.2
PasteDeploy==1.5.0
pbr==2.0.0
pecan==1.0.0
pbr==4.0.0
pecan==1.3.2
pika==0.10.0
pika-pool==0.1.3
prettytable==0.7.2
psutil==3.2.2
psutil==5.3.0
pycadf==1.1.0
pycparser==2.18
pyflakes==2.1.1
Pygments==2.2.0
pyinotify==0.9.6
pylint==2.2.0
pylint==2.6.0
pyparsing==2.1.0
pyperclip==1.5.27
pyroute2==0.5.13
python-dateutil==2.5.3
python-dateutil==2.7.0
python-designateclient==2.7.0
python-editor==1.0.3
python-keystoneclient==3.8.0
@ -97,7 +117,7 @@ python-neutronclient==6.7.0
python-novaclient==9.1.0
python-subunit==1.0.0
pytz==2015.7
PyYAML==3.13
PyYAML==5.3.1
reno==3.1.0
repoze.lru==0.7
requests==2.14.2
@ -112,15 +132,15 @@ sqlparse==0.2.2
statsd==3.2.1
stestr==1.0.0
Tempita==0.5.2
tenacity==5.0.2
tenacity==6.0.0
testresources==2.0.0
testscenarios==0.4
testtools==2.2.0
tinyrpc==0.6
traceback2==1.4.0
unittest2==1.1.0
vine==1.1.4
vine==5.0.0
waitress==1.1.0
WebOb==1.7.1
WebOb==1.8.2
WebTest==2.0.27
wrapt==1.7.0
wrapt==1.12.0

+ 1
- 1
ovn_octavia_provider/driver.py View File

@ -38,7 +38,7 @@ LOG = logging.getLogger(__name__)
class OvnProviderDriver(driver_base.ProviderDriver):
def __init__(self):
super(OvnProviderDriver, self).__init__()
super().__init__()
self._ovn_helper = ovn_helper.OvnProviderHelper()
def __del__(self):


+ 2
- 4
ovn_octavia_provider/event.py View File

@ -27,8 +27,7 @@ class LogicalRouterPortEvent(row_event.RowEvent):
def __init__(self, driver):
table = 'Logical_Router_Port'
events = (self.ROW_CREATE, self.ROW_DELETE)
super(LogicalRouterPortEvent, self).__init__(
events, table, None)
super().__init__(events, table, None)
self.event_name = 'LogicalRouterPortEvent'
self.driver = driver
@ -50,8 +49,7 @@ class LogicalSwitchPortUpdateEvent(row_event.RowEvent):
def __init__(self, driver):
table = 'Logical_Switch_Port'
events = (self.ROW_UPDATE,)
super(LogicalSwitchPortUpdateEvent, self).__init__(
events, table, None)
super().__init__(events, table, None)
self.event_name = 'LogicalSwitchPortUpdateEvent'
self.driver = driver


+ 2
- 2
ovn_octavia_provider/helper.py View File

@ -124,9 +124,9 @@ class OvnProviderHelper(object):
# and is expected to be caught by the caller.
try:
return getattr(row, col)[key]
except KeyError:
except KeyError as e:
raise idlutils.RowNotFound(table=row._table.name,
col=col, match=key)
col=col, match=key) from e
def _get_nw_router_info_on_interface_event(self, lrp):
"""Get the Router and Network information on an interface event


+ 0
- 2
ovn_octavia_provider/tests/functional/requirements.txt View File

@ -3,5 +3,3 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
psutil>=1.1.1,<2.0.0

+ 8
- 8
requirements.txt View File

@ -2,18 +2,18 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
keystoneauth1>=3.4.0 # Apache-2.0
keystoneauth1>=3.14.0 # Apache-2.0
netaddr>=0.7.18 # BSD
neutron-lib>=2.1.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
neutron-lib>=2.2.0 # Apache-2.0
oslo.config>=6.0.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.messaging>=12.4.0 # Apache-2.0
oslo.serialization>=2.28.1 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
oslo.utils>=4.5.0 # Apache-2.0
ovs>=2.8.0 # Apache-2.0
ovsdbapp>=0.17.0 # Apache-2.0
pbr!=2.1.0,>=2.0.0 # Apache-2.0
ovsdbapp>=1.3.0 # Apache-2.0
pbr>=4.0.0 # Apache-2.0
SQLAlchemy>=1.2.19 # MIT
tenacity>=5.0.2 # Apache-2.0
octavia-lib>=1.3.1 # Apache-2.0
tenacity>=6.0.0 # Apache-2.0
octavia-lib>=2.2.0 # Apache-2.0
python-neutronclient>=6.7.0 # Apache-2.0

+ 4
- 6
test-requirements.txt View File

@ -10,15 +10,13 @@ flake8-import-order==0.12 # LGPLv3
python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
pylint==2.3.0 # GPLv2
pylint>=2.5.3 # GPLv2
isort==4.3.21 # MIT
octavia-lib>=1.3.1 # Apache-2.0
octavia-lib>=2.2.0 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD
WebTest>=2.0.27 # MIT
testtools>=2.2.0 # MIT
# NOTE: Precisely we need ussuri neutron and neutron 15.y.z is train release
# but zuul installs neutron master as we specify it as required-projects.
# Let's update the lower bound once neutron ussuri is releaesd including beta.
neutron>=15.0.0 # Apache-2.0
# NOTE: Precisely we need ussuri neutron
neutron>=16.0.0 # Apache-2.0

Loading…
Cancel
Save