Browse Source

Update master branch requirements

Bump neutron-lib, and osc-lib, and update some more requirements

Depends-on: Ie74ea517a403e6e2a7a4e0a245dd20e5281339e8
Change-Id: If34a9889fb0f137856f7c241788cf593e722d665
changes/12/765812/16
asarfaty 7 months ago
committed by Kobi Samoray
parent
commit
eeac28dd80
11 changed files with 57 additions and 44 deletions
  1. +1
    -2
      doc/requirements.txt
  2. +30
    -16
      lower-constraints.txt
  3. +12
    -12
      requirements.txt
  4. +3
    -3
      test-requirements.txt
  5. +2
    -1
      tox.ini
  6. +1
    -0
      vmware_nsx/plugins/nsx_p/utils.py
  7. +1
    -1
      vmware_nsx/services/lbaas/nsx_p/implementation/lb_utils.py
  8. +1
    -1
      vmware_nsx/shell/admin/plugins/nsxp/resources/utils.py
  9. +3
    -4
      vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py
  10. +1
    -1
      vmware_nsx/tests/unit/extensions/test_provider_security_groups.py
  11. +2
    -3
      vmware_nsx/tests/unit/extensions/test_secgroup_rule_local_ip_prefix.py

+ 1
- 2
doc/requirements.txt View File

@ -2,10 +2,9 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
sphinx>=2.0.0,!=2.1.0 # BSD
oslosphinx>=4.7.0 # Apache-2.0
sphinx_feature_classification>=1.0.0 # Apache-2.0
openstackdocstheme>=1.18.1 # Apache-2.0
oslotest>=3.2.0 # Apache-2.0
reno>=2.5.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
testresources>=2.0.0 # Apache-2.0/BSD


+ 30
- 16
lower-constraints.txt View File

@ -1,33 +1,45 @@
amqp==2.1.1
alabaster==0.7.10
alembic==1.4.2
amqp==2.5.0
attrs==17.4.0
Babel==2.3.4
bandit==1.1.0
bcrypt==3.2.0
cffi==1.14.2
cliff==3.4.0
cmd2==1.3.8
colorama==0.4.4
coverage==4.0
cryptography==3.1
debtcollector==1.19.0
decorator==4.4.1
docutils==0.12
dulwich==0.15.0
eventlet==0.24.1
fasteners==0.14.1
fixtures==3.0.0
flake8-import-order==0.12
flake8==2.6.2
hacking==1.1.0
flake8-import-order==0.18.1
httplib2==0.9.1
kombu==4.0.0
netaddr==0.7.18
neutron-lib==2.0.0
neutron-lib==2.6.1
neutron-fwaas==16.0.0
octavia-lib==1.3.1
openstackdocstheme==1.18.1
oslo.concurrency==3.26.0
oslo.config==5.2.0
oslo.context==2.19.2
oslo.config==6.0.0
oslo.context==2.22.0
oslo.db==4.44.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==5.29.0
oslo.policy==1.30.0
oslo.i18n==3.20.0
oslo.log==4.3.0
oslo.messaging==7.0.0
oslo.policy==3.6.0
oslo.serialization==2.28.1
oslo.service==1.31.0
oslo.utils==3.33.0
oslo.utils==4.4.0
oslo.vmware==2.17.0
oslotest==3.2.0
osc-lib==1.14.0
osc-lib==2.0.0
paramiko==2.4.0
pbr==4.0.0
pika-pool==0.1.3
@ -39,10 +51,12 @@ pylint==2.4.4
python-openstackclient==5.3.0
reno==2.5.0
requests==2.14.2
sphinx==3.3.0
SQLAlchemy==1.2.0
stestr==1.0.0
stevedore==1.20.0
tenacity==5.0.2
stevedore==2.0.1
tenacity==6.0.0
testscenarios==0.4
testtools==2.2.0
tooz==1.58.0
tooz==2.7.1
vmware-nsxlib==17.0.0

+ 12
- 12
requirements.txt View File

@ -7,27 +7,27 @@ eventlet>=0.24.1 # MIT
httplib2>=0.9.1 # MIT
requests>=2.14.2 # Apache-2.0
netaddr>=0.7.18 # BSD
tenacity>=5.0.2 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
stevedore>=1.20.0 # Apache-2.0
neutron-lib>=2.0.0 # Apache-2.0
osc-lib>=1.14.0 # Apache-2.0
tenacity>=6.0.0 # Apache-2.0
SQLAlchemy>=1.2.0 # MIT
stevedore>=2.0.1 # Apache-2.0
neutron-lib>=2.6.1 # Apache-2.0
osc-lib>=2.0.0 # Apache-2.0
octavia-lib>=1.3.1 # Apache-2.0
python-openstackclient>=5.3.0 # Apache-2.0
oslo.concurrency>=3.26.0 # Apache-2.0
oslo.context>=2.19.2 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
oslo.context>=2.22.0 # Apache-2.0
oslo.config>=6.0.0 # Apache-2.0
oslo.db>=4.44.0 # Apache-2.0
oslo.i18n>=3.15.3 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
oslo.policy>=1.30.0 # Apache-2.0
oslo.i18n>=3.20.0 # Apache-2.0
oslo.log>=4.3.0 # Apache-2.0
oslo.policy>=3.6.0 # Apache-2.0
oslo.serialization>=2.28.1 # Apache-2.0
oslo.service>=1.31.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
oslo.utils>=4.4.0 # Apache-2.0
oslo.vmware>=2.17.0 # Apache-2.0
paramiko>=2.4.0 # LGPLv2.1+
PrettyTable<0.8,>=0.7.2 # BSD
tooz>=1.58.0 # Apache-2.0
tooz>=2.7.1 # Apache-2.0
decorator>=4.4.1 # BSD
# These repos are installed from git in OpenStack CI if the job


+ 3
- 3
test-requirements.txt View File

@ -1,15 +1,15 @@
# 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.
hacking>=1.1.0 # Apache-2.0
hacking>=3.0.1,<3.1.0 # Apache-2.0
bandit!=1.6.0,>=1.1.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
flake8>=2.6.0
flake8-import-order==0.12 # LGPLv3
flake8-import-order==0.18.1 # LGPLv3
psycopg2>=2.8 # LGPL/ZPL
PyMySQL>=0.10.0 # MIT License
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
testscenarios>=0.4 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
pylint>=2.4.4 # GPLv2

+ 2
- 1
tox.ini View File

@ -162,12 +162,13 @@ enable-extensions=H106,H203,H204,H205
# H307 like imports should be grouped together
# H404 multi line docstring should start with a summary
# H405 multi line docstring summary not separated with an empty line
# I202 Additional newline in a group of imports
# H904 Wrap long lines in parentheses instead of a backslash
# TODO(dougwig) -- uncomment this to test for remaining linkages
# N530 direct neutron imports not allowed
# N531 translations hints
# W504 line break after binary operator
ignore = E125,E126,E128,E129,E265,H305,H307,H404,H405,H904,N530,N531,W504
ignore = E125,E126,E128,E129,E265,H305,H307,H404,H405,H904,N530,N531,W504,I202
show-source = true
builtins = _
exclude = .venv,.git,.tox,dist,doc,*lib/python*,*egg,build,.ropeproject


+ 1
- 0
vmware_nsx/plugins/nsx_p/utils.py View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
def get_edge_cluster_tzs(nsxpolicy, nsxlib, ec_uuid):
ec_nodes = nsxpolicy.edge_cluster.get_edge_node_nsx_ids(ec_uuid)
ec_tzs = []


+ 1
- 1
vmware_nsx/services/lbaas/nsx_p/implementation/lb_utils.py View File

@ -14,8 +14,8 @@
# under the License.
import functools
import netaddr
import netaddr
from neutron_lib import exceptions as n_exc
from oslo_log import log as logging


+ 1
- 1
vmware_nsx/shell/admin/plugins/nsxp/resources/utils.py View File

@ -13,13 +13,13 @@
# under the License.
import logging
from oslo_config import cfg
from neutron.db import l3_dvr_db # noqa
from neutron import manager
from neutron_lib import context
from neutron_lib.plugins import constants as const
from neutron_lib.plugins import directory
from oslo_config import cfg
from vmware_nsx.common import config
from vmware_nsx.plugins.common_v3 import utils as v3_utils


+ 3
- 4
vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py View File

@ -13,18 +13,17 @@
# under the License.
import copy
import logging
import sys
import time
import logging
import paramiko
import tenacity
from neutron.extensions import securitygroup as ext_sg
from neutron_fwaas.db.firewall.v2 import firewall_db_v2
from neutron_lib.callbacks import registry
from neutron_lib import context
from oslo_config import cfg
import paramiko
import tenacity
from vmware_nsx.common import utils as nsx_utils
from vmware_nsx.db import db


+ 1
- 1
vmware_nsx/tests/unit/extensions/test_provider_security_groups.py View File

@ -13,7 +13,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from unittest import mock
import webob.exc
from neutron.db import db_base_plugin_v2
from neutron.db import securitygroups_db
@ -22,6 +21,7 @@ from neutron.tests.unit.db import test_db_base_plugin_v2
from neutron.tests.unit.extensions import test_securitygroup
from neutron_lib import context
from neutron_lib.db import api as db_api
import webob.exc
from vmware_nsx.db import extended_security_group
from vmware_nsx.extensions import providersecuritygroup as provider_sg


+ 2
- 3
vmware_nsx/tests/unit/extensions/test_secgroup_rule_local_ip_prefix.py View File

@ -14,9 +14,6 @@
# under the License.
from unittest import mock
import webob.exc
from oslo_utils import uuidutils
from neutron.db import db_base_plugin_v2
from neutron.db import securitygroups_db
@ -25,6 +22,8 @@ from neutron.tests.unit.extensions import test_securitygroup
from neutron_lib import constants as const
from neutron_lib.db import api as db_api
from neutron_lib.plugins import directory
from oslo_utils import uuidutils
import webob.exc
from vmware_nsx.db import extended_security_group_rule as ext_rule_db
from vmware_nsx.extensions import secgroup_rule_local_ip_prefix as ext_loip


Loading…
Cancel
Save