Commit Graph

392 Commits

Author SHA1 Message Date
Dan Prince a2fd90aca2 Import cfg module in extract_opts.py.
Updates the tools/conf/extract_opts.py module so it
imports cfg again.

Fixes "global name 'cfg' is not defined" errors which occur
without it.

Change-Id: Idf7c2c5201c79e7aa359bc555306caadebcc18ce
2012-12-18 14:40:04 -05:00
Clark Boylan aef9802089 Replace fixtures.DetailStream with fixtures.StringStream.
Fixtures 0.3.12 adds StringStream as a successor to DetailStream (this
change was made for compatibility with python 3). Update Nova's tests to
use StringStream instead of DetailStream.

Change-Id: If697859a52f3a7db9dab38bd080b779bb3270287
2012-12-16 17:31:46 -08:00
Clark Boylan 4abc8cc64f Use testr to run nova unittests.
Convert nova from using nosetests to testr for its test runner. Some
tests had to be modified to get them to run properly under testr.

run_tests.sh has been updated to run testr instead of nosetests.

Coverage is collected by running subunit.run under coverage.py when the
coverage environment is selected.

Note that you will need to rebuild your virtualenvs as nose is being
removed from the dependency lists and is being replaced by testr. Tests
will run in different processes once this test is merged so you cannot
use test classes to pass information between tests. Each test should be
a proper independent unit. Additionally the -x and -d flags to
run_tests.sh have been removed as there are currently no decent
approximations for those functions.

Change-Id: I019ca098972ca749b195f59968cf21edd5ba9109
2012-12-14 14:22:20 -08:00
Jenkins 9202a8457a Merge "Port to argparse based cfg" 2012-12-12 23:30:43 +00:00
Jenkins 235239c97b Merge "Move zombie_instance_updated_at_window option" 2012-12-12 05:13:52 +00:00
Jenkins 83b104ad87 Merge "i18n raise Exception messages" 2012-12-11 17:45:46 +00:00
Mark McLoughlin 79ac64dd32 Move zombie_instance_updated_at_window option
The zombie_instance_updated_at_window option is only used in
vm_vdi_cleaner so declare it there.

blueprint: scope-config-opts
Change-Id: I8d95fbd858f8afe855c2b559dea6995497d8f682
2012-12-11 08:06:53 +00:00
Mark McLoughlin 5e09b2cab7 Port to argparse based cfg
Import latest cfg from oslo-incubator with these changes:

 Add deprecated --logdir common opt
 Add deprecated --logfile common opt.
 Allow nova and others to override some logging defaults
 Fixing the trim for ListOp when reading from config file
 Fix set_default() with boolean CLI options
 Improve cfg's argparse sub-parsers support
 Hide the GroupAttr conf and group attributes
 Fix regression with cfg CLI arguments
 Fix broken --help with CommonConfigOpts
 Fix ListOpt to trim whitespace
 updating sphinx documentation
 Don't reference argparse._StoreAction
 Fix minor coding style issue
 Remove ConfigCliParser class
 Add support for positional arguments
 Use stock argparse behaviour for optional args
 Use stock argparse --usage behaviour
 Use stock argparse --version behaviour
 Remove add_option() method
 Completely remove cfg's disable_interspersed_args()
 argparse support for cfg

The main cfg API change is that CONF() no longer returns the un-parsed
CLI arguments. To handle these args, you need to use the support for
positional arguments or sub-parsers.

Switching nova-manage to use sub-parser based CLI arguments means the
following changes in behaviour:

 - no more lazy matching of commands - e.g. 'nova-manage proj q' will
   no longer work. If we find out about common abbreviations used in
   peoples' scripts, we can easily add those.

 - the help output displayed if you run nova-manage without any args
   (or just a category) has changed

 - 'nova-manage version list' is no longer equivalent to
   'nova-manage version'

Change-Id: I19ef3a1c00e97af64d199e27cb1cdc5c63b46a82
2012-12-11 06:47:35 +00:00
Brian Lamar ee1b598ef1 Correctly init XenAPIDriver in vm_vdi_cleaner.py
Fixes bug 1088615

Change-Id: Iaf0569fd45ed180d141dc0367c547f014b7502e1
2012-12-10 17:24:47 -05:00
Chuck Short c454606ada i18n raise Exception messages
Provide i18n to some exceptions that were not
provided before.

Change-Id: Ia320ba5f12e82686c8ee7973a77f152eb4b02bd4
Signed-off-by: Chuck Short <chuck.short@canonical.com>
2012-12-10 14:43:18 -06:00
Jenkins 994ff1fc74 Merge "Unpin lxml requirements" 2012-12-10 18:44:50 +00:00
Jenkins 734d9fb22b Merge "Add generic customization hooks via decorator." 2012-12-10 18:42:15 +00:00
Chuck Short 63f5839a19 Unpin lxml requirements
Ubuntu is using a much newer version of lxml so
we shouldn't lock the versions in our infrasctructure.

Change-Id: I688c0be196db526f220262e25afa79d84fcae632
Signed-off-by: Chuck Short <chuck.short@canonical.com>
2012-12-08 15:32:35 -06:00
Jenkins 19470f4545 Merge "Update tools/flakes to work with pydoc" 2012-12-08 08:22:03 +00:00
Joe Gordon 41b95b3bdf Update tools/flakes to work with pydoc
Change-Id: Ib141553017aa88d6edb65b5d51c06740699a2480
2012-12-06 11:31:10 +02:00
Joe Gordon a44ace3196 Fix pep8 exclude logic for 1.3.3
* With pep8 1.3.3 the exclude logic monkey patch broke causing
  tools/hacking to run on openstack/common code
* Also add .git to exclude list

Fix bug 1086410

Change-Id: Ifc50ac1963c50c338432bbb4b1e15cdf58ed2128
2012-12-06 11:19:17 +02:00
Jenkins f354276930 Merge "Allow newer boto library versions" 2012-12-04 21:57:26 +00:00
Joe Gordon 65ee45c641 Add pyflakes option to tox
* Uses pyflakes wrapper to ignore gettext errors
* Based on: https://bugs.launchpad.net/pyflakes/+bug/844592

Change-Id: I4fd947176f5258f89f517acf5dda2ded4a2da15e
2012-12-04 11:53:29 +02:00
Attila Fazekas fb34f69ca1 Allow newer boto library versions
Change the boto dependency specification in pip-requires to just 'boto'
without version restriction, as it was before the build issue.

Change-Id: If6c317ffce867f9e544e47c5b0e4b1f2fe9f082f
2012-12-03 14:30:29 +01:00
Brian Elliott e937a53065 Add generic customization hooks via decorator.
Hooks add the ability to insert custom code around operations that
declare a named hook:

e.g.

@hooks.add_hooks('create_instance')
def create_instance(....):
   ....

The above hook allows Hook objects to be run 'pre' and 'post' the
execution of create_instance()

Hook objects are discovered via the setuptools entry point group
'nova.hooks'.

Change-Id: I3961df12ef415085de7459438967edacc34500c2
2012-11-30 20:47:53 +00:00
Jenkins a183ee749f Merge "Add keystoneclient to pip-requires" 2012-11-25 10:56:24 +00:00
Jenkins 4ff9b97723 Merge "Unpin amqplib and kombu requirements." 2012-11-22 09:27:11 +00:00
Chuck Short 560e5cd84e Pin pep8 to 1.3.3
Apart of making pep8 version standard across all openstack
projects.

With this change we ignore E712 since it is normal to use
"column == True" in sqlalchemy.

Change-Id: I73a162847a79558cb158112878033edf18039805
Signed-off-by: Chuck Short <chuck.short@canonical.com>
2012-11-19 21:20:42 -06:00
Mark McLoughlin e237c86446 Use CONF.import_opt() for nova.config opts
The only reason for importing nova.config now is where one of the
options defined in that file is needed. Rather than importing
nova.config using an import statement, use CONF.import_opt() so
that it is clear which option we actually require.

In future, we will move many options out of nova.config so many
of these import_opt() calls will either go away or cause a module
other than nova.config to be imported.

Change-Id: I0646efddecdf2530903afd50c1f4364cb1d5dce1
2012-11-20 00:04:49 +00:00
Mark McLoughlin 94d87bce21 Remove nova.config.CONF
Modules import nova.config for two reasons right now - firstly, to
reference nova.config.CONF and, secondly, if they use one of the
options defined in nova.config.

Often modules import nova.openstack.common.cfg and nova.config
which is a bit pointless since they could just use cfg.CONF if
they just want to nova.config in order to reference CONF.

Let's just use cfg.CONF everywhere and we can explicitly state
where we actually require options defined in nova.config.

Change-Id: Ie4184a74e3e78c99658becb18dce1c2087e450bb
2012-11-20 00:00:21 +00:00
Joe Gordon 8ac7053c7c Add keystoneclient to pip-requires
As of I788300449e37ba1732f6482ebce5f480a2c14a41, we pull the auth_token
middleware from keystoneclient. (added to keystoneclient in version 0.2.0)

Change-Id: Ide0d562d96e5e426f9c7e532251efd57a0964f11
2012-11-19 14:23:21 -08:00
Mark McLoughlin 6e92a67fc3 Remove nova.flags
Now that options have all moved from nova.flags to nova.config, we can
safely remove the nova.flags imports and replace them with nova.config
imports.

Change-Id: Ic077a72dd6419bbf1e1babe71acfa43c4e8b55c8
2012-11-17 16:30:03 +00:00
Vishvananda Ishaya e1b153d419 Unpin amqplib and kombu requirements.
Ubuntu is using a much newer version of these libraries so we
shouldn't lock the versions in our infrasctructure. Using a > 1.0
of amqplib is particularly useful as it turns on keepalives by
default.

Change-Id: I956e70e0c39c76d1632fb708cd78aeb51adbd250
2012-11-14 11:02:46 -08:00
Robert Collins 18b9c7f29b Isolate tests from the environment variable http_proxy.
This fixes bug 1078548.

This is done by adding a dependency on the fixtures library, which has
dedicated code for just this sort of thing, and using it in the base class.

Change-Id: I841fbf912b1a3ab43ca8c52c779d930aaf4a0e96
2012-11-14 07:03:25 +00:00
Dan Smith 9471282626 Ban db import from nova/virt
This makes hacking.py complain if someone adds something like:

  from nova import db

into any of the files in nova/virt/* (aside from the fake.py file).
It also removes the rest of the dangling db imports that are no
longer needed.

Yay!

Change-Id: Iba3d53b87e65e33a55f8e5033b5d1d33b28d12f7
2012-11-12 12:37:33 -08:00
Jenkins ee3d2a1908 Merge "Switch from FLAGS to CONF in misc modules" 2012-11-07 05:41:57 +00:00
Jenkins 52cf3cae69 Merge "Remove flags.DECLARE" 2012-11-06 19:12:46 +00:00
Jenkins 79faed4832 Merge "move python-cinderclient to pip-requires" 2012-11-06 11:00:37 +00:00
Mark McLoughlin 637e805634 Switch from FLAGS to CONF in misc modules
Use the global CONF variable instead of FLAGS. This is purely a cleanup
since FLAGS is already just another reference to CONF.

We leave the nova.flags imports until a later cleanup commit since
removing them may cause unpredictable problems due to config options not
being registered.

Change-Id: Ib110ba8d1837780e90b0d3fe13f8e6b68ed15f65
2012-11-04 21:46:35 +00:00
Mark McLoughlin 8ce58defbe Remove flags.DECLARE
The cfg.ConfigOpts class has an equivalent method, so lets use that.

Change-Id: I5860230336d00d7531a0ffd255c766ff77661625
2012-11-04 21:38:38 +00:00
Mark McLoughlin efede80046 Move parse_args to nova.config
The flags module will eventually be removed and this is a first step
towards that.

Change-Id: I729b08900e53e2ae6db10633dcff3be59720fa6f
2012-11-04 21:37:39 +00:00
Sean Dague 9e03eab188 move python-cinderclient to pip-requires
python-cinderclient is now actually a requirement, move
this from test-requires to pip-requires to reflect that.

Fixes bug #1074085

Change-Id: Iea6c58faab2462d137049d690d58d951bd4e2c9e
2012-11-02 07:53:57 -04:00
Chris Yeoh 117db792b8 Force earlier version of sqlalchemy
Set the version of sqlalchemy to be earlier than the 0.8 beta as it
is incompatible with the latest available sqlalchemy-migrate and as
a result run_tests.sh does not run any tests.

Change-Id: I9c5515b76d35e4999f81d71e82f818685efe54ea
2012-10-31 23:28:46 +10:30
Joe Gordon f82e765edb Remove extra print line in hacking.py
Change-Id: If3d5da52a55c1834f4dfa49d817010d314d1403a
2012-10-29 13:15:40 -07:00
Monty Taylor c14bb9a677 Use testtools as the base testcase class.
As a step towards parallelizing the test runs, use testtools as the
base unittest test case class. In this patch, it has caused us to catch
places where setUp and tearDown were not being chained properly.
Additionally, we get to remove our custom skip decorators and a few
backported assert calls.

Part of blueprint grizzly-testtools

Change-Id: Ia2025e1b7191b65130b85b30ce6239d5c431c8ba
2012-10-29 06:27:54 +01:00
Joe Gordon fcefe62547 Change hacking.py N306 to use logical_lines
Only logical lines (does not include comments) should be checked for
alphabetical import order.  This patch changes N306
(imports not in alphabetical order) to run on logical lines not physical lines.

Fixes bug 1071849

Change-Id: Ib2cb92f9eb82aeed1ff5879d3e38c8961b4f06cc
2012-10-26 20:40:36 +00:00
Dan Smith 88f252a3d4 Fix hacking.py naivete regarding lines that look like imports
Right now, any line that starts with "from" (after whitespace
removal) is considered an import line. That assumption leads to
some unsavory parsing and crashing if the line doesn't match
the expected format.

This patch checks to make sure that the word "import" is in the line
as well as starting with "from", which at least gets us a bit closer
to a reasonable assumption.

Fixes bug 1071849

Change-Id: Iab666fcd04a9aaa3a490737a173ee3189b9b8329
2012-10-26 11:39:46 -07:00
Jenkins bd38d1eb80 Merge "Change install_venv to use setup.py develop." 2012-10-24 19:18:01 +00:00
Monty Taylor 36a8fe04c4 Change install_venv to use setup.py develop.
With the potential use of entry points, code from the current tree needs to
be installed into a venv created by install_venv.py via setup.py develop.
This will ensure that the appropriate meta-data and paths are set in the
virtualenv.

Change-Id: I1ca15959c98a24629d2f5b2c385296c4e2fe770c
2012-10-17 12:13:20 -07:00
Sulochan Acharya 3a0102668c Fixes syntax error in nova.tools.esx.guest_tools.py
Fixes syntax error in nova.tools.esx.guest_tools.py.
Fixes bug1067840.

Change-Id: Ib08e03a2be05f02c30e9578fa8773f1171a8b330
2012-10-17 14:04:01 -05:00
Jenkins 321868a2e0 Merge "Proxy floating IP calls to quantum" 2012-10-10 23:42:09 +00:00
Jenkins a54ced97f9 Merge "Update tools hacking for pep8 1.2 and beyond" 2012-10-10 19:53:50 +00:00
Akihiro MOTOKI 7948b7a572 Proxy floating IP calls to quantum
Fixes bug 1023169. Also fixes bug 1031119.

In Folsom, floating IP support is moved to Quantum. By this commit floating IP
calls to nova are proxied to Quantum and nova command can be used to manage
floating IPs.

pip-requires is also updated and now requires python-quantumclient >=2.1 which
supports floating IP feature in Quantum.

Change-Id: I2c32948a8fe291601216dc62d546da64a8fb8428
2012-10-09 15:28:26 +09:00
Vishvananda Ishaya 8ca9ba946e Remove dependency on python-ldap for tests
We have a fake ldap implementation for testing, but the tests still
fail if ldap isn't installed. This modifies the usage of ldap in
the LdapDNS tests to stub the module before attempting to import
it. This allows us to test without having python-ldap installed.

It removes the unneccessary FakeLdapDNS in favor of using the real
LdapDNS with the module stubbed out. It also removes the dependency
on python-ldap from test-requires.

Change-Id: Ifbe09e16436afa6999dcb7385763492b0026556c
2012-10-02 16:01:49 -07:00
Joe Gordon fbc4568eb0 Update tools hacking for pep8 1.2 and beyond
* https://github.com/jcrocholl/pep8/commit/b9f72b16011aac981ce9e3a47fd0ffb1d3d2e085
  broke tools/hacking.py
* Upgrade pep8 to 1.2 and disable the following new tests: E12,E711,E712,E721,E502

Change-Id: I32a8808c6c9cccfedcc4d2a26649333aca1cd713
2012-10-01 16:33:35 -07:00