Change various nova references to gantt in config files
This file was copied from the nova tree, remove some nova specific info. Need to keep the gettextutils reference. Update the setup.cfg file also. Change-Id: I0cb66e6620900fd318f45d758a94f95b144e006a Signed-off-by: Don Dugger <donald.d.dugger@intel.com>
This commit is contained in:
Don Dugger
parent
27f875c0c2
commit
71411726d6
|
|
@ -2,7 +2,7 @@
|
|||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ ./nova/tests $LISTOPT $IDOPTION
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ ./gantt/tests $LISTOPT $IDOPTION
|
||||
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
#
|
||||
# nova documentation build configuration file, created by
|
||||
# gantt documentation build configuration file, created by
|
||||
# sphinx-quickstart on Sat May 1 15:17:47 2010.
|
||||
#
|
||||
# This file is execfile()d with the current directory set to
|
||||
# its containing dir.
|
||||
# This file is execfile()d with the current directory set
|
||||
# to its containing dir.
|
||||
#
|
||||
# Note that not all possible configuration values are present in this
|
||||
# autogenerated file.
|
||||
|
|
@ -24,12 +24,13 @@ sys.path.insert(0, os.path.abspath('./'))
|
|||
|
||||
# -- General configuration ----------------------------------------------------
|
||||
|
||||
# Add any Sphinx extension module names here, as strings. They can be
|
||||
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
|
||||
# Add any Sphinx extension module names here, as strings.
|
||||
# They can be extensions coming with Sphinx (named 'sphinx.ext.*')
|
||||
# or your custom ones.
|
||||
|
||||
extensions = ['sphinx.ext.autodoc',
|
||||
'sphinx.ext.intersphinx',
|
||||
'ext.nova_todo',
|
||||
'ext.gantt_todo',
|
||||
'sphinx.ext.coverage',
|
||||
'sphinx.ext.pngmath',
|
||||
'sphinx.ext.ifconfig',
|
||||
|
|
@ -59,7 +60,7 @@ source_suffix = '.rst'
|
|||
master_doc = 'index'
|
||||
|
||||
# General information about the project.
|
||||
project = u'nova'
|
||||
project = u'gantt'
|
||||
copyright = u'2010-present, OpenStack Foundation'
|
||||
|
||||
# The version info for the project you're documenting, acts as replacement for
|
||||
|
|
@ -85,7 +86,6 @@ version = version_info.version_string()
|
|||
# List of documents that shouldn't be included in the build.
|
||||
unused_docs = [
|
||||
'api_ext/rst_extension_template',
|
||||
'vmwareapi_readme',
|
||||
'installer',
|
||||
]
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ show_authors = False
|
|||
pygments_style = 'sphinx'
|
||||
|
||||
# A list of ignored prefixes for module index sorting.
|
||||
modindex_common_prefix = ['nova.']
|
||||
modindex_common_prefix = ['gantt.']
|
||||
|
||||
# -- Options for man page output ----------------------------------------------
|
||||
|
||||
|
|
@ -120,46 +120,8 @@ modindex_common_prefix = ['nova.']
|
|||
# List of tuples 'sourcefile', 'target', u'title', u'Authors name', 'manual'
|
||||
|
||||
man_pages = [
|
||||
('man/nova-all', 'nova-all', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-api-ec2', 'nova-api-ec2', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-api-metadata', 'nova-api-metadata', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-api-os-compute', 'nova-api-os-compute',
|
||||
u'Cloud controller fabric', [u'OpenStack'], 1),
|
||||
('man/nova-api', 'nova-api', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-cert', 'nova-cert', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-compute', 'nova-compute', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-console', 'nova-console', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-consoleauth', 'nova-consoleauth', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-dhcpbridge', 'nova-dhcpbridge', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-manage', 'nova-manage', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-network', 'nova-network', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-novncproxy', 'nova-novncproxy', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-spicehtml5proxy', 'nova-spicehtml5proxy', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-objectstore', 'nova-objectstore', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-rootwrap', 'nova-rootwrap', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-rpc-zmq-receiver', 'nova-rpc-zmq-receiver', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-scheduler', 'nova-scheduler', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-xvpvncproxy', 'nova-xvpvncproxy', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/nova-conductor', 'nova-conductor', u'Cloud controller fabric',
|
||||
[u'OpenStack'], 1),
|
||||
('man/gantt-scheduler', 'gantt-scheduler', u'OpenStack scheduler',
|
||||
[u'OpenStack'], 1)
|
||||
]
|
||||
|
||||
# -- Options for HTML output --------------------------------------------------
|
||||
|
|
@ -236,7 +198,7 @@ html_last_updated_fmt = os.popen(git_cmd).read()
|
|||
#html_file_suffix = ''
|
||||
|
||||
# Output file base name for HTML help builder.
|
||||
htmlhelp_basename = 'novadoc'
|
||||
htmlhelp_basename = 'ganttdoc'
|
||||
|
||||
|
||||
# -- Options for LaTeX output -------------------------------------------------
|
||||
|
|
@ -251,7 +213,7 @@ htmlhelp_basename = 'novadoc'
|
|||
# (source start file, target name, title, author, documentclass
|
||||
# [howto/manual]).
|
||||
latex_documents = [
|
||||
('index', 'Nova.tex', u'Nova Documentation',
|
||||
('index', 'Gantt.tex', u'Gantt Documentation',
|
||||
u'OpenStack Foundation', 'manual'),
|
||||
]
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
==============
|
||||
gantt-scheduler
|
||||
==============
|
||||
|
||||
--------------
|
||||
OpenStack Scheduler
|
||||
--------------
|
||||
|
||||
:Author: openstack@lists.openstack.org
|
||||
:Date: 2012-09-27
|
||||
:Copyright: OpenStack Foundation
|
||||
:Version: 2012.1
|
||||
:Manual section: 1
|
||||
:Manual group: cloud computing
|
||||
|
||||
SYNOPSIS
|
||||
========
|
||||
|
||||
gantt-scheduler [options]
|
||||
|
||||
DESCRIPTION
|
||||
===========
|
||||
|
||||
Common scheduler for OpenStack projects
|
||||
|
||||
OPTIONS
|
||||
=======
|
||||
|
||||
**General options**
|
||||
|
||||
FILES
|
||||
========
|
||||
|
||||
* /etc/nova/nova.conf
|
||||
* /etc/nova/policy.json
|
||||
* /etc/nova/rootwrap.conf
|
||||
* /etc/nova/rootwrap.d/
|
||||
|
||||
SEE ALSO
|
||||
========
|
||||
|
||||
* `OpenStack Nova <http://nova.openstack.org>`__
|
||||
* `OpenStack Nova <http://nova.openstack.org>`__
|
||||
|
||||
BUGS
|
||||
====
|
||||
|
||||
* Nova is sourced in Launchpad so you can view current bugs at `OpenStack Nova <http://nova.openstack.org>`__
|
||||
|
|
@ -17,29 +17,20 @@
|
|||
# under the License.
|
||||
|
||||
"""
|
||||
:mod:`nova.tests` -- Nova Unittests
|
||||
:mod:`gantt.tests` -- Gantt Unittests
|
||||
=====================================================
|
||||
|
||||
.. automodule:: nova.tests
|
||||
.. automodule:: gantt.tests
|
||||
:platform: Unix
|
||||
.. moduleauthor:: Jesse Andrews <jesse@ansolabs.com>
|
||||
.. moduleauthor:: Devin Carlen <devin.carlen@gmail.com>
|
||||
.. moduleauthor:: Vishvananda Ishaya <vishvananda@gmail.com>
|
||||
.. moduleauthor:: Joshua McKenty <joshua@cognition.ca>
|
||||
.. moduleauthor:: Manish Singh <yosh@gimp.org>
|
||||
.. moduleauthor:: Andy Smith <andy@anarkystic.com>
|
||||
.. moduleauthor:: Don Dugger <donald.d.dugger@intel.com>
|
||||
"""
|
||||
|
||||
# TODO(mikal): move eventlet imports to nova.__init__ once we move to PBR
|
||||
import os
|
||||
import sys
|
||||
|
||||
# NOTE(mikal): All of this is because if dnspython is present in your
|
||||
# environment then eventlet monkeypatches socket.getaddrinfo() with an
|
||||
# implementation which doesn't work for IPv6. What we're checking here is
|
||||
# that the magic environment variable was set when the import happened.
|
||||
if ('eventlet' in sys.modules and
|
||||
os.environ.get('EVENTLET_NO_GREENDNS', '').lower() != 'yes'):
|
||||
raise ImportError('eventlet imported before nova/cmd/__init__ '
|
||||
'(env var set to %s)'
|
||||
% os.environ.get('EVENTLET_NO_GREENDNS'))
|
||||
|
||||
os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
|
||||
|
||||
import eventlet
|
||||
|
||||
eventlet.monkey_patch(os=False)
|
||||
eventlet.monkey_patch()
|
||||
|
|
|
|||
|
|
@ -1,5 +1,3 @@
|
|||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
# Copyright 2011 OpenStack Foundation
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
|
|
@ -16,78 +14,10 @@
|
|||
|
||||
import pbr.version
|
||||
|
||||
from gantt.openstack.common.gettextutils import _
|
||||
|
||||
NOVA_VENDOR = "OpenStack Foundation"
|
||||
NOVA_PRODUCT = "OpenStack Nova"
|
||||
NOVA_PACKAGE = None # OS distro package version suffix
|
||||
GANTT_VENDOR = "OpenStack Foundation"
|
||||
GANTT_PRODUCT = "OpenStack Gantt"
|
||||
GANTT_PACKAGE = None # OS distro package version suffix
|
||||
|
||||
loaded = False
|
||||
version_info = pbr.version.VersionInfo('nova')
|
||||
version_info = pbr.version.VersionInfo('gantt')
|
||||
version_string = version_info.version_string
|
||||
|
||||
|
||||
def _load_config():
|
||||
# Don't load in global context, since we can't assume
|
||||
# these modules are accessible when distutils uses
|
||||
# this module
|
||||
import ConfigParser
|
||||
|
||||
from oslo.config import cfg
|
||||
|
||||
from nova.openstack.common import log as logging
|
||||
|
||||
global loaded, NOVA_VENDOR, NOVA_PRODUCT, NOVA_PACKAGE
|
||||
if loaded:
|
||||
return
|
||||
|
||||
loaded = True
|
||||
|
||||
cfgfile = cfg.CONF.find_file("release")
|
||||
if cfgfile is None:
|
||||
return
|
||||
|
||||
try:
|
||||
cfg = ConfigParser.RawConfigParser()
|
||||
cfg.read(cfgfile)
|
||||
|
||||
NOVA_VENDOR = cfg.get("Nova", "vendor")
|
||||
if cfg.has_option("Nova", "vendor"):
|
||||
NOVA_VENDOR = cfg.get("Nova", "vendor")
|
||||
|
||||
NOVA_PRODUCT = cfg.get("Nova", "product")
|
||||
if cfg.has_option("Nova", "product"):
|
||||
NOVA_PRODUCT = cfg.get("Nova", "product")
|
||||
|
||||
NOVA_PACKAGE = cfg.get("Nova", "package")
|
||||
if cfg.has_option("Nova", "package"):
|
||||
NOVA_PACKAGE = cfg.get("Nova", "package")
|
||||
except Exception as ex:
|
||||
LOG = logging.getLogger(__name__)
|
||||
LOG.error(_("Failed to load %(cfgfile)s: %(ex)s"),
|
||||
{'cfgfile': cfgfile, 'ex': ex})
|
||||
|
||||
|
||||
def vendor_string():
|
||||
_load_config()
|
||||
|
||||
return NOVA_VENDOR
|
||||
|
||||
|
||||
def product_string():
|
||||
_load_config()
|
||||
|
||||
return NOVA_PRODUCT
|
||||
|
||||
|
||||
def package_string():
|
||||
_load_config()
|
||||
|
||||
return NOVA_PACKAGE
|
||||
|
||||
|
||||
def version_string_with_package():
|
||||
if package_string() is None:
|
||||
return version_info.version_string()
|
||||
else:
|
||||
return "%s-%s" % (version_info.version_string(), package_string())
|
||||
|
|
|
|||
|
|
@ -40,4 +40,4 @@ module=versionutils
|
|||
module=xmlutils
|
||||
|
||||
# The base module to hold the copy of openstack.common
|
||||
base=nova
|
||||
base=gantt
|
||||
|
|
|
|||
4
pylintrc
4
pylintrc
|
|
@ -19,8 +19,8 @@ argument-rgx=[a-z_][a-z0-9_]{1,30}$
|
|||
# and be lowecased with underscores
|
||||
method-rgx=([a-z_][a-z0-9_]{2,50}|setUp|tearDown)$
|
||||
|
||||
# Module names matching nova-* are ok (files in bin/)
|
||||
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(nova-[a-z0-9_-]+))$
|
||||
# Module names matching gantt-* are ok (files in bin/)
|
||||
module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+)|(gantt-[a-z0-9_-]+))$
|
||||
|
||||
# Don't require docstrings on tests.
|
||||
no-docstring-rgx=((__.*__)|([tT]est.*)|setUp|tearDown)$
|
||||
|
|
|
|||
|
|
@ -112,7 +112,7 @@ function run_tests {
|
|||
if [ "$testropts" = "" ] && [ "$testrargs" = "" ]; then
|
||||
# Default to running all tests if specific test is not
|
||||
# provided.
|
||||
testrargs="discover ./nova/tests"
|
||||
testrargs="discover ./gantt/tests"
|
||||
fi
|
||||
${wrapper} python -m testtools.run $testropts $testrargs
|
||||
|
||||
|
|
@ -132,7 +132,7 @@ function run_tests {
|
|||
set +e
|
||||
testrargs=`echo "$testrargs" | sed -e's/^\s*\(.*\)\s*$/\1/'`
|
||||
TESTRTESTS="$TESTRTESTS --testr-args='--subunit --concurrency $concurrency $testropts $testrargs'"
|
||||
if [ setup.cfg -nt nova.egg-info/entry_points.txt ]
|
||||
if [ setup.cfg -nt gantt.egg-info/entry_points.txt ]
|
||||
then
|
||||
${wrapper} python setup.py egg_info
|
||||
fi
|
||||
|
|
@ -154,7 +154,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='nova/*' --omit='nova/openstack/common/*' -d covhtml -i
|
||||
${wrapper} coverage html --include='gantt/*' --omit='gantt/openstack/common/*' -d covhtml -i
|
||||
fi
|
||||
|
||||
return $RESULT
|
||||
|
|
|
|||
134
setup.cfg
134
setup.cfg
|
|
@ -27,128 +27,8 @@ packages =
|
|||
gantt
|
||||
|
||||
[entry_points]
|
||||
nova.image.download.modules =
|
||||
file = nova.image.download.file
|
||||
console_scripts =
|
||||
nova-all = nova.cmd.all:main
|
||||
nova-api = nova.cmd.api:main
|
||||
nova-api-ec2 = nova.cmd.api_ec2:main
|
||||
nova-api-metadata = nova.cmd.api_metadata:main
|
||||
nova-api-os-compute = nova.cmd.api_os_compute:main
|
||||
nova-baremetal-deploy-helper = nova.cmd.baremetal_deploy_helper:main
|
||||
nova-baremetal-manage = nova.cmd.baremetal_manage:main
|
||||
nova-rpc-zmq-receiver = nova.cmd.rpc_zmq_receiver:main
|
||||
nova-cells = nova.cmd.cells:main
|
||||
nova-cert = nova.cmd.cert:main
|
||||
nova-clear-rabbit-queues = nova.cmd.clear_rabbit_queues:main
|
||||
nova-compute = nova.cmd.compute:main
|
||||
nova-conductor = nova.cmd.conductor:main
|
||||
nova-console = nova.cmd.console:main
|
||||
nova-consoleauth = nova.cmd.consoleauth:main
|
||||
nova-dhcpbridge = nova.cmd.dhcpbridge:main
|
||||
nova-manage = nova.cmd.manage:main
|
||||
nova-network = nova.cmd.network:main
|
||||
nova-novncproxy = nova.cmd.novncproxy:main
|
||||
nova-objectstore = nova.cmd.objectstore:main
|
||||
nova-rootwrap = nova.openstack.common.rootwrap.cmd:main
|
||||
nova-scheduler = nova.cmd.scheduler:main
|
||||
nova-spicehtml5proxy = nova.cmd.spicehtml5proxy:main
|
||||
nova-xvpvncproxy = nova.cmd.xvpvncproxy:main
|
||||
|
||||
nova.api.v3.extensions =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
admin_actions = nova.api.openstack.compute.plugins.v3.admin_actions:AdminActions
|
||||
admin_password = nova.api.openstack.compute.plugins.v3.admin_password:AdminPassword
|
||||
agents = nova.api.openstack.compute.plugins.v3.agents:Agents
|
||||
aggregates = nova.api.openstack.compute.plugins.v3.aggregates:Aggregates
|
||||
attach_interfaces = nova.api.openstack.compute.plugins.v3.attach_interfaces:AttachInterfaces
|
||||
availability_zone = nova.api.openstack.compute.plugins.v3.availability_zone:AvailabilityZone
|
||||
block_device_mapping = nova.api.openstack.compute.plugins.v3.block_device_mapping:BlockDeviceMapping
|
||||
cells = nova.api.openstack.compute.plugins.v3.cells:Cells
|
||||
certificates = nova.api.openstack.compute.plugins.v3.certificates:Certificates
|
||||
config_drive = nova.api.openstack.compute.plugins.v3.config_drive:ConfigDrive
|
||||
console_output = nova.api.openstack.compute.plugins.v3.console_output:ConsoleOutput
|
||||
consoles = nova.api.openstack.compute.plugins.v3.consoles:Consoles
|
||||
deferred_delete = nova.api.openstack.compute.plugins.v3.deferred_delete:DeferredDelete
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
evacuate = nova.api.openstack.compute.plugins.v3.evacuate:Evacuate
|
||||
extended_availability_zone = nova.api.openstack.compute.plugins.v3.extended_availability_zone:ExtendedAvailabilityZone
|
||||
extended_server_attributes = nova.api.openstack.compute.plugins.v3.extended_server_attributes:ExtendedServerAttributes
|
||||
extended_status = nova.api.openstack.compute.plugins.v3.extended_status:ExtendedStatus
|
||||
extended_volumes = nova.api.openstack.compute.plugins.v3.extended_volumes:ExtendedVolumes
|
||||
extension_info = nova.api.openstack.compute.plugins.v3.extension_info:ExtensionInfo
|
||||
flavors = nova.api.openstack.compute.plugins.v3.flavors:Flavors
|
||||
flavors_extraspecs = nova.api.openstack.compute.plugins.v3.flavors_extraspecs:FlavorsExtraSpecs
|
||||
flavor_access = nova.api.openstack.compute.plugins.v3.flavor_access:FlavorAccess
|
||||
flavor_rxtx = nova.api.openstack.compute.plugins.v3.flavor_rxtx:FlavorRxtx
|
||||
flavor_manage = nova.api.openstack.compute.plugins.v3.flavor_manage:FlavorManage
|
||||
hide_server_addresses = nova.api.openstack.compute.plugins.v3.hide_server_addresses:HideServerAddresses
|
||||
hosts = nova.api.openstack.compute.plugins.v3.hosts:Hosts
|
||||
hypervisors = nova.api.openstack.compute.plugins.v3.hypervisors:Hypervisors
|
||||
instance_actions = nova.api.openstack.compute.plugins.v3.instance_actions:InstanceActions
|
||||
ips = nova.api.openstack.compute.plugins.v3.ips:IPs
|
||||
instance_usage_audit_log = nova.api.openstack.compute.plugins.v3.instance_usage_audit_log:InstanceUsageAuditLog
|
||||
keypairs = nova.api.openstack.compute.plugins.v3.keypairs:Keypairs
|
||||
limits = nova.api.openstack.compute.plugins.v3.limits:Limits
|
||||
migrations = nova.api.openstack.compute.plugins.v3.migrations:Migrations
|
||||
multinic = nova.api.openstack.compute.plugins.v3.multinic:Multinic
|
||||
multiple_create = nova.api.openstack.compute.plugins.v3.multiple_create:MultipleCreate
|
||||
quota_classes = nova.api.openstack.compute.plugins.v3.quota_classes:QuotaClasses
|
||||
quota_sets = nova.api.openstack.compute.plugins.v3.quota_sets:QuotaSets
|
||||
remote_consoles = nova.api.openstack.compute.plugins.v3.remote_consoles:RemoteConsoles
|
||||
rescue = nova.api.openstack.compute.plugins.v3.rescue:Rescue
|
||||
scheduler_hints = nova.api.openstack.compute.plugins.v3.scheduler_hints:SchedulerHints
|
||||
security_groups = nova.api.openstack.compute.plugins.v3.security_groups:SecurityGroups
|
||||
server_diagnostics = nova.api.openstack.compute.plugins.v3.server_diagnostics:ServerDiagnostics
|
||||
server_metadata = nova.api.openstack.compute.plugins.v3.server_metadata:ServerMetadata
|
||||
server_password = nova.api.openstack.compute.plugins.v3.server_password:ServerPassword
|
||||
server_usage = nova.api.openstack.compute.plugins.v3.server_usage:ServerUsage
|
||||
servers = nova.api.openstack.compute.plugins.v3.servers:Servers
|
||||
services = nova.api.openstack.compute.plugins.v3.services:Services
|
||||
shelve = nova.api.openstack.compute.plugins.v3.shelve:Shelve
|
||||
simple_tenant_usage = nova.api.openstack.compute.plugins.v3.simple_tenant_usage:SimpleTenantUsage
|
||||
versions = nova.api.openstack.compute.plugins.v3.versions:Versions
|
||||
|
||||
nova.api.v3.extensions.server.create =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
availability_zone = nova.api.openstack.compute.plugins.v3.availability_zone:AvailabilityZone
|
||||
block_device_mapping = nova.api.openstack.compute.plugins.v3.block_device_mapping:BlockDeviceMapping
|
||||
config_drive = nova.api.openstack.compute.plugins.v3.config_drive:ConfigDrive
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
keypairs_create = nova.api.openstack.compute.plugins.v3.keypairs:Keypairs
|
||||
multiple_create = nova.api.openstack.compute.plugins.v3.multiple_create:MultipleCreate
|
||||
scheduler_hints = nova.api.openstack.compute.plugins.v3.scheduler_hints:SchedulerHints
|
||||
security_groups = nova.api.openstack.compute.plugins.v3.security_groups:SecurityGroups
|
||||
user_data = nova.api.openstack.compute.plugins.v3.user_data:UserData
|
||||
|
||||
nova.api.v3.extensions.server.create.deserialize =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
availability_zone = nova.api.openstack.compute.plugins.v3.availability_zone:AvailabilityZone
|
||||
block_device_mapping = nova.api.openstack.compute.plugins.v3.block_device_mapping:BlockDeviceMapping
|
||||
config_drive = nova.api.openstack.compute.plugins.v3.config_drive:ConfigDrive
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
multiple_create = nova.api.openstack.compute.plugins.v3.multiple_create:MultipleCreate
|
||||
scheduler_hints = nova.api.openstack.compute.plugins.v3.scheduler_hints:SchedulerHints
|
||||
security_groups = nova.api.openstack.compute.plugins.v3.security_groups:SecurityGroups
|
||||
user_data = nova.api.openstack.compute.plugins.v3.user_data:UserData
|
||||
|
||||
nova.api.v3.extensions.server.rebuild =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
|
||||
nova.api.v3.extensions.server.rebuild.deserialize =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
|
||||
nova.api.v3.extensions.server.resize =
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
|
||||
nova.api.v3.extensions.server.resize.deserialize =
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
|
||||
nova.api.v3.extensions.server.update =
|
||||
access_ips = nova.api.openstack.compute.plugins.v3.access_ips:AccessIPs
|
||||
disk_config = nova.api.openstack.compute.plugins.v3.disk_config:DiskConfig
|
||||
gantt-scheduler = gantt.cmd.scheduler:main
|
||||
|
||||
[build_sphinx]
|
||||
all_files = 1
|
||||
|
|
@ -161,15 +41,15 @@ tag_date = 0
|
|||
tag_svn_revision = 0
|
||||
|
||||
[compile_catalog]
|
||||
directory = nova/locale
|
||||
domain = nova
|
||||
directory = gantt/locale
|
||||
domain = gantt
|
||||
|
||||
[update_catalog]
|
||||
domain = nova
|
||||
output_dir = nova/locale
|
||||
input_file = nova/locale/nova.pot
|
||||
domain = gantt
|
||||
output_dir = gantt/locale
|
||||
input_file = gantt/locale/gantt.pot
|
||||
|
||||
[extract_messages]
|
||||
keywords = _ gettext ngettext l_ lazy_gettext
|
||||
mapping_file = babel.cfg
|
||||
output_file = nova/locale/nova.pot
|
||||
output_file = gantt/locale/gantt.pot
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ make_hook() {
|
|||
fi
|
||||
}
|
||||
|
||||
# NOTE(jk0): Make sure we are in nova's root directory before adding the hook.
|
||||
# NOTE(jk0): Make sure we are in gantt's root directory before adding the hook.
|
||||
if [ ! -d ".git" ]; then
|
||||
echo "unable to find .git; moving up a directory"
|
||||
cd ..
|
||||
|
|
|
|||
|
|
@ -29,12 +29,12 @@ import install_venv_common as install_venv
|
|||
|
||||
def print_help(venv, root):
|
||||
help = """
|
||||
Nova development environment setup is complete.
|
||||
Gantt development environment setup is complete.
|
||||
|
||||
Nova development uses virtualenv to track and manage Python dependencies
|
||||
Gantt development uses virtualenv to track and manage Python dependencies
|
||||
while in development and testing.
|
||||
|
||||
To activate the Nova virtualenv for the extent of your current shell
|
||||
To activate the Gantt virtualenv for the extent of your current shell
|
||||
session you can run:
|
||||
|
||||
$ source %s/bin/activate
|
||||
|
|
@ -61,7 +61,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 = 'Nova'
|
||||
project = 'Gantt'
|
||||
install = install_venv.InstallVenv(root, venv, pip_requires, test_requires,
|
||||
py_version, project)
|
||||
options = install.parse_args(argv)
|
||||
|
|
|
|||
|
|
@ -31,14 +31,12 @@ from pylint.reporters import text
|
|||
# Note(maoy): E1103 is error code related to partial type inference
|
||||
ignore_codes = ["E1103"]
|
||||
# Note(maoy): the error message is the pattern of E0202. It should be ignored
|
||||
# for nova.tests modules
|
||||
ignore_messages = ["An attribute affected in nova.tests"]
|
||||
# for gantt.tests modules
|
||||
ignore_messages = ["An attribute affected in gantt.tests"]
|
||||
# Note(maoy): we ignore all errors in openstack.common because it should be
|
||||
# checked elsewhere. We also ignore nova.tests for now due to high false
|
||||
# checked elsewhere. We also ignore gantt.tests for now due to high false
|
||||
# positive rate.
|
||||
# Note(danms): we ignore all errors in nova.objects because the false
|
||||
# positive rate should be very high.
|
||||
ignore_modules = ["nova/openstack/common/", "nova/tests/", "nova/objects/"]
|
||||
ignore_modules = ["gantt/openstack/common/", "gantt/tests/"]
|
||||
|
||||
KNOWN_PYLINT_EXCEPTIONS_FILE = "tools/pylint_exceptions"
|
||||
|
||||
|
|
@ -133,7 +131,7 @@ class ErrorKeys(object):
|
|||
def run_pylint():
|
||||
buff = StringIO.StringIO()
|
||||
reporter = text.ParseableTextReporter(output=buff)
|
||||
args = ["--include-ids=y", "-E", "nova"]
|
||||
args = ["--include-ids=y", "-E", "gantt"]
|
||||
lint.Run(args, reporter=reporter, exit=False)
|
||||
val = buff.getvalue()
|
||||
buff.close()
|
||||
|
|
|
|||
|
|
@ -70,11 +70,11 @@ def main():
|
|||
test_works = False
|
||||
|
||||
# run new tests with old code
|
||||
run("git checkout HEAD^ nova")
|
||||
run("git checkout HEAD nova/tests")
|
||||
run("git checkout HEAD^ gantt")
|
||||
run("git checkout HEAD gantt/tests")
|
||||
|
||||
# identify which tests have changed
|
||||
tests = run("git whatchanged --format=oneline -1 | grep \"nova/tests\" "
|
||||
tests = run("git whatchanged --format=oneline -1 | grep \"gantt/tests\" "
|
||||
"| cut -f2").split()
|
||||
test_list = []
|
||||
for test in tests:
|
||||
|
|
@ -91,7 +91,7 @@ def main():
|
|||
test_works = True
|
||||
|
||||
# cleanup
|
||||
run("git checkout HEAD nova")
|
||||
run("git checkout HEAD gantt")
|
||||
if options.review:
|
||||
new_branch = run("git status | head -1 | cut -d ' ' -f 4")
|
||||
run("git checkout %s" % original_branch)
|
||||
|
|
|
|||
2
tox.ini
2
tox.ini
|
|
@ -24,7 +24,6 @@ downloadcache = ~/cache/pip
|
|||
sitepackages = False
|
||||
commands =
|
||||
flake8 {posargs}
|
||||
#TODO add tools/config/check_uptodate.sh
|
||||
|
||||
[testenv:pylint]
|
||||
setenv = VIRTUAL_ENV={envdir}
|
||||
|
|
@ -54,4 +53,3 @@ exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,t
|
|||
|
||||
[hacking]
|
||||
import_exceptions = gantt.openstack.common.gettextutils._
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue