From bddc116913619afb40c23b8430a9d13ca8b184bc Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 26 Jun 2014 17:50:34 +0900 Subject: [PATCH] update configuration files for tacker TODO: import python-tackerclient once pypi repository Change-Id: Iedfa49682a03f898cacab5d3a936383cb2740ae0 --- .gitignore | 9 +- .testr.conf | 2 +- MANIFEST.in | 10 +- bin/neutron-rootwrap | 21 ---- bin/neutron-rootwrap-xen-dom0 | 141 -------------------------- openstack-common.conf | 2 +- requirements.txt | 2 +- run_tests.sh | 10 +- setup.cfg | 185 ++++++---------------------------- tools/clean.sh | 2 +- tools/i18n_cfg.py | 6 +- tools/install_venv.py | 10 +- tox.ini | 16 +-- 13 files changed, 65 insertions(+), 351 deletions(-) delete mode 100755 bin/neutron-rootwrap delete mode 100755 bin/neutron-rootwrap-xen-dom0 diff --git a/.gitignore b/.gitignore index 19526c2b1..2d37419b8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,13 +9,10 @@ dist/ doc/build *.DS_Store *.pyc -neutron.egg-info/ -neutron/vcsversion.py -neutron/versioninfo +tacker.egg-info/ +tacker/vcsversion.py +tacker/versioninfo pbr*.egg/ -quantum.egg-info/ -quantum/vcsversion.py -quantum/versioninfo run_tests.err.log run_tests.log setuptools*.egg/ diff --git a/.testr.conf b/.testr.conf index c180b0319..46000f87a 100644 --- a/.testr.conf +++ b/.testr.conf @@ -1,4 +1,4 @@ [DEFAULT] -test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./neutron/tests/unit} $LISTOPT $IDOPTION +test_command=OS_STDOUT_CAPTURE=1 OS_STDERR_CAPTURE=1 OS_LOG_CAPTURE=1 ${PYTHON:-python} -m subunit.run discover -t ./ ${OS_TEST_PATH:-./tacker/tests/unit} $LISTOPT $IDOPTION test_id_option=--load-list $IDFILE test_list_option=--list diff --git a/MANIFEST.in b/MANIFEST.in index 4e527c7fa..66b1b603c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -2,11 +2,11 @@ include AUTHORS include README.rst include ChangeLog include LICENSE -include neutron/db/migration/README -include neutron/db/migration/alembic.ini -include neutron/db/migration/alembic_migrations/script.py.mako -include neutron/db/migration/alembic_migrations/versions/README -recursive-include neutron/locale * +include tacker/db/migration/README +include tacker/db/migration/alembic.ini +include tacker/db/migration/alembic_migrations/script.py.mako +include tacker/db/migration/alembic_migrations/versions/README +recursive-include tacker/locale * exclude .gitignore exclude .gitreview diff --git a/bin/neutron-rootwrap b/bin/neutron-rootwrap deleted file mode 100755 index 284037846..000000000 --- a/bin/neutron-rootwrap +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -# vim: tabstop=4 shiftwidth=4 softtabstop=4 - -# Copyright (c) 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. - -from oslo.rootwrap import cmd - -cmd.main() diff --git a/bin/neutron-rootwrap-xen-dom0 b/bin/neutron-rootwrap-xen-dom0 deleted file mode 100755 index 3f4251a4e..000000000 --- a/bin/neutron-rootwrap-xen-dom0 +++ /dev/null @@ -1,141 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -"""Neutron root wrapper for dom0. - -Executes networking commands in dom0. The XenAPI plugin is -responsible determining whether a command is safe to execute. - -""" -from __future__ import print_function - -import ConfigParser -import json -import os -import select -import sys -import traceback - -import XenAPI - - -RC_UNAUTHORIZED = 99 -RC_NOCOMMAND = 98 -RC_BADCONFIG = 97 -RC_XENAPI_ERROR = 96 - - -def parse_args(): - # Split arguments, require at least a command - exec_name = sys.argv.pop(0) - # argv[0] required; path to conf file - if len(sys.argv) < 2: - print("%s: No command specified" % exec_name) - sys.exit(RC_NOCOMMAND) - - config_file = sys.argv.pop(0) - user_args = sys.argv[:] - - return exec_name, config_file, user_args - - -def _xenapi_section_name(config): - sections = [sect for sect in config.sections() if sect.lower() == "xenapi"] - if len(sections) == 1: - return sections[0] - - print("Multiple [xenapi] sections or no [xenapi] section found!") - sys.exit(RC_BADCONFIG) - - -def load_configuration(exec_name, config_file): - config = ConfigParser.RawConfigParser() - config.read(config_file) - try: - exec_dirs = config.get("DEFAULT", "exec_dirs").split(",") - filters_path = config.get("DEFAULT", "filters_path").split(",") - section = _xenapi_section_name(config) - url = config.get(section, "xenapi_connection_url") - username = config.get(section, "xenapi_connection_username") - password = config.get(section, "xenapi_connection_password") - except ConfigParser.Error: - print("%s: Incorrect configuration file: %s" % (exec_name, config_file)) - sys.exit(RC_BADCONFIG) - if not url or not password: - msg = ("%s: Must specify xenapi_connection_url, " - "xenapi_connection_username (optionally), and " - "xenapi_connection_password in %s") % (exec_name, config_file) - print(msg) - sys.exit(RC_BADCONFIG) - return dict( - filters_path=filters_path, - url=url, - username=username, - password=password, - exec_dirs=exec_dirs, - ) - - -def filter_command(exec_name, filters_path, user_args, exec_dirs): - # Add ../ to sys.path to allow running from branch - possible_topdir = os.path.normpath(os.path.join(os.path.abspath(exec_name), - os.pardir, os.pardir)) - if os.path.exists(os.path.join(possible_topdir, "neutron", "__init__.py")): - sys.path.insert(0, possible_topdir) - - from oslo.rootwrap import wrapper - - # Execute command if it matches any of the loaded filters - filters = wrapper.load_filters(filters_path) - filter_match = wrapper.match_filter( - filters, user_args, exec_dirs=exec_dirs) - if not filter_match: - print("Unauthorized command: %s" % ' '.join(user_args)) - sys.exit(RC_UNAUTHORIZED) - - -def run_command(url, username, password, user_args, cmd_input): - try: - session = XenAPI.Session(url) - session.login_with_password(username, password) - host = session.xenapi.session.get_this_host(session.handle) - result = session.xenapi.host.call_plugin( - host, 'netwrap', 'run_command', - {'cmd': json.dumps(user_args), 'cmd_input': json.dumps(cmd_input)}) - return json.loads(result) - except Exception as e: - traceback.print_exc() - sys.exit(RC_XENAPI_ERROR) - - -def main(): - exec_name, config_file, user_args = parse_args() - config = load_configuration(exec_name, config_file) - filter_command(exec_name, config['filters_path'], user_args, config['exec_dirs']) - - # If data is available on the standard input, we need to pass it to the - # command executed in dom0 - cmd_input = None - if select.select([sys.stdin,],[],[],0.0)[0]: - cmd_input = "".join(sys.stdin) - - return run_command(config['url'], config['username'], config['password'], - user_args, cmd_input) - - -if __name__ == '__main__': - print(main()) diff --git a/openstack-common.conf b/openstack-common.conf index f6f6fdaf5..4434dd57b 100644 --- a/openstack-common.conf +++ b/openstack-common.conf @@ -32,4 +32,4 @@ module=uuidutils module=versionutils # The base module to hold the copy of openstack.common -base=neutron +base=tacker diff --git a/requirements.txt b/requirements.txt index f34177ab2..4e473fbd7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,7 +15,7 @@ jsonrpclib Jinja2 kombu>=2.4.8 netaddr>=0.7.6 -python-neutronclient>=2.3.4,<3 +#python-tackerclient>=2.3.4,<3 SQLAlchemy>=0.7.8,<=0.9.99 WebOb>=1.2.3 python-keystoneclient>=0.9.0 diff --git a/run_tests.sh b/run_tests.sh index 8f0dbd3d7..c4a754be7 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -4,7 +4,7 @@ set -eu function usage { echo "Usage: $0 [OPTION]..." - echo "Run Neutron's test suite(s)" + echo "Run Tacker's test suite(s)" echo "" echo " -V, --virtual-env Always use virtualenv. Install automatically if not present" echo " -N, --no-virtual-env Don't use virtualenv. Run tests in local environment" @@ -110,7 +110,7 @@ function run_tests { if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then # Default to running all tests if specific test is not # provided. - testrargs="discover ./neutron/tests" + testrargs="discover ./tacker/tests" fi ${wrapper} python -m testtools.run $testropts $testrargs @@ -130,7 +130,7 @@ function run_tests { set +e testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'` TESTRTESTS="$TESTRTESTS --testr-args='--subunit $testropts $testrargs'" - OS_TEST_PATH=`echo $testrargs|grep -o 'neutron\.tests[^[:space:]:]*\+'|tr . /` + OS_TEST_PATH=`echo $testrargs|grep -o 'tacker\.tests[^[:space:]:]*\+'|tr . /` if [ -d "$OS_TEST_PATH" ]; then wrapper="OS_TEST_PATH=$OS_TEST_PATH $wrapper" elif [ -d "$(dirname $OS_TEST_PATH)" ]; then @@ -147,7 +147,7 @@ function run_tests { echo "Generating coverage report in covhtml/" # Don't compute coverage for common code, which is tested elsewhere ${wrapper} coverage combine - ${wrapper} coverage html --include='neutron/*' --omit='neutron/openstack/common/*' -d covhtml -i + ${wrapper} coverage html --include='tacker/*' --omit='tacker/openstack/common/*' -d covhtml -i fi return $RESULT @@ -167,7 +167,7 @@ function run_pep8 { } -TESTRTESTS="python -m neutron.openstack.common.lockutils python setup.py testr" +TESTRTESTS="python -m tacker.openstack.common.lockutils python setup.py testr" if [ $never_venv -eq 0 ] then diff --git a/setup.cfg b/setup.cfg index 0eaaaed0f..9eb4a228a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] -name = neutron +name = tacker version = 2014.2 -summary = OpenStack Networking +summary = OpenStack servicevm/device manager description-file = README.rst author = OpenStack @@ -20,162 +20,41 @@ classifier = [files] packages = - neutron + tacker data_files = - etc/neutron = + etc/tacker = etc/api-paste.ini - etc/dhcp_agent.ini - etc/fwaas_driver.ini - etc/l3_agent.ini - etc/lbaas_agent.ini - etc/metadata_agent.ini - etc/metering_agent.ini etc/policy.json - etc/neutron.conf + etc/tacker.conf etc/rootwrap.conf - etc/vpn_agent.ini - etc/neutron/rootwrap.d = - etc/neutron/rootwrap.d/debug.filters - etc/neutron/rootwrap.d/dhcp.filters - etc/neutron/rootwrap.d/iptables-firewall.filters - etc/neutron/rootwrap.d/l3.filters - etc/neutron/rootwrap.d/lbaas-haproxy.filters - etc/neutron/rootwrap.d/linuxbridge-plugin.filters - etc/neutron/rootwrap.d/nec-plugin.filters - etc/neutron/rootwrap.d/openvswitch-plugin.filters - etc/neutron/rootwrap.d/ryu-plugin.filters - etc/neutron/rootwrap.d/vpnaas.filters - etc/init.d = etc/init.d/neutron-server - etc/neutron/plugins/bigswitch = - etc/neutron/plugins/bigswitch/restproxy.ini - etc/neutron/plugins/bigswitch/ssl/ca_certs/README - etc/neutron/plugins/bigswitch/ssl/host_certs/README - etc/neutron/plugins/brocade = etc/neutron/plugins/brocade/brocade.ini - etc/neutron/plugins/cisco = - etc/neutron/plugins/cisco/cisco_plugins.ini - etc/neutron/plugins/cisco/cisco_vpn_agent.ini - etc/neutron/plugins/embrane = etc/neutron/plugins/embrane/heleos_conf.ini - etc/neutron/plugins/hyperv = etc/neutron/plugins/hyperv/hyperv_neutron_plugin.ini - etc/neutron/plugins/ibm = etc/neutron/plugins/ibm/sdnve_neutron_plugin.ini - etc/neutron/plugins/linuxbridge = etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini - etc/neutron/plugins/metaplugin = etc/neutron/plugins/metaplugin/metaplugin.ini - etc/neutron/plugins/midonet = etc/neutron/plugins/midonet/midonet.ini - etc/neutron/plugins/ml2 = - etc/neutron/plugins/bigswitch/restproxy.ini - etc/neutron/plugins/ml2/ml2_conf.ini - etc/neutron/plugins/ml2/ml2_conf_arista.ini - etc/neutron/plugins/ml2/ml2_conf_brocade.ini - etc/neutron/plugins/ml2/ml2_conf_cisco.ini - etc/neutron/plugins/ml2/ml2_conf_mlnx.ini - etc/neutron/plugins/ml2/ml2_conf_ncs.ini - etc/neutron/plugins/ml2/ml2_conf_odl.ini - etc/neutron/plugins/ml2/ml2_conf_ofa.ini - etc/neutron/plugins/ml2/ml2_conf_fslsdn.ini - etc/neutron/plugins/mlnx = etc/neutron/plugins/mlnx/mlnx_conf.ini - etc/neutron/plugins/nec = etc/neutron/plugins/nec/nec.ini - etc/neutron/plugins/nuage = etc/neutron/plugins/nuage/nuage_plugin.ini - etc/neutron/plugins/oneconvergence = etc/neutron/plugins/oneconvergence/nvsdplugin.ini - etc/neutron/plugins/openvswitch = etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini - etc/neutron/plugins/plumgrid = etc/neutron/plugins/plumgrid/plumgrid.ini - etc/neutron/plugins/ryu = etc/neutron/plugins/ryu/ryu.ini - etc/neutron/plugins/vmware = etc/neutron/plugins/vmware/nsx.ini -scripts = - bin/neutron-rootwrap - bin/neutron-rootwrap-xen-dom0 + etc/rootwrap.d = + etc/tacker/rootwrap.d/servicevm.filters + etc/init.d = etc/init.d/tacker-server [global] setup-hooks = pbr.hooks.setup_hook - neutron.hooks.setup_hook + tacker.hooks.setup_hook [entry_points] console_scripts = - neutron-check-nsx-config = neutron.plugins.vmware.check_nsx_config:main - neutron-db-manage = neutron.db.migration.cli:main - neutron-debug = neutron.debug.shell:main - neutron-dhcp-agent = neutron.agent.dhcp_agent:main - neutron-hyperv-agent = neutron.plugins.hyperv.agent.hyperv_neutron_agent:main - neutron-ibm-agent = neutron.plugins.ibm.agent.sdnve_neutron_agent:main - neutron-l3-agent = neutron.agent.l3_agent:main - neutron-lbaas-agent = neutron.services.loadbalancer.agent.agent:main - neutron-linuxbridge-agent = neutron.plugins.linuxbridge.agent.linuxbridge_neutron_agent:main - neutron-metadata-agent = neutron.agent.metadata.agent:main - neutron-mlnx-agent = neutron.plugins.mlnx.agent.eswitch_neutron_agent:main - neutron-nec-agent = neutron.plugins.nec.agent.nec_neutron_agent:main - neutron-netns-cleanup = neutron.agent.netns_cleanup_util:main - neutron-ns-metadata-proxy = neutron.agent.metadata.namespace_proxy:main - neutron-nsx-manage = neutron.plugins.vmware.shell:main - neutron-nvsd-agent = neutron.plugins.oneconvergence.agent.nvsd_neutron_agent:main - neutron-openvswitch-agent = neutron.plugins.openvswitch.agent.ovs_neutron_agent:main - neutron-ovs-cleanup = neutron.agent.ovs_cleanup_util:main - neutron-restproxy-agent = neutron.plugins.bigswitch.agent.restproxy_agent:main - neutron-ryu-agent = neutron.plugins.ryu.agent.ryu_neutron_agent:main - neutron-server = neutron.server:main - neutron-rootwrap = oslo.rootwrap.cmd:main - neutron-usage-audit = neutron.cmd.usage_audit:main - neutron-vpn-agent = neutron.services.vpn.agent:main - neutron-metering-agent = neutron.services.metering.agents.metering_agent:main - neutron-ofagent-agent = ryu.cmd.ofa_neutron_agent:main - neutron-sanity-check = neutron.cmd.sanity_check:main -neutron.core_plugins = - bigswitch = neutron.plugins.bigswitch.plugin:NeutronRestProxyV2 - brocade = neutron.plugins.brocade.NeutronPlugin:BrocadePluginV2 - cisco = neutron.plugins.cisco.network_plugin:PluginV2 - embrane = neutron.plugins.embrane.plugins.embrane_ovs_plugin:EmbraneOvsPlugin - hyperv = neutron.plugins.hyperv.hyperv_neutron_plugin:HyperVNeutronPlugin - ibm = neutron.plugins.ibm.sdnve_neutron_plugin:SdnvePluginV2 - linuxbridge = neutron.plugins.linuxbridge.lb_neutron_plugin:LinuxBridgePluginV2 - midonet = neutron.plugins.midonet.plugin:MidonetPluginV2 - ml2 = neutron.plugins.ml2.plugin:Ml2Plugin - mlnx = neutron.plugins.mlnx.mlnx_plugin:MellanoxEswitchPlugin - nec = neutron.plugins.nec.nec_plugin:NECPluginV2 - nuage = neutron.plugins.nuage.plugin:NuagePlugin - metaplugin = neutron.plugins.metaplugin.meta_neutron_plugin:MetaPluginV2 - oneconvergence = neutron.plugins.oneconvergence.plugin.OneConvergencePluginV2 - openvswitch = neutron.plugins.openvswitch.ovs_neutron_plugin:OVSNeutronPluginV2 - plumgrid = neutron.plugins.plumgrid.plumgrid_plugin.plumgrid_plugin:NeutronPluginPLUMgridV2 - ryu = neutron.plugins.ryu.ryu_neutron_plugin:RyuNeutronPluginV2 - vmware = neutron.plugins.vmware.plugin:NsxPlugin -neutron.service_plugins = - dummy = neutron.tests.unit.dummy_plugin:DummyServicePlugin - router = neutron.services.l3_router.l3_router_plugin:L3RouterPlugin - firewall = neutron.services.firewall.fwaas_plugin:FirewallPlugin - lbaas = neutron.services.loadbalancer.plugin:LoadBalancerPlugin - vpnaas = neutron.services.vpn.plugin:VPNDriverPlugin - metering = neutron.services.metering.metering_plugin:MeteringPlugin -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 - gre = neutron.plugins.ml2.drivers.type_gre:GreTypeDriver - vxlan = neutron.plugins.ml2.drivers.type_vxlan:VxlanTypeDriver -neutron.ml2.mechanism_drivers = - opendaylight = neutron.plugins.ml2.drivers.mechanism_odl:OpenDaylightMechanismDriver - logger = neutron.tests.unit.ml2.drivers.mechanism_logger:LoggerMechanismDriver - test = neutron.tests.unit.ml2.drivers.mechanism_test:TestMechanismDriver - bulkless = neutron.tests.unit.ml2.drivers.mechanism_bulkless:BulklessMechanismDriver - linuxbridge = neutron.plugins.ml2.drivers.mech_linuxbridge:LinuxbridgeMechanismDriver - openvswitch = neutron.plugins.ml2.drivers.mech_openvswitch:OpenvswitchMechanismDriver - hyperv = neutron.plugins.ml2.drivers.mech_hyperv:HypervMechanismDriver - ncs = neutron.plugins.ml2.drivers.mechanism_ncs:NCSMechanismDriver - arista = neutron.plugins.ml2.drivers.mech_arista.mechanism_arista:AristaDriver - cisco_nexus = neutron.plugins.ml2.drivers.cisco.nexus.mech_cisco_nexus:CiscoNexusMechanismDriver - cisco_apic = neutron.plugins.ml2.drivers.cisco.apic.mechanism_apic:APICMechanismDriver - l2population = neutron.plugins.ml2.drivers.l2pop.mech_driver:L2populationMechanismDriver - bigswitch = neutron.plugins.ml2.drivers.mech_bigswitch.driver:BigSwitchMechanismDriver - ofagent = neutron.plugins.ml2.drivers.mech_ofagent:OfagentMechanismDriver - mlnx = neutron.plugins.ml2.drivers.mlnx.mech_mlnx:MlnxMechanismDriver - brocade = neutron.plugins.ml2.drivers.brocade.mechanism_brocade:BrocadeMechanism - fslsdn = neutron.plugins.ml2.drivers.mechanism_fslsdn:FslsdnMechanismDriver -neutron.openstack.common.cache.backends = - memory = neutron.openstack.common.cache._backends.memory:MemoryBackend -# These are for backwards compat with Icehouse notification_driver configuration values -oslo.messaging.notify.drivers = - neutron.openstack.common.notifier.log_notifier = oslo.messaging.notify._impl_log:LogDriver - neutron.openstack.common.notifier.no_op_notifier = oslo.messaging.notify._impl_noop:NoOpDriver - neutron.openstack.common.notifier.rpc_notifier2 = oslo.messaging.notify._impl_messaging:MessagingV2Driver - neutron.openstack.common.notifier.rpc_notifier = oslo.messaging.notify._impl_messaging:MessagingDriver - neutron.openstack.common.notifier.test_notifier = oslo.messaging.notify._impl_test:TestDriver + tacker-db-manage = tacker.db.migration.cli:main + tacker-server = tacker.cmd.server:main + tacker-rootwrap = oslo.rootwrap.cmd:main + tacker-servicevm-rpc-proxy-agent = tacker.vm.agent.agent:main + tacker-servicevm-ns-rpc-proxy = tacker.vm.agent.namespace_proxy:main +tacker.service_plugins = + dummy = tacker.tests.unit.dummy_plugin:DummyServicePlugin + servicevm = tacker.vm.plugin.ServiceVMPlugin +tacker.openstack.common.cache.backends = + memory = tacker.openstack.common.cache._backends.memory:MemoryBackend +tacker.servicevm.device.drivers = + noop = tacker.tests.unit.services.vm.drivers.noop:DeviceNoop + nova = tacker.vm.drivers.nova.nova:DeviceNova +tacker.servicevm.mgmt.drivers = + noop = tacker.tests.unit.services.vm.mgmt_drivers.noop:DeviceMgmtNoop + agent_rpc = tacker.vm.mgmt_drivers.rpc.rpc:AgentRpcMGMTDriver + agent_proxy = tacker.vm.mgmt_drivers.rpc.proxy:AgentRpcProxyMGMTDriver [build_sphinx] @@ -186,16 +65,16 @@ source-dir = doc/source [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = neutron/locale/neutron.pot +output_file = tacker/locale/tacker.pot [compile_catalog] -directory = neutron/locale -domain = neutron +directory = tacker/locale +domain = tacker [update_catalog] -domain = neutron -output_dir = neutron/locale -input_file = neutron/locale/neutron.pot +domain = tacker +output_dir = tacker/locale +input_file = tacker/locale/tacker.pot [wheel] universal = 1 diff --git a/tools/clean.sh b/tools/clean.sh index 27bc219f9..fe9b4c134 100755 --- a/tools/clean.sh +++ b/tools/clean.sh @@ -2,4 +2,4 @@ rm -rf ./*.deb ./*.tar.gz ./*.dsc ./*.changes rm -rf */*.deb rm -rf ./plugins/**/build/ ./plugins/**/dist -rm -rf ./plugins/**/lib/neutron_*_plugin.egg-info ./plugins/neutron-* +rm -rf ./plugins/**/lib/tacker_*_plugin.egg-info ./plugins/tacker-* diff --git a/tools/i18n_cfg.py b/tools/i18n_cfg.py index 5ad1a514d..7ea18e8d2 100644 --- a/tools/i18n_cfg.py +++ b/tools/i18n_cfg.py @@ -92,6 +92,6 @@ msg_format_checkers = [ ] -file_black_list = ["./neutron/tests/unit", - "./neutron/openstack", - "./neutron/plugins/bigswitch/tests"] +file_black_list = ["./tacker/tests/unit", + "./tacker/openstack", + "./tacker/plugins/bigswitch/tests"] diff --git a/tools/install_venv.py b/tools/install_venv.py index df06fa9c6..cb25de7db 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -21,7 +21,7 @@ # under the License. """ -Installation script for Neutron's development virtualenv +Installation script for Tacker's development virtualenv """ from __future__ import print_function @@ -33,12 +33,12 @@ import install_venv_common as install_venv def print_help(): help = """ - Neutron development environment setup is complete. + Tacker development environment setup is complete. - Neutron development uses virtualenv to track and manage Python dependencies + Tacker development uses virtualenv to track and manage Python dependencies while in development and testing. - To activate the Neutron virtualenv for the extent of your current shell + To activate the Tacker virtualenv for the extent of your current shell session you can run: $ source .venv/bin/activate @@ -59,7 +59,7 @@ def main(argv): pip_requires = os.path.join(root, 'requirements.txt') test_requires = os.path.join(root, 'test-requirements.txt') py_version = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) - project = 'Neutron' + project = 'Tacker' install = install_venv.InstallVenv(root, venv, pip_requires, test_requires, py_version, project) options = install.parse_args(argv) diff --git a/tox.ini b/tox.ini index 3081507ca..0e7a0f2b5 100644 --- a/tox.ini +++ b/tox.ini @@ -21,12 +21,12 @@ usedevelop = True install_command = pip install -U {opts} {packages} deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt - setuptools_git>=0.4 + setuptools-git>=0.4 commands = - python -m neutron.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}' + python -m tacker.openstack.common.lockutils python setup.py testr --slowest --testr-args='{posargs}' [testenv:functional] -setenv = OS_TEST_PATH=./neutron/tests/functional +setenv = OS_TEST_PATH=./tacker/tests/functional commands = python setup.py testr --slowest --testr-args='{posargs}' @@ -37,16 +37,16 @@ downloadcache = ~/cache/pip [testenv:pep8] commands = flake8 - neutron-db-manage check_migration - bash -c "find neutron -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null" + tacker-db-manage check_migration + bash -c "find tacker -type f -regex '.*\.pot?' -print0|xargs -0 -n 1 msgfmt --check-format -o /dev/null" whitelist_externals = bash [testenv:i18n] -commands = python ./tools/check_i18n.py ./neutron ./tools/i18n_cfg.py +commands = python ./tools/check_i18n.py ./tacker ./tools/i18n_cfg.py [testenv:cover] commands = - python -m neutron.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}' + python -m tacker.openstack.common.lockutils python setup.py testr --coverage --testr-args='{posargs}' [testenv:venv] commands = {posargs} @@ -79,4 +79,4 @@ builtins = _ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,.ropeproject [hacking] -local-check-factory = neutron.hacking.checks.factory +local-check-factory = tacker.hacking.checks.factory