]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agodocs : update local template references to heat-templates url
Steven Hardy [Tue, 7 May 2013 15:19:44 +0000 (16:19 +0100)]
docs : update local template references to heat-templates url

Update references to the to-be-removed in-tree templates, so
we use raw URLs to the heat-templates repo instead

Change-Id: I2121cedc2bffe1760d845dd2d87d97dd2265f1e9

12 years agoMerge "Support Snapshot policy in volumes"
Jenkins [Tue, 7 May 2013 07:11:19 +0000 (07:11 +0000)]
Merge "Support Snapshot policy in volumes"

12 years agoMerge "heat tests : separate Autoscaling and CW alarm tests"
Jenkins [Fri, 3 May 2013 16:51:20 +0000 (16:51 +0000)]
Merge "heat tests : separate Autoscaling and CW alarm tests"

12 years agoMerge "heat tests : convert most tests to inline templates"
Jenkins [Fri, 3 May 2013 16:51:18 +0000 (16:51 +0000)]
Merge "heat tests : convert most tests to inline templates"

12 years agoMerge "heat tests : add parse_stack function to test utils"
Jenkins [Fri, 3 May 2013 16:51:14 +0000 (16:51 +0000)]
Merge "heat tests : add parse_stack function to test utils"

12 years agoheat tests : separate Autoscaling and CW alarm tests
Steven Hardy [Fri, 3 May 2013 12:42:24 +0000 (13:42 +0100)]
heat tests : separate Autoscaling and CW alarm tests

Currently the AutoScaling test also tests the CloudWatch Alarm
resource, so separate out the CW Alarm test to simplify things

Change-Id: Ia346ee49f3a363e2d63e801c74265545d7af1acf

12 years agoheat tests : convert most tests to inline templates
Steven Hardy [Fri, 3 May 2013 10:43:54 +0000 (11:43 +0100)]
heat tests : convert most tests to inline templates

Convert to inline minimal templates, to remove dependency on
in-tree templates which we plan to remove.  Note there are still
some more tests remaining which need similar changes (shardy todo)

Change-Id: I0864d1f15ea3b815d449277387440157f104bbf3

12 years agoheat tests : add parse_stack function to test utils
Steven Hardy [Fri, 3 May 2013 12:31:35 +0000 (13:31 +0100)]
heat tests : add parse_stack function to test utils

Add convenience function parse_stack to utils so it can be
reused in test to avoid duplication

Change-Id: I608e2227c695a9faecbd8ff78a1339b47174a006

12 years agoFix error reporting in @stack_delete_after unit tests
Zane Bitter [Fri, 3 May 2013 13:57:57 +0000 (15:57 +0200)]
Fix error reporting in @stack_delete_after unit tests

If a unit test decorated with @stack_delete_after (to ensure that a stack
being tested is cleaned up) fails in such a way that the stack cannot be
cleaned up, the original error was suppressed, making debugging very
difficult. In this case, we should re-raise the original exception.

Change-Id: I2b0c326f819cd8a6bc772fe52deb14fb1c41bf93

12 years agoSet Stack id to None when deleted
Zane Bitter [Fri, 3 May 2013 14:07:14 +0000 (16:07 +0200)]
Set Stack id to None when deleted

If a Stack object has been removed from the database, we should reset its
ID to None so that if the object is used further, it will not be assumed
that it is represented in the database.

Change-Id: Iaa7e9327324f101487847362973bd7f8386ce44b

12 years agoSupport Snapshot policy in volumes
Thomas Herve [Thu, 2 May 2013 13:13:52 +0000 (15:13 +0200)]
Support Snapshot policy in volumes

This handles the Snapshot DeletionPolicy in the AWS::EC2::Volume
resource, creating a backup of the volume before deleting it. It
requires a recent cinder client with backup support.

Implements: blueprint volume-snapshots
Change-Id: Idbb14a434ad6ccde9f198e07799e8aef0867dd6f

12 years agoMerge "heat api: ec2token remove unnecessary jsonutils retry"
Jenkins [Fri, 3 May 2013 10:02:46 +0000 (10:02 +0000)]
Merge "heat api: ec2token remove unnecessary jsonutils retry"

12 years agoMerge "Use install_venv_common from oslo"
Jenkins [Fri, 3 May 2013 09:07:57 +0000 (09:07 +0000)]
Merge "Use install_venv_common from oslo"

12 years agoMerge "Sometimes use quantum for SecurityGroup"
Jenkins [Fri, 3 May 2013 09:06:34 +0000 (09:06 +0000)]
Merge "Sometimes use quantum for SecurityGroup"

12 years agoMerge "Allow non-replacement updates of Alarms"
Jenkins [Fri, 3 May 2013 09:03:37 +0000 (09:03 +0000)]
Merge "Allow non-replacement updates of Alarms"

12 years agoMerge "Fix test_validate to run by itself"
Jenkins [Fri, 3 May 2013 05:07:22 +0000 (05:07 +0000)]
Merge "Fix test_validate to run by itself"

12 years agoMerge "Depend on discover to fix python2.6 tests"
Jenkins [Fri, 3 May 2013 05:02:10 +0000 (05:02 +0000)]
Merge "Depend on discover to fix python2.6 tests"

12 years agoAllow non-replacement updates of Alarms
Angus Salkeld [Fri, 3 May 2013 04:25:57 +0000 (14:25 +1000)]
Allow non-replacement updates of Alarms

blueprint cloudwatch-update-stack

Change-Id: I58982caf33bb5b326797472ec6c3dab8eba3a668

12 years agoMerge "Split the module lines in openstack-common.conf"
Jenkins [Thu, 2 May 2013 20:38:18 +0000 (20:38 +0000)]
Merge "Split the module lines in openstack-common.conf"

12 years agoSometimes use quantum for SecurityGroup
Steve Baker [Fri, 19 Apr 2013 15:55:43 +0000 (11:55 -0400)]
Sometimes use quantum for SecurityGroup

This implements the following properties in AWS::EC2::SecurityGroup
- VpcId
- SecurityGroupEgress

If VpcId is specified, completely separate code paths
are used which make quantum calls instead of nova calls.

This implements blueprint quantum-security-group

This is based off https://review.openstack.org/#/c/22280/
with a few enhancements:
- Quantum firewall rules translated to acceptable format for ICMP
- remote_ip_prefix used for security group rule creation

Change-Id: I8f1953cb559da0e97821ae0072dfb01dc8267c0c
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoDepend on discover to fix python2.6 tests
Thomas Herve [Thu, 2 May 2013 19:50:01 +0000 (21:50 +0200)]
Depend on discover to fix python2.6 tests

It also fix a failure introduced by using 2.7-specific setUpClass.

Fixes: bug #1175753
Change-Id: I63ba61050602df92c654bd70519947965494df37

12 years agoheat api: ec2token remove unnecessary jsonutils retry
Steven Hardy [Thu, 2 May 2013 19:14:13 +0000 (20:14 +0100)]
heat api: ec2token remove unnecessary jsonutils retry

Remove the try/catch around jsonutils dumps, since this is
handled internally by jsonutils via the dumps default parameter

Change-Id: I66c63b441f61cde506ef40e3eace60c3c41e90ca

12 years agoMake DeletionPolicy a resource attribute instead of a property.
Thomas Herve [Wed, 1 May 2013 14:54:57 +0000 (16:54 +0200)]
Make DeletionPolicy a resource attribute instead of a property.

This improves validation of the different values, and make the Retain
policy works for all resources.

Fixes: bug #1160779
Change-Id: Idb0d275c44661db341f693d9d80629661d66c7ac

12 years agoUse install_venv_common from oslo
Mark McLoughlin [Thu, 2 May 2013 09:45:37 +0000 (10:45 +0100)]
Use install_venv_common from oslo

The core of install_venv.py was moved into oslo-incubator recently so
just use that.

Change-Id: I7ba52660fc1433f116e6ee1ad33c89ba393c416b

12 years agoSplit the module lines in openstack-common.conf
Mark McLoughlin [Thu, 2 May 2013 09:26:22 +0000 (10:26 +0100)]
Split the module lines in openstack-common.conf

update.py was changed to support this format recently. It makes it
much easier to review changes to the list of modules.

Change-Id: I0f86f65e107ab54231bd48182947d5799e8a460f

12 years agoMerge "Fix test_dbinstance not running by itself"
Jenkins [Thu, 2 May 2013 08:23:31 +0000 (08:23 +0000)]
Merge "Fix test_dbinstance not running by itself"

12 years agoMerge "Remove unused jenkins arguments from tox.ini"
Jenkins [Thu, 2 May 2013 08:22:14 +0000 (08:22 +0000)]
Merge "Remove unused jenkins arguments from tox.ini"

12 years agoMerge "Refactor instance tests to share common code"
Jenkins [Thu, 2 May 2013 08:22:00 +0000 (08:22 +0000)]
Merge "Refactor instance tests to share common code"

12 years agoMerge "Enhance testcase for failed resource deletion"
Jenkins [Thu, 2 May 2013 08:11:32 +0000 (08:11 +0000)]
Merge "Enhance testcase for failed resource deletion"

12 years agoMerge "Remove all references to nose"
Jenkins [Thu, 2 May 2013 08:09:07 +0000 (08:09 +0000)]
Merge "Remove all references to nose"

12 years agoRefactor instance tests to share common code
Clint Byrum [Wed, 1 May 2013 19:28:40 +0000 (12:28 -0700)]
Refactor instance tests to share common code

Change-Id: I565f6aee43d07f3fc451538ca02f9398eedebaf3

12 years agoMerge "Fix warning about using os.tempnam in test suite."
Jenkins [Wed, 1 May 2013 23:43:08 +0000 (23:43 +0000)]
Merge "Fix warning about using os.tempnam in test suite."

12 years agoMerge "Fix "No handlers could be found" warnings"
Jenkins [Wed, 1 May 2013 23:41:44 +0000 (23:41 +0000)]
Merge "Fix "No handlers could be found" warnings"

12 years agoMerge "heat api : Update ec2token middleware for v4 signatures"
Jenkins [Wed, 1 May 2013 23:33:04 +0000 (23:33 +0000)]
Merge "heat api : Update ec2token middleware for v4 signatures"

12 years agoFix test_validate to run by itself
Clint Byrum [Wed, 1 May 2013 23:25:27 +0000 (16:25 -0700)]
Fix test_validate to run by itself

Resources were not initialized, so all tests would fail. Calls the same
method which is called internally to load all plugins.

Change-Id: I696f1d40499bb9a3ca6fde5d08101e9ddabc4369

12 years agoFix test_dbinstance not running by itself
Clint Byrum [Wed, 1 May 2013 23:19:25 +0000 (16:19 -0700)]
Fix test_dbinstance not running by itself

This test seems to need a clean copy of the db like many others. Call
setup_dummy_db to initialize so it runs reliably by itself.

Change-Id: I60fcd6b5c94659f16ef85ca3bdbd61417c59322b

12 years agoheat tests : run_tests.sh reinstate text coverage report
Steven Hardy [Wed, 1 May 2013 18:03:08 +0000 (19:03 +0100)]
heat tests : run_tests.sh reinstate text coverage report

testr migration removed the text CLI summary report, so add
it back in now for easy visibility of coverage results

Change-Id: I419b1a9ea45f391a2cf623ad4431c93982ae5231

12 years agoRemove all references to nose
Clint Byrum [Wed, 1 May 2013 17:33:30 +0000 (10:33 -0700)]
Remove all references to nose

Now that testtools and testr have replaced nose, trims all references
and removes nose from test-requires.

Change-Id: I0aae8fe2c09c5b25741226555838dc330d5c4d91

12 years agoheat api : Update ec2token middleware for v4 signatures
Steven Hardy [Mon, 8 Apr 2013 13:53:04 +0000 (14:53 +0100)]
heat api : Update ec2token middleware for v4 signatures

Update ec2token so it can verify v4 signature formats.

Note for v4 signatures to work you currently need to install
the latest python-keystoneclient, as no release yet contains
patch ref https://review.openstack.org/#/c/26013/

This change should be backwards compatible, as older keystoneclient
versions will simply ignore the additional request keys

fixes bug #1122472

Change-Id: Iccc6be7913ab5ca5813a2e0c8f66cda0ccd85a0b

12 years agoRemove unused jenkins arguments from tox.ini
Clint Byrum [Wed, 1 May 2013 16:39:34 +0000 (09:39 -0700)]
Remove unused jenkins arguments from tox.ini

These do not match the established testing patterns for OpenStack and
seem to be quite redundant. They also mention nosetests which is no
longer used.

Change-Id: I874a226b515f1a8ad24136eba81a40fc170435b9

12 years agoEnhance testcase for failed resource deletion
Andrew Plunk [Wed, 1 May 2013 16:02:11 +0000 (11:02 -0500)]
Enhance testcase for failed resource deletion

Verified that the test_access_key_no_user testcase
was valid for bug/1155824 and made a small enhancement
to verify the final resource state.

Change-Id: I63c6d1b37166b24cedd18bf6cae3d0aae0b18fa6
Implements: failed resource deletion testcase
Fixes: bug #1156375
12 years agoRetrieve the list of availability zones from nova in Fn::GetAZs
Thomas Herve [Tue, 30 Apr 2013 16:44:17 +0000 (18:44 +0200)]
Retrieve the list of availability zones from nova in Fn::GetAZs

Fixes: bug #1096001
Change-Id: Ie5c46ae038dff4f53ba8d722e878583044bd194c

12 years agoFix "No handlers could be found" warnings
Clint Byrum [Wed, 1 May 2013 07:59:03 +0000 (00:59 -0700)]
Fix "No handlers could be found" warnings

These warnings are caused because nothing is capturing log output in
their test cases. HeatTestCase automatically does this using the
FakeLogger fixture.

Change-Id: I7884c99cebc0c69f7675cdddd5e53de2e4b52c13

12 years agoFix warning about using os.tempnam in test suite.
Clint Byrum [Wed, 1 May 2013 07:52:02 +0000 (00:52 -0700)]
Fix warning about using os.tempnam in test suite.

Change-Id: Ibd725071ccdd9af951034685880f35ac678feae2

12 years agoMerge "heat docs: deprecate old GettingStarted guide"
Jenkins [Wed, 1 May 2013 02:15:15 +0000 (02:15 +0000)]
Merge "heat docs: deprecate old GettingStarted guide"

12 years agoRemove unused skip_unless and skip_test decorators
Clint Byrum [Sun, 28 Apr 2013 16:48:43 +0000 (09:48 -0700)]
Remove unused skip_unless and skip_test decorators

Change-Id: I1519fc4b3b827ef35352968b67759b0b5d3fd5f2

12 years agoRemove unused and outdated heat/testing dir
Clint Byrum [Sat, 27 Apr 2013 15:43:23 +0000 (08:43 -0700)]
Remove unused and outdated heat/testing dir

The descriptions of testing are not in line with the test suite as it is
today, and none of the code there is actually used.

Change-Id: I717015184fea53d40fc8bd6782dcf4eb8a8520d4

12 years agoRe-work run_tests.sh to call testr instead of nose
Clint Byrum [Sat, 27 Apr 2013 15:37:41 +0000 (08:37 -0700)]
Re-work run_tests.sh to call testr instead of nose

Running testr directly or running the tests in tox are the preferred
method at this point, but developers may still have automation around
run_tests.sh.

Change-Id: I5cd8a0e6bcee192440bdbc072dbd560615130def

12 years agoRemove broken --doctest call from run_pep8.sh
Clint Byrum [Sat, 27 Apr 2013 15:37:00 +0000 (08:37 -0700)]
Remove broken --doctest call from run_pep8.sh

It does not seem to actually be required and causes the script to fail
when not running inside tox.

Change-Id: Ib5be301054b08623ea31a97c1b2d6c341e7fdd3e

12 years agoRemove use of nose attrib plugin and most unittest
Clint Byrum [Fri, 26 Apr 2013 22:49:33 +0000 (15:49 -0700)]
Remove use of nose attrib plugin and most unittest

Some simple cases that do not use mox still use unittest directly.
Replacing unittest.TestCase with HeatTestCase has the added benefit of
capturing all logging for reporting during failure.

Change-Id: I76192bdb91822055f1e2f7d2e806bf094d399304

12 years agoRemoving all prints and capturing logging
Clint Byrum [Thu, 25 Apr 2013 23:33:48 +0000 (16:33 -0700)]
Removing all prints and capturing logging

A new base class for tests is used to reduce repetitive steps used in
a majority of tests. This new base class also uses fixtures.FakeLogger
to suppress logging, though it will be shown on any failures to aid in
debugging the failure.

Prints that happen on normal operation of the test suite are all removed
as they are not needed and only clutter the output.

Change-Id: I0365283ce415c5390fd68bdf1f0b3c8038b1b9af

12 years agoRemove functional tests in preferece for tempest
Clint Byrum [Thu, 25 Apr 2013 23:17:24 +0000 (16:17 -0700)]
Remove functional tests in preferece for tempest

These tests are not unit tests, and take a long time. They are being
moved into tempest, which is where integration/functional tests live in
OpenStack.

Change-Id: Ida7792a00a8565f812c55da448d8c50a8b8a90b9

12 years agoRemove examples and update testing-overview.txt
Clint Byrum [Thu, 25 Apr 2013 23:16:20 +0000 (16:16 -0700)]
Remove examples and update testing-overview.txt

With the migration to testrepository, many of the instructions are
obsolete. Also the examples are not needed as we have plenty of fine
examples available in the code itself.

Change-Id: I87524eaab4c39ea75d7e53fb11ffe103d5339cc3

12 years agoUse testr for running gate tests
Clint Byrum [Thu, 25 Apr 2013 03:07:37 +0000 (20:07 -0700)]
Use testr for running gate tests

Fixes bug 1172468

Change-Id: Ifd87e44d752b4b3c77b4ea8f38feceb03bccaebe

12 years agoEnable running tests via testr
Clint Byrum [Thu, 25 Apr 2013 00:30:35 +0000 (17:30 -0700)]
Enable running tests via testr

This also disables the functional tests from running. The code is still
left here for posterity. These are intended to be moved into tempest
test cases and thus will be removed entirely at that time.

Change-Id: I294671baead6e83a8312b41681e99d395f861209

12 years agoMerge "Make Resource.create() a co-routine"
Jenkins [Tue, 30 Apr 2013 19:59:48 +0000 (19:59 +0000)]
Merge "Make Resource.create() a co-routine"

12 years agoMerge "heat docs : Update jeos building documentation"
Jenkins [Tue, 30 Apr 2013 19:59:43 +0000 (19:59 +0000)]
Merge "heat docs : Update jeos building documentation"

12 years agoMake Resource.create() a co-routine
Zane Bitter [Tue, 30 Apr 2013 17:28:32 +0000 (19:28 +0200)]
Make Resource.create() a co-routine

At the moment, we will just run each co-routine to completion, but in
future we can use this to return control to the caller so that resources
may be created in parallel.

Change-Id: I5c2daf3839e53d855acb73fc4288b5be76794c7f

12 years agoMerge "Add a scheduler module"
Jenkins [Tue, 30 Apr 2013 16:54:41 +0000 (16:54 +0000)]
Merge "Add a scheduler module"

12 years agoMerge "heat api: fix ec2token authentication"
Jenkins [Tue, 30 Apr 2013 16:35:34 +0000 (16:35 +0000)]
Merge "heat api: fix ec2token authentication"

12 years agoheat docs: deprecate old GettingStarted guide
Steven Hardy [Mon, 29 Apr 2013 17:05:22 +0000 (18:05 +0100)]
heat docs: deprecate old GettingStarted guide

Remove content of the old GettingStarted guide and replace with
a link to the new docs location

Change-Id: I6af2b3bef05f920a9df77e4ec94b7c3c2dfbb68c

12 years agoheat docs : Update jeos building documentation
Steven Hardy [Mon, 29 Apr 2013 17:00:19 +0000 (18:00 +0100)]
heat docs : Update jeos building documentation

Replace references to heat-jeos with documentation describing the
use of the new heat-templates/tools/heat-jeos.sh example script

fixes bug #1171602

Change-Id: I88fd2a5667cccd79a77c4a663c782fb537279fac

12 years agoMerge "Update tools/integration.sh script to new docs tree"
Jenkins [Tue, 30 Apr 2013 10:00:47 +0000 (10:00 +0000)]
Merge "Update tools/integration.sh script to new docs tree"

12 years agoMerge "Validate properties against the schema in validate_template"
Jenkins [Tue, 30 Apr 2013 09:51:37 +0000 (09:51 +0000)]
Merge "Validate properties against the schema in validate_template"

12 years agoheat api: fix ec2token authentication
Steven Hardy [Tue, 30 Apr 2013 09:38:04 +0000 (10:38 +0100)]
heat api: fix ec2token authentication

Since the change merged from https://review.openstack.org/#/c/27383/
ec2token auth no longer works, because there is a mismatch between
the config file section name and the section specified in ec2token

fixes bug #1174673

Change-Id: I5c0465de5c023f587b677b10717ca3a08ba411b7

12 years agoRemove pyflakes_bypass
Clint Byrum [Mon, 22 Apr 2013 18:03:18 +0000 (11:03 -0700)]
Remove pyflakes_bypass

There are valid pythonic ways to address all of the complaints that
pyflakes made in the past.

Fixes bug #1171420

Change-Id: Idf145185ebb4df237fff887365fa0c48d3603025

12 years agoFix DB sync script
Zane Bitter [Mon, 29 Apr 2013 17:30:13 +0000 (19:30 +0200)]
Fix DB sync script

Broken by a60f6d45693c8a0d70f78a0fa9216a8c54c062e7, since we don't
import the db api into heat.db any more.

Change-Id: If5175ae84c9da0c8787a162a549b727381c6fbd6

12 years agoUpdate tools/integration.sh script to new docs tree
Steven Hardy [Mon, 29 Apr 2013 16:20:41 +0000 (17:20 +0100)]
Update tools/integration.sh script to new docs tree

Update location to refer to the new fedora getting started guide

Change-Id: I507e1102a1979debd975fa6601e5385b1a47a756

12 years agoValidate properties against the schema in validate_template
Thomas Herve [Mon, 29 Apr 2013 15:21:42 +0000 (17:21 +0200)]
Validate properties against the schema in validate_template

Change-Id: I81457d8d363226b90b2a878ec2c93f88b376dc83
Fixes: bug #1154722
12 years agoheat engine : register options before using them
Steven Hardy [Mon, 29 Apr 2013 12:46:57 +0000 (13:46 +0100)]
heat engine : register options before using them

Fix regression caused by the __init__.py refactoring, which means
we try to use cfg.CONF.host before registering it.

fixes bug #1174302

Change-Id: Iff4d75f53e242d7df8c7071cbeeead034a7ad9b0

12 years agoMerge "Do not initialize anything during import phase"
Jenkins [Mon, 29 Apr 2013 11:59:25 +0000 (11:59 +0000)]
Merge "Do not initialize anything during import phase"

12 years agoAdd a scheduler module
Zane Bitter [Mon, 29 Apr 2013 09:28:37 +0000 (11:28 +0200)]
Add a scheduler module

Utility routines for running coroutine-based tasks.

Change-Id: I907d889a564a1118b7c9caa30f3ad65dfac76534

12 years agoRemove engine_topic configuration option
Mark McLoughlin [Sat, 27 Apr 2013 12:20:04 +0000 (13:20 +0100)]
Remove engine_topic configuration option

Fixes bug #1173575

This is currently broken since heat-engine always listens to the
'engine' topic and there isn't actually a good use case for this to be
configurable, so let's kill it.

Change-Id: I35c0292c921f81857f80a7f111df5ac330d54ecf

12 years agoSend RPCs to 'engine' topic not 'engine.$host'
Mark McLoughlin [Sat, 27 Apr 2013 12:08:52 +0000 (13:08 +0100)]
Send RPCs to 'engine' topic not 'engine.$host'

Fixes bug #1173573

We currently send engine RPCs to the 'engine.$host' topic means that
it is impossible to run heat-api and heat-engine on different
machines because you can't configure heat-api with the hostname of
heat-engine.

Fix this simply by sending RPCs to 'engine' which heat-engine. We have
always listened on this topic, so there is no backwards compat
concerns.

This is somewhat related to the multiple-engines blueprint, but
doesn't really help or hinder it.

Change-Id: Ibd4dc948ace4476bfa8e7fdc86e948a622416e58

12 years agoMerge "Consolidated api-paste.ini file"
Jenkins [Fri, 26 Apr 2013 03:54:43 +0000 (03:54 +0000)]
Merge "Consolidated api-paste.ini file"

12 years agoMerge "Propagate deletion errors with exceptions"
Jenkins [Fri, 26 Apr 2013 03:54:40 +0000 (03:54 +0000)]
Merge "Propagate deletion errors with exceptions"

12 years agoMerge "Mock delete_network in Quantum unit tests"
Jenkins [Fri, 26 Apr 2013 03:54:36 +0000 (03:54 +0000)]
Merge "Mock delete_network in Quantum unit tests"

12 years agoMerge "Mark resources as failed when creation aborted"
Jenkins [Fri, 26 Apr 2013 03:54:34 +0000 (03:54 +0000)]
Merge "Mark resources as failed when creation aborted"

12 years agoMerge "Propagate creation errors with exceptions"
Jenkins [Fri, 26 Apr 2013 03:54:32 +0000 (03:54 +0000)]
Merge "Propagate creation errors with exceptions"

12 years agoMerge "Move ec2token defaults from paste.ini to .conf"
Jenkins [Wed, 24 Apr 2013 18:39:23 +0000 (18:39 +0000)]
Merge "Move ec2token defaults from paste.ini to .conf"

12 years agoMerge "Optionally allow ec2token config to come from .conf"
Jenkins [Wed, 24 Apr 2013 18:29:25 +0000 (18:29 +0000)]
Merge "Optionally allow ec2token config to come from .conf"

12 years agoDo not initialize anything during import phase
Clint Byrum [Tue, 23 Apr 2013 22:51:57 +0000 (15:51 -0700)]
Do not initialize anything during import phase

The structure of the program is compromised by doing too much logic in
the import phase. We can read the code more cleanly if we can see where
the intended initialization code is called. This may make tests slightly
more tedious to write, but that should be handled by writing generic
fixtures which can be reused for exactly this purpose.

Change-Id: I1d221e2f90d1f6e89717a37d2128caabd077d30a

12 years agoConsolidated api-paste.ini file
Steve Baker [Sat, 13 Apr 2013 17:14:11 +0000 (10:14 -0700)]
Consolidated api-paste.ini file

Load a single api-paste.ini file, specified by config
Delete unused paste.ini files
Update docs for new paste.ini and config arrangement

There will be a corresponding devstack change, and once this is in
I will email the packagers on the packaging implications

Change-Id: Ic10b1a486094d15bfd832f0f934e6268ec323085

12 years agoMove ec2token defaults from paste.ini to .conf
Steve Baker [Fri, 12 Apr 2013 22:48:24 +0000 (08:48 +1000)]
Move ec2token defaults from paste.ini to .conf

paste.ini files can now be considered not user-editable
(in normal circumstances)

Change-Id: Ia2a6d784ed2fad009de9e77717e6e0dc00c5e2f4

12 years agoOptionally allow ec2token config to come from .conf
Steve Baker [Fri, 12 Apr 2013 22:46:35 +0000 (08:46 +1000)]
Optionally allow ec2token config to come from .conf

Just like keystoneclient.middleware.auth_token
first checks paste.ini file then .conf file when fetching
a config value

Change-Id: I9db9744d0ab12fcf486de9a9d3f8e870a4ff66de

12 years agoPropagate deletion errors with exceptions
Zane Bitter [Tue, 23 Apr 2013 11:36:47 +0000 (13:36 +0200)]
Propagate deletion errors with exceptions

Change-Id: Ib8380f6d985e328c56d53b326700d6c9df636f40

12 years agoMock delete_network in Quantum unit tests
Zane Bitter [Tue, 23 Apr 2013 11:36:47 +0000 (13:36 +0200)]
Mock delete_network in Quantum unit tests

Change-Id: I0a1f0e56ed84aa4efcdf7c65c7c634f738bdddda

12 years agoMark resources as failed when creation aborted
Zane Bitter [Tue, 23 Apr 2013 11:36:47 +0000 (13:36 +0200)]
Mark resources as failed when creation aborted

Previously resources would be left in the CREATE_IN_PROGRESS state in the
event of a timeout or the thread being cancelled (due to a delete being
requested while the stack was still being created). We should instead put
these resources into the CREATE_FAILED state when this occurs, thus
creating an event with the reason.

Change-Id: I05956aa9ef26941b79cef9dbf0cb6a347047d199

12 years agoPropagate creation errors with exceptions
Zane Bitter [Tue, 23 Apr 2013 11:36:47 +0000 (13:36 +0200)]
Propagate creation errors with exceptions

Change-Id: I567f1901e1203930d282620112368ac32440b9ed

12 years agoAssert on Resource double-create()
Zane Bitter [Tue, 23 Apr 2013 11:36:47 +0000 (13:36 +0200)]
Assert on Resource double-create()

There's no valid case in which we should be creating a resource multiple
times.

Change-Id: Id90edd3a09ec15d3814a322ac0b7ec75fd0be54a

12 years agoFix issues with EIP unit test
Zane Bitter [Tue, 23 Apr 2013 11:36:46 +0000 (13:36 +0200)]
Fix issues with EIP unit test

The resource was not being destroyed correctly, but errors were ignored.

Change-Id: I1caa9d092f58f458bd6da46f4cba4ad027b1fd38

12 years agoGet rid of create state in Instance
Zane Bitter [Tue, 23 Apr 2013 11:21:28 +0000 (13:21 +0200)]
Get rid of create state in Instance

We don't want to store any state in the Instance object, instead take
advantage of the new mechanism whereby the result of handle_create() is
passed to check_active().

This makes the autoscaling code uglier for now (since it must still store
the instance state in the instance), but this will go away when we move to
using co-routines to create resources in parallel.

Change-Id: Ib11c8da22900453eb9713eba5106859c8a09dbe2

12 years agoMerge "Clean up metadata refresh unit test"
Jenkins [Tue, 23 Apr 2013 10:59:47 +0000 (10:59 +0000)]
Merge "Clean up metadata refresh unit test"

12 years agoMerge "Get rid of create state in Autoscaling"
Jenkins [Tue, 23 Apr 2013 10:59:45 +0000 (10:59 +0000)]
Merge "Get rid of create state in Autoscaling"

12 years agoMerge "Fix pyflakes-bypass for PyFlakes 0.7"
Jenkins [Tue, 23 Apr 2013 10:31:00 +0000 (10:31 +0000)]
Merge "Fix pyflakes-bypass for PyFlakes 0.7"

12 years agoRemove service _user, _password, _tenant from context
Steve Baker [Mon, 8 Apr 2013 03:47:46 +0000 (15:47 +1200)]
Remove service _user, _password, _tenant from context

These are not currently used anywhere in heat-engine, and I'm
not comfortable with the service password going over the (controller)
network.

If heat-engine needs access to these in the future then they can always
be configured in heat-engine.conf, or the operation can be performed
in the api and the results put into the context.

Change-Id: I81aab6b5a2c9aa7d6412531f70108857cbfa637b

12 years agoMove heat-api auth_token conf from paste.ini
Steve Baker [Tue, 2 Apr 2013 23:29:50 +0000 (12:29 +1300)]
Move heat-api auth_token conf from paste.ini

keystone auth_token middleware now allows heat to have auth_token
configuration in heat-api.conf. Moves the example of
auth_token configuration from heat-api-paste.ini to heat-api.conf.
This simplifies user configuations and users is no longer required
to edit heat-api-paste.ini.

This does not break backward compatibility. auth_token first
tries the configurations in /etc/heat/heat-api-paste.ini and then the
above configurations. Thus a user who already uses heat-api-paste.ini
does not need to change it.

Change-Id: Ia0a4d912cd7380094e121ee4af733277ca4d812e
Blueprint: keystone-middleware

12 years agoSubclass keystone middleware to set headers
Steve Baker [Mon, 8 Apr 2013 03:35:55 +0000 (15:35 +1200)]
Subclass keystone middleware to set headers

Replace old forked auth_token with a subclass
of keystoneclient middleware.

The advantages of moving to keystoneclient middleware:
- can use v3 (or v2) keystone api
- PKI tokens
- token revocation

The subclass sets the following headers to be consumed by our
request context filter:
- X-Admin-User
- X-Admin-Pass
- X-Admin-Tenant-Name
- X-Auth-Url

The need to override _build_user_headers should be a short-term thing,
X-Admin-* isn't actually used currently, and there are a few options
that need to be discussed for getting X-Auth-Url to the engine.

Change-Id: Iacc5046fbf559724a4ae0bd6091d662e23d65544
Blueprint: keystone-middleware

12 years agoImprove Python 3.x compatibility
Dirk Mueller [Mon, 22 Apr 2013 22:12:22 +0000 (00:12 +0200)]
Improve Python 3.x compatibility

Mechanical translation of the deprecated except x,y:
construct. the except x as y: construct works with
all python 2.6+ versions

Change-Id: Iad349b8079a01bbd66a22800ae2fcdfcde03b377

12 years agoFix pyflakes-bypass for PyFlakes 0.7
Zane Bitter [Mon, 22 Apr 2013 16:24:56 +0000 (18:24 +0200)]
Fix pyflakes-bypass for PyFlakes 0.7

Don't make assumptions about argument types, get the line number from the
message object.

Fixes bug #1171420

Change-Id: Id0b1b254a1561941dea8ab5bb23aea1f936e7f0b