openstack/neutron-vpnaas
Code Issues Proposed changes

Rename Quantum to Neutron

Browse Source 
This change renames everything to Neutron while providing backwards
compatible adjustments for Grizzly configuration files.

implements blueprint: remove-use-of-quantum

Change-Id: Ie7d07ba7c89857e13d4ddc8f0e9b68de020a3d19
This commit is contained in:
Mark McClain 2013-07-03 19:39:46 -04:00
parent 7040bf3bd8
commit ee576e2921
20 changed files with 243 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -8,6 +8,9 @@ dist/
doc/build doc/build
*.DS_Store *.DS_Store
*.pyc *.pyc
neutron.egg-info/
neutron/vcsversion.py
neutron/versioninfo
quantum.egg-info/ quantum.egg-info/
quantum/vcsversion.py quantum/vcsversion.py
quantum/versioninfo quantum/versioninfo

3
.pylintrc
View File

@ -23,7 +23,8 @@ argument-rgx=[a-z_][a-z0-9_]{1,30}$
# and be lowecased with underscores # and be lowecased with underscores
method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$ method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
# Module names matching quantum-* are ok (files in bin/) # Module names matching neutron-* are ok (files in bin/)
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(neutron-[a-z0-9_-]+))$
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(quantum-[a-z0-9_-]+))$ module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(quantum-[a-z0-9_-]+))$
# Don't require docstrings on tests. # Don't require docstrings on tests.

2
.testr.conf
View File

@ -1,4 +1,4 @@
[DEFAULT] [DEFAULT]
test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ quantum/tests/unit $LISTOPT $IDOPTION test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ neutron/tests/unit $LISTOPT $IDOPTION
test_id_option=--load-list $IDFILE test_id_option=--load-list $IDFILE
test_list_option=--list test_list_option=--list

30
HACKING.rst
View File

@ -1,4 +1,4 @@
Quantum Style Commandments Neutron Style Commandments
========================== ==========================
- Step 1: Read http://www.python.org/dev/peps/pep-0008/ - Step 1: Read http://www.python.org/dev/peps/pep-0008/
@ -35,13 +35,13 @@ Example::
The following imports, The following imports,
from quantum.api import networks from neutron.api import networks
from quantum import wsgi from neutron import wsgi
are considered equivalent for ordering purposes to are considered equivalent for ordering purposes to
import quantum.api.networks import neutron.api.networks
import quantum.wsgi import neutron.wsgi
- Organize your imports according to the following template - Organize your imports according to the following template
@ -52,7 +52,7 @@ Example::
\n \n
{{third-party lib imports in human alphabetical order}} {{third-party lib imports in human alphabetical order}}
\n \n
{{quantum imports in human alphabetical order}} {{neutron imports in human alphabetical order}}
\n \n
\n \n
{{begin your code}} {{begin your code}}
@ -71,13 +71,13 @@ Example::
import testtools import testtools
import webob.exc import webob.exc
import quantum.api.networks import neutron.api.networks
from quantum.api import ports from neutron.api import ports
from quantum.db import models from neutron.db import models
from quantum.extensions import multiport from neutron.extensions import multiport
from quantum.openstack.common import log as logging from neutron.openstack.common import log as logging
import quantum.manager import neutron.manager
from quantum import service from neutron import service
Docstrings Docstrings
@ -202,8 +202,8 @@ submitted bug fix does have a unit test, be sure to add a new one that fails
without the patch and passes with the patch. without the patch and passes with the patch.
All unittest classes must ultimately inherit from testtools.TestCase. In the All unittest classes must ultimately inherit from testtools.TestCase. In the
Quantum test suite, this should be done by inheriting from Neutron test suite, this should be done by inheriting from
quantum.tests.base.BaseTestCase. neutron.tests.base.BaseTestCase.
All setUp and tearDown methods must upcall using the super() method. All setUp and tearDown methods must upcall using the super() method.
tearDown methods should be avoided and addCleanup calls should be preferred. tearDown methods should be avoided and addCleanup calls should be preferred.

10
MANIFEST.in
View File

@ -2,11 +2,11 @@ include AUTHORS
include README.rst include README.rst
include ChangeLog include ChangeLog
include LICENSE include LICENSE
include quantum/db/migration/README include neutron/db/migration/README
include quantum/db/migration/alembic.ini include neutron/db/migration/alembic.ini
include quantum/db/migration/alembic_migrations/script.py.mako include neutron/db/migration/alembic_migrations/script.py.mako
include quantum/db/migration/alembic_migrations/versions/README include neutron/db/migration/alembic_migrations/versions/README
recursive-include quantum/locale * recursive-include neutron/locale *
exclude .gitignore exclude .gitignore
exclude .gitreview exclude .gitreview

16
README.rst
View File

@ -1,25 +1,25 @@
# -- Welcome! # -- Welcome!
You have come across a cloud computing network fabric controller. It has You have come across a cloud computing network fabric controller. It has
identified itself as "Quantum." It aims to tame your (cloud) networking! identified itself as "Neutron." It aims to tame your (cloud) networking!
# -- External Resources: # -- External Resources:
The homepage for Quantum is: http://launchpad.net/quantum . Use this The homepage for Neutron is: http://launchpad.net/neutron . Use this
site for asking for help, and filing bugs. Code is available on github at site for asking for help, and filing bugs. Code is available on github at
<http://github.com/openstack/quantum>. <http://github.com/openstack/neutron>.
The latest and most in-depth documentation on how to use Quantum is The latest and most in-depth documentation on how to use Neutron is
available at: <http://docs.openstack.org>. This includes: available at: <http://docs.openstack.org>. This includes:
Quantum Administrator Guide Neutron Administrator Guide
http://docs.openstack.org/trunk/openstack-network/admin/content/ http://docs.openstack.org/trunk/openstack-network/admin/content/
Quantum API Reference: Neutron API Reference:
http://docs.openstack.org/api/openstack-network/2.0/content/ http://docs.openstack.org/api/openstack-network/2.0/content/
The start of some developer documentation is available at: The start of some developer documentation is available at:
http://wiki.openstack.org/QuantumDevelopment http://wiki.openstack.org/NeutronDevelopment
For help using or hacking on Quantum, you can send mail to For help using or hacking on Neutron, you can send mail to
<mailto:openstack-dev@lists.openstack.org>. <mailto:openstack-dev@lists.openstack.org>.

21
neutron/__init__.py Normal file
View File

@ -0,0 +1,21 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack Foundation
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import gettext
gettext.install('neutron', unicode=1)

17
neutron/db/__init__.py Normal file
View File

@ -0,0 +1,17 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 Nicira Networks, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# @author: Somik Behera, Nicira Networks, Inc.
# @author: Brad Hall, Nicira Networks, Inc.

16
neutron/services/__init__.py Normal file
View File

@ -0,0 +1,16 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2012 OpenStack Foundation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

35
neutron/tests/unit/__init__.py Normal file
View File

@ -0,0 +1,35 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
# See http://code.google.com/p/python-nose/issues/detail?id=373
# The code below enables nosetests to work with i18n _() blocks
import __builtin__
import os
setattr(__builtin__, '_', lambda x: x)
from oslo.config import cfg
reldir = os.path.join(os.path.dirname(__file__), '..', '..', '..')
absdir = os.path.abspath(reldir)
cfg.CONF.state_path = absdir
# An empty lock path forces lockutils.synchronized to use a temporary
# location for lock files that will be cleaned up automatically.
cfg.CONF.lock_path = ''
cfg.CONF.use_stderr = False

15
neutron/tests/unit/db/__init__.py Normal file
View File

@ -0,0 +1,15 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
# Copyright 2013 OpenStack Foundation
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

17
neutron/tests/unit/services/__init__.py Normal file
View File

@ -0,0 +1,17 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#
# Copyright 2013 New Dream Network, LLC (DreamHost)
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
# @author: Mark McClain, DreamHost

2
openstack-common.conf
View File

@ -30,4 +30,4 @@ module=timeutils
module=uuidutils module=uuidutils
# The base module to hold the copy of openstack.common # The base module to hold the copy of openstack.common
base=quantum base=neutron

2
requirements.txt
View File

@ -12,7 +12,7 @@ httplib2
iso8601>=0.1.4 iso8601>=0.1.4
kombu>=1.0.4 kombu>=1.0.4
netaddr netaddr
python-quantumclient>=2.2.0,<3.0.0 python-neutronclient>=2.2.3,<3.0.0
pyudev pyudev
sqlalchemy>=0.7.8,<=0.7.99 sqlalchemy>=0.7.8,<=0.7.99
WebOb>=1.2 WebOb>=1.2

132
setup.cfg
View File

@ -1,5 +1,5 @@
[metadata] [metadata]
name = quantum name = neutron
version = 2013.2 version = 2013.2
summary = OpenStack Networking summary = OpenStack Networking
description-file = description-file =
@ -20,73 +20,93 @@ classifier =
[files] [files]
packages = packages =
neutron
quantum quantum
data_files = data_files =
etc/quantum = etc/neutron =
etc/api-paste.ini etc/api-paste.ini
etc/dhcp_agent.ini etc/dhcp_agent.ini
etc/l3_agent.ini etc/l3_agent.ini
etc/lbaas_agent.ini etc/lbaas_agent.ini
etc/metadata_agent.ini etc/metadata_agent.ini
etc/policy.json etc/policy.json
etc/quantum.conf etc/neutron.conf
etc/rootwrap.conf etc/rootwrap.conf
etc/quantum/rootwrap.d = etc/neutron/rootwrap.d =
etc/quantum/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d/dhcp.filters
etc/quantum/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d/iptables-firewall.filters
etc/quantum/rootwrap.d/l3.filters etc/neutron/rootwrap.d/l3.filters
etc/quantum/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d/lbaas-haproxy.filters
etc/quantum/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d/linuxbridge-plugin.filters
etc/quantum/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d/nec-plugin.filters
etc/quantum/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d/openvswitch-plugin.filters
etc/quantum/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d/ryu-plugin.filters
etc/init.d = etc/init.d/quantum-server etc/init.d = etc/init.d/neutron-server
etc/quantum/plugins/bigswitch = etc/quantum/plugins/bigswitch/restproxy.ini etc/neutron/plugins/bigswitch = etc/neutron/plugins/bigswitch/restproxy.ini
etc/quantum/plugins/brocade = etc/quantum/plugins/brocade/brocade.ini etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini
etc/quantum/plugins/cisco = etc/quantum/plugins/cisco/cisco_plugins.ini etc/neutron/plugins/cisco = etc/neutron/plugins/cisco/cisco_plugins.ini
etc/quantum/plugins/hyperv = etc/quantum/plugins/hyperv/hyperv_quantum_plugin.ini etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini
etc/quantum/plugins/linuxbridge = etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini
etc/quantum/plugins/metaplugin = etc/quantum/plugins/metaplugin/metaplugin.ini etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini
etc/quantum/plugins/midonet = etc/quantum/plugins/midonet/midonet.ini etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini
etc/quantum/plugins/ml2 = etc/quantum/plugins/ml2/ml2_conf.ini etc/neutron/plugins/ml2 = etc/neutron/plugins/ml2/ml2_conf.ini
etc/quantum/plugins/mlnx = etc/quantum/plugins/mlnx/mlnx_conf.ini etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini
etc/quantum/plugins/nec = etc/quantum/plugins/nec/nec.ini etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini
etc/quantum/plugins/nicira = etc/quantum/plugins/nicira/nvp.ini etc/neutron/plugins/nicira = etc/neutron/plugins/nicira/nvp.ini
etc/quantum/plugins/openvswitch = etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini
etc/quantum/plugins/plumgrid = etc/quantum/plugins/plumgrid/plumgrid.ini etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini
etc/quantum/plugins/ryu = etc/quantum/plugins/ryu/ryu.ini etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini
scripts = scripts =
bin/quantum-rootwrap bin/quantum-rootwrap
bin/neutron-rootwrap
[global] [global]
setup-hooks = setup-hooks =
pbr.hooks.setup_hook pbr.hooks.setup_hook
quantum.hooks.setup_hook neutron.hooks.setup_hook
[entry_points] [entry_points]
console_scripts = console_scripts =
quantum-check-nvp-config = quantum.plugins.nicira.check_nvp_config:main neutron-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
quantum-db-manage = quantum.db.migration.cli:main neutron-db-manage = neutron.db.migration.cli:main
quantum-debug = quantum.debug.shell:main neutron-debug = neutron.debug.shell:main
quantum-dhcp-agent = quantum.agent.dhcp_agent:main neutron-dhcp-agent = neutron.agent.dhcp_agent:main
quantum-dhcp-agent-dnsmasq-lease-update = quantum.agent.linux.dhcp:Dnsmasq.lease_update neutron-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
quantum-hyperv-agent = quantum.plugins.hyperv.agent.hyperv_quantum_agent:main neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
quantum-l3-agent = quantum.agent.l3_agent:main neutron-l3-agent = neutron.agent.l3_agent:main
quantum-lbaas-agent = quantum.services.loadbalancer.drivers.haproxy.agent:main neutron-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
quantum-linuxbridge-agent = quantum.plugins.linuxbridge.agent.linuxbridge_quantum_agent:main neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
quantum-metadata-agent = quantum.agent.metadata.agent:main neutron-metadata-agent = neutron.agent.metadata.agent:main
quantum-mlnx-agent = quantum.plugins.mlnx.agent.eswitch_quantum_agent:main neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
quantum-nec-agent = quantum.plugins.nec.agent.nec_quantum_agent:main neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
quantum-netns-cleanup = quantum.agent.netns_cleanup_util:main neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main
quantum-ns-metadata-proxy = quantum.agent.metadata.namespace_proxy:main neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
quantum-openvswitch-agent = quantum.plugins.openvswitch.agent.ovs_quantum_agent:main neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
quantum-ovs-cleanup = quantum.agent.ovs_cleanup_util:main neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
quantum-ryu-agent = quantum.plugins.ryu.agent.ryu_quantum_agent:main neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
quantum-server = quantum.server:main neutron-server = neutron.server:main
quantum.ml2.type_drivers = quantum-check-nvp-config = neutron.plugins.nicira.check_nvp_config:main
flat = quantum.plugins.ml2.drivers.type_flat:FlatTypeDriver quantum-db-manage = neutron.db.migration.cli:main
local = quantum.plugins.ml2.drivers.type_local:LocalTypeDriver quantum-debug = neutron.debug.shell:main
vlan = quantum.plugins.ml2.drivers.type_vlan:VlanTypeDriver quantum-dhcp-agent = neutron.agent.dhcp_agent:main
quantum-dhcp-agent-dnsmasq-lease-update = neutron.agent.linux.dhcp:Dnsmasq.lease_update
quantum-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main
quantum-l3-agent = neutron.agent.l3_agent:main
quantum-lbaas-agent = neutron.services.loadbalancer.drivers.haproxy.agent:main
quantum-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main
quantum-metadata-agent = neutron.agent.metadata.agent:main
quantum-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main
quantum-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main
quantum-netns-cleanup = neutron.agent.netns_cleanup_util:main
quantum-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main
quantum-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main
quantum-ovs-cleanup = neutron.agent.ovs_cleanup_util:main
quantum-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main
quantum-server = neutron.server:main
neutron.ml2.type_drivers =
flat = neutron.plugins.ml2.drivers.type_flat:FlatTypeDriver
local = neutron.plugins.ml2.drivers.type_local:LocalTypeDriver
vlan = neutron.plugins.ml2.drivers.type_vlan:VlanTypeDriver
[build_sphinx] [build_sphinx]
all_files = 1 all_files = 1
@ -96,13 +116,13 @@ source-dir = doc/source
[extract_messages] [extract_messages]
keywords = _ gettext ngettext l_ lazy_gettext keywords = _ gettext ngettext l_ lazy_gettext
mapping_file = babel.cfg mapping_file = babel.cfg
output_file = quantum/locale/quantum.pot output_file = neutron/locale/neutron.pot
[compile_catalog] [compile_catalog]
directory = quantum/locale directory = neutron/locale
domain = quantum domain = neutron
[update_catalog] [update_catalog]
domain = quantum domain = neutron
output_dir = quantum/locale output_dir = neutron/locale
input_file = quantum/locale/quantum.pot input_file = neutron/locale/neutron.pot

2
tools/clean.sh
View File

@ -2,4 +2,4 @@
rm -rf ./*.deb ./*.tar.gz ./*.dsc ./*.changes rm -rf ./*.deb ./*.tar.gz ./*.dsc ./*.changes
rm -rf */*.deb rm -rf */*.deb
rm -rf ./plugins/**/build/ ./plugins/**/dist rm -rf ./plugins/**/build/ ./plugins/**/dist
rm -rf ./plugins/**/lib/quantum_*_plugin.egg-info ./plugins/quantum-* rm -rf ./plugins/**/lib/neutron_*_plugin.egg-info ./plugins/neutron-*

4
tools/i18n_cfg.py
View File

@ -92,6 +92,6 @@ msg_format_checkers = [
] ]
file_black_list = ["./quantum/tests/unit", file_black_list = ["./neutron/tests/unit",
"./quantum/openstack", "./neutron/openstack",
"./quantum/plugins/bigswitch/tests"] "./quantum/plugins/bigswitch/tests"]

10
tools/install_venv.py
View File

@ -21,7 +21,7 @@
# under the License. # under the License.
""" """
Installation script for Quantum's development virtualenv Installation script for Neutron's development virtualenv
""" """
import os import os
@ -33,12 +33,12 @@ import install_venv_common as install_venv
def print_help(): def print_help():
help = """ help = """
Quantum development environment setup is complete. Neutron development environment setup is complete.
Quantum development uses virtualenv to track and manage Python dependencies Neutron development uses virtualenv to track and manage Python dependencies
while in development and testing. while in development and testing.
To activate the Quantum virtualenv for the extent of your current shell To activate the Neutron virtualenv for the extent of your current shell
session you can run: session you can run:
$ source .venv/bin/activate $ source .venv/bin/activate
@ -59,7 +59,7 @@ def main(argv):
pip_requires = os.path.join(root, 'requirements.txt') pip_requires = os.path.join(root, 'requirements.txt')
test_requires = os.path.join(root, 'test-requirements.txt') test_requires = os.path.join(root, 'test-requirements.txt')
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'Quantum' project = 'Neutron'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
py_version, project) py_version, project)
options = install.parse_args(argv) options = install.parse_args(argv)

2
tools/patch_tox_venv.py
View File

@ -40,7 +40,7 @@ def main(argv):
os.path.join(root, 'tools', 'test-requires'), os.path.join(root, 'tools', 'test-requires'),
]) ])
py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1])
project = 'quantum' project = 'neutron'
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
py_version, project) py_version, project)
#NOTE(dprince): For Tox we only run post_process (which patches files, etc) #NOTE(dprince): For Tox we only run post_process (which patches files, etc)

2
tox.ini
View File

@ -19,7 +19,7 @@ commands =
flake8 flake8
[testenv:i18n] [testenv:i18n]
commands = python ./tools/check_i18n.py ./quantum ./tools/i18n_cfg.py commands = python ./tools/check_i18n.py ./neutron ./tools/i18n_cfg.py
[testenv:cover] [testenv:cover]
commands = commands =