Browse Source

update for python3 train jobs

Change-Id: Ic104e1a67e69a2e06fb47db23896a14cacf9ca24
changes/34/670134/3
Boden R 2 years ago
parent
commit
c3bf87fd05
5 changed files with 37 additions and 6 deletions
  1. +25
    -1
      .zuul.yaml
  2. +1
    -0
      bindep.txt
  3. +1
    -0
      setup.cfg
  4. +7
    -2
      tox.ini
  5. +3
    -3
      vmware_nsx/plugins/nsx_v/plugin.py

+ 25
- 1
.zuul.yaml View File

@ -3,7 +3,7 @@
- build-openstack-docs-pti
- check-requirements
- openstack-python-jobs-neutron
- openstack-python36-jobs
- openstack-python3-train-jobs
check:
jobs:
- vmware-tox-lower-constraints
@ -42,6 +42,18 @@
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
- openstack-tox-py37:
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
gate:
queue: vmware-nsx
jobs:
@ -81,6 +93,18 @@
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
- openstack-tox-py37:
timeout: 5400
required-projects:
- openstack/neutron
- openstack/networking-l2gw
- openstack/networking-sfc
- x/vmware-nsxlib
- openstack/neutron-fwaas
- openstack/neutron-dynamic-routing
- openstack/neutron-vpnaas
- x/tap-as-a-service
- openstack/octavia
- job:
name: vmware-tox-lower-constraints


+ 1
- 0
bindep.txt View File

@ -18,6 +18,7 @@ mysql [platform:rpm test]
mysql-client [platform:dpkg test]
mysql-devel [platform:rpm test]
mysql-server [test]
postgresql-server-dev-all [platform:dpkg]
postgresql [test]
postgresql-client [platform:dpkg test]
postgresql-devel [platform:rpm test]


+ 1
- 0
setup.cfg View File

@ -17,6 +17,7 @@ classifier =
Programming Language :: Python :: 2.7
Programming Language :: Python :: 3
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
[files]
packages =


+ 7
- 2
tox.ini View File

@ -1,5 +1,5 @@
[tox]
envlist = py36,py27,pep8,docs
envlist = py27,py37,pep8
minversion = 2.0
skipsdist = True
@ -77,7 +77,12 @@ setenv = OS_FAIL_ON_MISSING_DEPS=1
basepython = python3.6
setenv = OS_FAIL_ON_MISSING_DEPS=1
[testenv:py37]
basepython = python3.7
setenv = OS_FAIL_ON_MISSING_DEPS=1
[testenv:py27-dev]
basepython = python2.7
commands =
{[testenv:dev]commands}
pip freeze
@ -86,7 +91,7 @@ whitelist_externals =
stestr
[testenv:py3-dev]
basepython = python3.5
basepython = python3.7
commands =
{[testenv:dev]commands}
pip freeze


+ 3
- 3
vmware_nsx/plugins/nsx_v/plugin.py View File

@ -1796,12 +1796,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
set_len = len(ip_addresses)
ip_addresses.add(ap['ip_address'])
if len(ip_addresses) == set_len:
msg = _('IP address %s is allowed '
msg = _('IP address %(ip)s is allowed '
'by more than 1 logical port. '
'This is not supported by the '
'backend. Port security cannot '
'be enabled for network '
'%s') % (ap['ip_address'], id)
'be enabled for network %(net)s') % {
'ip': ap['ip_address'], 'net': id}
LOG.error(msg)
raise n_exc.BadRequest(
resource='networks',


Loading…
Cancel
Save