Browse Source

fix tricircle devstack installation can not import contants

refer https://bugs.launchpad.net/tricircle/+bug/1854450

Change-Id: Ia759cd41acf90fb96d08707897830e8ba188afd5
changes/31/699331/23
zhangchi 2 years ago
committed by Zhang Chi
parent
commit
6d1a78e3d0
6 changed files with 25 additions and 38 deletions
  1. +2
    -4
      .zuul.yaml
  2. +14
    -12
      lower-constraints.txt
  3. +3
    -3
      requirements.txt
  4. +4
    -4
      test-requirements.txt
  5. +2
    -2
      tricircle/common/request_source.py
  6. +0
    -13
      tricircle/tests/unit/network/test_central_plugin.py

+ 2
- 4
.zuul.yaml View File

@ -54,8 +54,8 @@
- project:
templates:
- openstack-python-jobs-neutron
- openstack-python3-train-jobs-neutron
- openstack-python3-train-jobs
- openstack-python3-ussuri-jobs-neutron
- openstack-python3-ussuri-jobs
- check-requirements
- publish-openstack-docs-pti
- release-notes-jobs-python3
@ -70,7 +70,6 @@
- openstack-tox-py27:
required-projects:
- openstack/neutron
- openstack/networking-sfc
- openstack-tox-py36:
required-projects:
- openstack/neutron
@ -88,7 +87,6 @@
- openstack-tox-py27:
required-projects:
- openstack/neutron
- openstack/networking-sfc
- openstack-tox-py36:
required-projects:
- openstack/neutron


+ 14
- 12
lower-constraints.txt View File

@ -13,7 +13,7 @@ cmd2==0.8.0
contextlib2==0.4.0
coverage==4.0
ddt==1.0.1
debtcollector==1.2.0
debtcollector==1.19.0
decorator==3.4.0
deprecation==1.0
docutils==0.11
@ -39,7 +39,8 @@ jmespath==0.9.0
jsonpatch==1.16
jsonpointer==1.13
jsonschema==2.6.0
keystoneauth1==3.4.0
keystoneauth1==3.4.0;python_version<'3.3'
keystoneauth1==3.14.0;python_version>'3.3'
keystonemiddleware==4.17.0
kombu==4.0.0
linecache2==1.0.0
@ -48,19 +49,20 @@ logutils==0.3.5
Mako==0.4.0
MarkupSafe==1.0
mccabe==0.2.1
mock==2.0.0
monotonic==0.6
mock==3.0.0
monotonic==0.6;python_version<'3.3'
mox3==0.20.0
msgpack-python==0.4.0
munch==2.1.0
netaddr==0.7.18
netifaces==0.10.4
networking-sfc==8.0.0.0b1
neutron-lib==1.25.0
openstackdocstheme==1.18.1
openstacksdk==0.11.2
neutron-lib==1.25.0;python_version<'3.3'
neutron-lib==1.29.1;python_version>'3.3'
openstackdocstheme==1.30.0
openstacksdk==0.31.2
os-client-config==1.28.0
os-service-types==1.2.0
os-service-types==1.7.0
os-xenapi==0.3.1
osc-lib==1.8.0
oslo.cache==1.26.0
@ -83,10 +85,10 @@ oslo.utils==3.33.0
oslo.versionedobjects==1.35.1
oslosphinx==4.7.0
oslotest==3.2.0
osprofiler==1.4.0
osprofiler==2.3.0
os-testr==1.0.0
ovs==2.8.0
ovsdbapp==0.9.1
ovsdbapp==0.12.1
Paste==2.0.2
PasteDeploy==1.5.0
pbr==4.0.0
@ -103,7 +105,7 @@ pycparser==2.18
pyflakes==0.8.1
Pygments==2.2.0
pyinotify==0.9.6
pylint==1.9.2
pylint==2.2.0
PyMySQL==0.7.6
pyparsing==2.1.0
pyperclip==1.5.27
@ -132,7 +134,7 @@ simplejson==3.5.1
six==1.10.0
smmap==0.9.0
snowballstemmer==1.2.1
Sphinx==1.6.2
Sphinx==1.6.5
sphinxcontrib-websupport==1.0.1
sqlalchemy-migrate==0.11.0
SQLAlchemy==1.2.0


+ 3
- 3
requirements.txt View File

@ -7,16 +7,14 @@ Babel!=2.4.0,>=2.3.4 # BSD
Paste>=2.0.2 # MIT
PasteDeploy>=1.5.0 # MIT
Routes>=2.3.1 # MIT
debtcollector>=1.2.0 # Apache-2.0
debtcollector>=1.19.0 # Apache-2.0
eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.3.2 # BSD
requests>=2.14.2 # Apache-2.0
Jinja2>=2.10 # BSD License (3 clause)
keystoneauth1>=3.4.0 # Apache-2.0
keystonemiddleware>=4.17.0 # Apache-2.0
netaddr>=0.7.18 # BSD
netifaces>=0.10.4 # MIT
neutron-lib>=1.25.0 # Apache-2.0
SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.2.0 # MIT
WebOb>=1.8.2 # MIT
python-cinderclient>=3.3.0 # Apache-2.0
@ -45,6 +43,8 @@ sqlalchemy-migrate>=0.11.0 # Apache-2.0
# These repos are installed from git in OpenStack CI if the job
# configures them as required-projects:
#keystoneauth1>=3.4.0;python_version<'3.3' # Apache-2.0
#neutron-lib>=1.29.1;python_version>'3.3' # Apache-2.0
neutron>=12.0.0 # Apache-2.0
networking-sfc>=8.0.0.0b1 # Apache-2.0


+ 4
- 4
test-requirements.txt View File

@ -2,15 +2,15 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
coverage!=4.4,>=4.0 # Apache-2.0
fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0.0 # BSD
mock>=3.0.0 # BSD
python-subunit>=1.0.0 # Apache-2.0/BSD
requests-mock>=1.2.0 # Apache-2.0
docutils>=0.11 # OSI-Approved Open Source, Public Domain
sphinx!=1.6.6,>=1.6.2 # BSD
openstackdocstheme>=1.18.1 # Apache-2.0
sphinx!=1.6.6,!=1.6.7,>=1.6.5,<2.0.0;python_version=='2.7' # BSD
sphinx!=1.6.6,!=1.6.7,>=1.6.5,!=2.1.0;python_version>='3.4' # BSD
openstackdocstheme>=1.30.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=2.2.0 # MIT
testresources>=2.0.0 # Apache-2.0/BSD


+ 2
- 2
tricircle/common/request_source.py View File

@ -9,12 +9,12 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from neutron_lib import constants as cons
from oslo_log import log as logging
from oslo_middleware import base
import webob
import constants as cons
LOG = logging.getLogger(__name__)


+ 0
- 13
tricircle/tests/unit/network/test_central_plugin.py View File

@ -2662,19 +2662,6 @@ class PluginTest(unittest.TestCase,
return t_port_id, b_port_id, fip, e_net
@patch.object(context, 'get_context_from_neutron_context')
def test_handle_remote_group_invalid_input(self, mock_context):
self._basic_pod_route_setup()
fake_plugin = FakePlugin()
q_ctx = FakeNeutronContext()
t_ctx = context.get_db_context()
mock_context.return_value = t_ctx
self._test_handle_remote_group_invalid_input(fake_plugin, q_ctx, t_ctx,
'pod_id_1', TOP_SGS,
TOP_SG_RULES, BOTTOM1_SGS)
@patch.object(context, 'get_context_from_neutron_context')
def test_create_policy(self, mock_context):
fake_plugin = FakePlugin()


Loading…
Cancel
Save