Browse Source

Fix Victoria branch requirements

Change-Id: I7421c598eb737fdabccfc027c455e8dcbe1f3fb1
changes/20/765820/14
asarfaty 7 months ago
committed by Adit Sarfaty
parent
commit
a83fdc35d7
11 changed files with 57 additions and 40 deletions
  1. +1
    -2
      doc/requirements.txt
  2. +23
    -14
      lower-constraints.txt
  3. +15
    -15
      requirements.txt
  4. +3
    -3
      test-requirements.txt
  5. +3
    -1
      tox.ini
  6. +1
    -0
      vmware_nsx/plugins/nsx_p/utils.py
  7. +1
    -0
      vmware_nsx/services/lbaas/nsx_p/implementation/lb_utils.py
  8. +1
    -0
      vmware_nsx/shell/admin/plugins/nsxp/resources/utils.py
  9. +1
    -0
      vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py
  10. +7
    -5
      vmware_nsx/tests/unit/extensions/test_provider_security_groups.py
  11. +1
    -0
      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


+ 23
- 14
lower-constraints.txt View File

@ -1,33 +1,32 @@
amqp==2.1.1
amqp==2.5.0
bandit==1.1.0
coverage==4.0
decorator==4.4.1
docutils==0.12
eventlet==0.24.1
fixtures==3.0.0
flake8-import-order==0.12
flake8==2.6.2
hacking==1.1.0
flake8-import-order==0.18.1
hacking==3.0.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.context==2.20.0
oslo.db==4.44.0
oslo.i18n==3.15.3
oslo.log==3.36.0
oslo.messaging==5.29.0
oslo.i18n==3.20.0
oslo.log==4.2.1
oslo.policy==1.30.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 +38,20 @@ 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
testtools==2.2.0
tooz==1.58.0
testscenarios==0.4
tooz==2.7.1
vine==1.1.4
# Other neutron related projects
vmware-nsxlib==17.0.0
neutron==17.0.0
networking-l2gw==17.0.1
networking-sfc==11.0.0
neutron-fwaas==16.0.0
neutron-vpnaas==17.0.0
neutron-dynamic-routing==17.0.0

+ 15
- 15
requirements.txt View File

@ -7,40 +7,40 @@ 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
tenacity>=6.0.0 # 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
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.context>=2.20.0 # Apache-2.0
oslo.config>=5.2.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.i18n>=3.20.0 # Apache-2.0
oslo.log>=4.2.1 # Apache-2.0
oslo.policy>=1.30.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
# configures them as required-projects:
neutron>=17.0.0.0 # Apache-2.0
neutron>=17.0.0 # Apache-2.0
networking-l2gw>=17.0.1 # Apache-2.0
networking-sfc>=10.0.0.0 # Apache-2.0
neutron-fwaas>=16.0.0.0 # Apache-2.0
neutron-vpnaas>=17.0.0.0 # Apache-2.0
neutron-dynamic-routing>=16.0.0.0 # Apache-2.0
networking-sfc>=11.0.0 # Apache-2.0
neutron-fwaas>=16.0.0 # Apache-2.0
neutron-vpnaas>=17.0.0 # Apache-2.0
neutron-dynamic-routing>=17.0.0 # Apache-2.0
vmware-nsxlib>=17.0.0 # Apache-2.0
# NOTE: we require octavia but can't depend on it
# octavia>=7.0.0.0 # Apache-2.0
# octavia>=7.0.0 # Apache-2.0
# The comment below indicates this project repo is current with neutron-lib
# and should receive neutron-lib consumption patches as they are released


+ 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

+ 3
- 1
tox.ini View File

@ -22,6 +22,7 @@ commands =
[testenv:common]
# Fake job to define environment variables shared between dsvm/non-dsvm jobs
setenv = OS_TEST_TIMEOUT=180
EDITOR=vi
commands = false
[testenv:dev]
@ -164,11 +165,12 @@ enable-extensions=H106,H203,H204,H205
# H404 multi line docstring should start with a summary
# H405 multi line docstring summary not separated with an empty line
# H904 Wrap long lines in parentheses instead of a backslash
# I202 Additional newline in a group of imports
# 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
- 0
vmware_nsx/services/lbaas/nsx_p/implementation/lb_utils.py View File

@ -14,6 +14,7 @@
# under the License.
import functools
import netaddr
from neutron_lib import exceptions as n_exc


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

@ -13,6 +13,7 @@
# under the License.
import logging
from oslo_config import cfg
from neutron.db import l3_dvr_db # noqa


+ 1
- 0
vmware_nsx/shell/admin/plugins/nsxv3/resources/migration.py View File

@ -17,6 +17,7 @@ import sys
import time
import logging
import paramiko
import tenacity


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

@ -13,6 +13,7 @@
# 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
@ -20,7 +21,7 @@ from neutron.db import securitygroups_db
from neutron.extensions import securitygroup as ext_sg
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 import context as neutron_context
from neutron_lib.db import api as db_api
from vmware_nsx.db import extended_security_group
@ -250,7 +251,7 @@ class ProviderSecurityGroupExtTestCase(
body = {'port': {'provider_security_groups': [
pvd_sg['security_group']['id']]}}
ctx = context.Context('', self._tenant_id)
ctx = neutron_context.Context('', self._tenant_id)
req = self.new_update_request('ports', body,
p['port']['id'], context=ctx)
res = req.get_response(self.api)
@ -294,7 +295,7 @@ class ProviderSecurityGroupExtTestCase(
# Try deleting the request as the normal tenant returns forbidden
# as a tenant is not allowed to delete this.
ctx = context.Context('', self._tenant_id)
ctx = neutron_context.Context('', self._tenant_id)
self._delete('security-groups', pvd_sg_id,
expected_code=webob.exc.HTTPForbidden.code,
neutron_context=ctx)
@ -319,7 +320,7 @@ class ProviderSecurityGroupExtTestCase(
# Try deleting the request as the normal tenant returns forbidden
# as a tenant is not allowed to delete this.
ctx = context.Context('', self._tenant_id)
ctx = neutron_context.Context('', self._tenant_id)
self._delete('security-group-rules', sg_rule_id,
expected_code=webob.exc.HTTPForbidden.code,
neutron_context=ctx)
@ -339,7 +340,8 @@ class ProviderSecurityGroupExtTestCase(
req = self.new_create_request(
'security-group-rules', data)
req.environ['neutron.context'] = context.Context('', self._tenant_id)
req.environ['neutron.context'] = neutron_context.Context(
'', self._tenant_id)
res = req.get_response(self.ext_api)
self.assertEqual(webob.exc.HTTPForbidden.code, res.status_int)


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

@ -14,6 +14,7 @@
# under the License.
from unittest import mock
import webob.exc
from oslo_utils import uuidutils


Loading…
Cancel
Save