Browse Source

Fix gate failure

Bumped a bunch of constraints and requirements to fix
a gate failure with recent pip update. Fix associated
new warnings.

Had to change job definition to disable IPv6 metadata
test a different way.

Depends-on: https://review.opendev.org/c/openstack/neutron/+/767287

Change-Id: Icd09952f267ba734b6719b96636108bd27ececea
changes/24/767424/8
Brian Haley 9 months ago
parent
commit
7ac35c033d
  1. 36
      lower-constraints.txt
  2. 2
      networking_ovn/common/ovn_client.py
  3. 2
      networking_ovn/common/utils.py
  4. 2
      networking_ovn/ml2/qos_driver.py
  5. 1
      networking_ovn/tests/functional/requirements.txt
  6. 4
      requirements.txt
  7. 10
      test-requirements.txt
  8. 4
      zuul.d/networking-ovn-jobs.yaml

36
lower-constraints.txt

@ -3,11 +3,11 @@ alembic==0.8.10
amqp==2.1.1
appdirs==1.4.3
asn1crypto==0.23.0
astroid==2.1.0
astroid==2.4.0
Babel==2.3.4
beautifulsoup4==4.6.0
cachetools==2.0.0
cffi==1.7.0
cffi==1.13.2
chardet==3.0.4
cliff==2.8.0
cmd2==0.8.0
@ -25,12 +25,12 @@ eventlet==0.18.2
extras==1.0.0
fasteners==0.7.0
fixtures==3.0.0
flake8==2.6.2
flake8==3.7.9
flake8-import-order==0.12
future==0.16.0
futurist==1.2.0
greenlet==0.4.10
hacking==1.1.0
greenlet==0.4.14
hacking==3.0.1
idna==2.6
imagesize==0.7.1
iso8601==0.1.11
@ -47,8 +47,8 @@ linecache2==1.0.0
logilab-common==1.4.1
logutils==0.3.5
Mako==0.4.0
MarkupSafe==1.0
mccabe==0.2.1
MarkupSafe==1.1.0
mccabe==0.6.1
mock==2.0.0
monotonic==0.6
mox3==0.20.0
@ -67,7 +67,7 @@ os-testr==1.0.0
os-xenapi==0.3.1
osc-lib==1.8.0
oslo.cache==1.26.0
oslo.concurrency==3.25.0
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.19.2
oslo.i18n==3.15.3
@ -78,7 +78,7 @@ oslo.policy==1.30.0
oslo.privsep==1.23.0
oslo.reports==1.18.0
oslo.rootwrap==5.8.0
oslo.serialization==2.18.0
oslo.serialization==2.28.1
oslo.service==1.24.0
oslo.utils==3.33.0
oslo.versionedobjects==1.31.2
@ -89,7 +89,7 @@ ovsdbapp==0.17.0
Paste==2.0.2
PasteDeploy==1.5.0
pbr==2.0.0
pecan==1.0.0
pecan==1.3.2
pep8==1.5.7
pika==0.10.0
pika-pool==0.1.3
@ -97,12 +97,12 @@ positional==1.2.1
prettytable==0.7.2
psutil==3.2.2
pycadf==1.1.0
pycodestyle==2.4.0
pycodestyle==2.5.0
pycparser==2.18
pyflakes==0.8.1
pyflakes==2.1.1
Pygments==2.2.0
pyinotify==0.9.6
pylint==2.2.0
pylint==2.5.3
pyOpenSSL==17.1.0
pyparsing==2.1.0
pyperclip==1.5.27
@ -116,7 +116,7 @@ python-neutronclient==6.7.0
python-novaclient==9.1.0
python-subunit==1.0.0
pytz==2013.6
PyYAML==3.12
PyYAML==5.3.1
reno==2.5.0
repoze.lru==0.7
requests==2.14.2
@ -124,9 +124,9 @@ requestsexceptions==1.2.0
restructuredtext-lint==1.1.1
rfc3986==0.3.1
Routes==2.3.1
ryu==4.14
ryu==4.24
simplejson==3.5.1
six==1.10.0
six==1.12.0
snowballstemmer==1.2.1
Sphinx==1.6.2
sphinxcontrib-websupport==1.0.1
@ -137,7 +137,7 @@ statsd==3.2.1
stestr==1.0.0
stevedore==1.20.0
Tempita==0.5.2
tenacity==4.4.0
tenacity==5.0.2
testrepository==0.0.18
testresources==2.0.0
testscenarios==0.4
@ -150,4 +150,4 @@ vine==1.1.4
waitress==1.1.0
WebOb==1.7.1
WebTest==2.0.27
wrapt==1.7.0
wrapt==1.12.0

2
networking_ovn/common/ovn_client.py

@ -1885,7 +1885,7 @@ class OVNClient(object):
port, subnet['ip_version'])
if lsp_dhcp_disabled:
continue
elif not lsp_dhcp_opts:
if not lsp_dhcp_opts:
lsp_dhcp_options = subnet_dhcp_option
else:
port_dhcp_options = copy.deepcopy(dhcp_options)

2
networking_ovn/common/utils.py

@ -416,7 +416,7 @@ def get_system_dns_resolvers(resolver_file=DNS_RESOLVER_FILE):
def get_port_subnet_ids(port):
fixed_ips = [ip for ip in port['fixed_ips']]
fixed_ips = list(port['fixed_ips'])
return [f['subnet_id'] for f in fixed_ips]

2
networking_ovn/ml2/qos_driver.py

@ -55,6 +55,8 @@ class OVNQosDriver(base.DriverBase):
@property
def is_loaded(self):
# TODO(bcafarel): should be fixed in DriverBase in neutron-lib
# pylint:disable=invalid-overridden-method
return OVN_QOS in cfg.CONF.ml2.extension_drivers
def update_policy(self, context, policy):

1
networking_ovn/tests/functional/requirements.txt

@ -4,5 +4,4 @@
# 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
PyMySQL>=0.6.2 # MIT License

4
requirements.txt

@ -11,9 +11,9 @@ ovs>=2.8.0 # Apache-2.0
ovsdbapp>=0.17.0 # Apache-2.0
pbr!=2.1.0,>=2.0.0 # Apache-2.0
pyOpenSSL>=17.1.0 # Apache-2.0
tenacity>=4.4.0 # Apache-2.0
tenacity>=5.0.2 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
six>=1.10.0 # MIT
six>=1.12.0 # MIT
neutron>=13.0.0.0b2 # Apache-2.0
octavia-lib>=1.3.1 # Apache-2.0
tooz>=1.58.0 # Apache-2.0

10
test-requirements.txt

@ -2,18 +2,20 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking>=1.1.0 # Apache-2.0
hacking>=1.1.0;python_version<'3.0' # Apache-2.0
hacking>=3.0.1;python_version>='3.0' # Apache-2.0
bandit!=1.6.0,>=1.1.0 # Apache-2.0
bandit!=1.6.0,>=1.1.0,<1.6.3;python_version<'3.0' # Apache-2.0
bandit!=1.6.0,>=1.1.0;python_version>='3.0' # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
flake8-import-order==0.12 # LGPLv3
python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
os-testr>=1.0.0 # Apache-2.0
astroid==1.6.5;python_version<"3.0" # LGPLv2.1
astroid==2.1.0;python_version>="3.0" # LGPLv2.1
astroid==2.4.0;python_version>="3.0" # LGPLv2.1
pylint==1.9.3;python_version<'3.0' # GPLv2
pylint==2.3.0;python_version>='3.0' # GPLv2
pylint==2.5.3;python_version>='3.0' # GPLv2
octavia-lib>=1.3.1 # Apache-2.0
testresources>=2.0.0 # Apache-2.0/BSD
testscenarios>=0.4 # Apache-2.0/BSD

4
zuul.d/networking-ovn-jobs.yaml

@ -78,8 +78,8 @@
devstack_local_conf:
test-config:
$TEMPEST_CONFIG:
neutron_plugin_options:
ipv6_metadata: False
network-feature-enabled:
available_features: ""
devstack_plugins:
networking-ovn: https://opendev.org/openstack/networking-ovn

Loading…
Cancel
Save