]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
11 years agoMerge "Add initial suspend logic to engine"
Jenkins [Tue, 25 Jun 2013 15:10:59 +0000 (15:10 +0000)]
Merge "Add initial suspend logic to engine"

11 years agoMerge "Use print_function compatible syntax"
Jenkins [Tue, 25 Jun 2013 01:57:54 +0000 (01:57 +0000)]
Merge "Use print_function compatible syntax"

11 years agoMerge "Adding common base class for Rackspace Resource providers"
Jenkins [Tue, 25 Jun 2013 00:20:42 +0000 (00:20 +0000)]
Merge "Adding common base class for Rackspace Resource providers"

12 years agoAdd initial suspend logic to engine
Steven Hardy [Wed, 15 May 2013 18:01:39 +0000 (19:01 +0100)]
Add initial suspend logic to engine

blueprint: stack-suspend-resume
Change-Id: Icf81672534de6b07d938785e659b7f6c733eacc4

12 years agoUse print_function compatible syntax
Dirk Mueller [Mon, 24 Jun 2013 13:41:51 +0000 (15:41 +0200)]
Use print_function compatible syntax

This changes the code to use a python 3.x compatible
print function syntax (or import from __future__ where
necessary)

Change-Id: Ia1f19d0ac082853d25c7c9b754b440469c0526eb

12 years agoMerge "Fixup some trivial license header mismatches"
Jenkins [Mon, 24 Jun 2013 10:44:06 +0000 (10:44 +0000)]
Merge "Fixup some trivial license header mismatches"

12 years agoMerge "Emit alarm actions if a rule remains in ALARM state."
Jenkins [Mon, 24 Jun 2013 10:42:12 +0000 (10:42 +0000)]
Merge "Emit alarm actions if a rule remains in ALARM state."

12 years agoMerge "make stack creation return json response"
Jenkins [Mon, 24 Jun 2013 09:16:25 +0000 (09:16 +0000)]
Merge "make stack creation return json response"

12 years agoEmit alarm actions if a rule remains in ALARM state.
Steve Baker [Mon, 24 Jun 2013 02:19:36 +0000 (14:19 +1200)]
Emit alarm actions if a rule remains in ALARM state.

It looks like the original intent of this edge-triggering was to
prevent actions being emitted too frequently, causing overshoot of
scaling resources.

However this causes an issue when one scaling resource change is not
enough to bring the alarm state under the threshold.

Proper use of Period, EvaluationPeriods and Threshold should be sufficient
to prevent scaling resource overshoot.

Fixes bug: #1193970

Change-Id: I5b38eb82cd1ad568fe4af77999e9d52f9eb99328

12 years agoFixup some trivial license header mismatches
Dirk Mueller [Sun, 23 Jun 2013 18:57:04 +0000 (20:57 +0200)]
Fixup some trivial license header mismatches

Newer Hacking releases are pedantic about the
license header. Fix up the trivial mismatch.

Change-Id: I418222734303b8578ab0b34b8eb044d9543fc888

12 years agoAdding common base class for Rackspace Resource providers
Vijendar Komalla [Thu, 20 Jun 2013 17:09:02 +0000 (12:09 -0500)]
Adding common base class for Rackspace Resource providers

Change-Id: If7d15e01c53fb6db4bdee5759b0ef4f087640c58

12 years agoMerge "Unrestricted username length causing error."
Jenkins [Fri, 21 Jun 2013 11:27:01 +0000 (11:27 +0000)]
Merge "Unrestricted username length causing error."

12 years agoMerge "Add VerifyAll to test methods using mox."
Jenkins [Fri, 21 Jun 2013 07:35:27 +0000 (07:35 +0000)]
Merge "Add VerifyAll to test methods using mox."

12 years agomake stack creation return json response
Liang Chen [Mon, 17 Jun 2013 10:19:15 +0000 (18:19 +0800)]
make stack creation return json response

added a serializer to handle create response serialization

fixes bug #1187883

Change-Id: Ibdeb8b810d759901979becb8b29bdc337f2f5bec

12 years agoMerge "Give alarm a physical_resource_name which need no id."
Jenkins [Fri, 21 Jun 2013 01:37:56 +0000 (01:37 +0000)]
Merge "Give alarm a physical_resource_name which need no id."

12 years agoMerge "Fix BaseException.message DeprecationWarning"
Jenkins [Fri, 21 Jun 2013 01:37:49 +0000 (01:37 +0000)]
Merge "Fix BaseException.message DeprecationWarning"

12 years agoGive alarm a physical_resource_name which need no id.
Steve Baker [Fri, 21 Jun 2013 00:21:51 +0000 (12:21 +1200)]
Give alarm a physical_resource_name which need no id.

This restores previous behaviour, including workarounds for
circular dependencies.

Fixes bug: #1192814

Change-Id: I33e8e4d7806fb397553944dbd6ebb85b575b9cb5

12 years agoDo not refresh timestamp from database on read.
Steve Baker [Thu, 20 Jun 2013 22:18:37 +0000 (10:18 +1200)]
Do not refresh timestamp from database on read.

Doing a database refresh on timestamp read is causing errors
such as:
heat.openstack.common.rpc.amqp InvalidRequestError:
  Could not refresh instance '<Stack at 0x2c95a90>'

This has only been seen using postgres, possibly because the problem is
being masked on mysql due to the driver's lack of concurrency.

The database refresh seems to be unnecessary, as there appears to be
no logic which depends on timestamps being accurate (nor is there
any timestamp comparison logic at all)

Fixes bug: #1193132
Change-Id: I22c3c4546a0f44b76a95e473b68b6fbb2e423b90

12 years agoUnrestricted username length causing error.
Andrew Plunk [Thu, 20 Jun 2013 15:02:37 +0000 (10:02 -0500)]
Unrestricted username length causing error.

When we tried to create a username in keystone with
a length > 64 characters, an error was being raised.
Only use the first 64 characters of the dynamically
generated name in this case.

Change-Id: I5a5f863d721da8d187facb48230aeab251c7d240

12 years agoAdd VerifyAll to test methods using mox.
Randall Burt [Thu, 20 Jun 2013 01:38:38 +0000 (20:38 -0500)]
Add VerifyAll to test methods using mox.

Missed this comment in an earlier review.

Change-Id: If9737a03ba003331d0e20288e3bbc09002c6dbdb

12 years agoMerge "Fix and enable H303 and F403 No wildcard (*) import."
Jenkins [Thu, 20 Jun 2013 14:13:14 +0000 (14:13 +0000)]
Merge "Fix and enable H303 and F403  No wildcard (*) import."

12 years agoFix BaseException.message DeprecationWarning
Steven Hardy [Wed, 19 Jun 2013 13:27:00 +0000 (14:27 +0100)]
Fix BaseException.message DeprecationWarning

https://review.openstack.org/#/c/32154/ introduces a deprecated
TypeError.message reference, which won't work in python3 and
causes a DeprecationWarning to be output on >= python 2.6

Change-Id: Ibd11d4ad6b82e96ede8f38fe76112bd71e98c5c9

12 years agoMerge "Updated common module from oslo"
Jenkins [Thu, 20 Jun 2013 10:30:48 +0000 (10:30 +0000)]
Merge "Updated common module from oslo"

12 years agoFix one of the last stack.state's -> status
Angus Salkeld [Thu, 20 Jun 2013 06:56:04 +0000 (16:56 +1000)]
Fix one of the last stack.state's -> status

Change-Id: I3a246c472371ef6ca4c34f358ebecfe79b9eaa88
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoRevert "check content type in JSONRequestDeserializer"
Steve Baker [Thu, 20 Jun 2013 02:47:01 +0000 (14:47 +1200)]
Revert "check content type in JSONRequestDeserializer"

For details of the regression this caused see
bug: #1187882

This reverts commit 2f35c942e34b6c6538a2ae2da3d01b690af3a47f.

Change-Id: Ib739d271f5caf0e8ce26c3b27a3436a20e9e311d

12 years agoMerge "Implement attribute schema for resources"
Jenkins [Thu, 20 Jun 2013 01:58:52 +0000 (01:58 +0000)]
Merge "Implement attribute schema for resources"

12 years agoFix and enable H303 and F403 No wildcard (*) import.
Angus Salkeld [Thu, 20 Jun 2013 01:52:53 +0000 (11:52 +1000)]
Fix and enable H303 and F403  No wildcard (*) import.

F403 is related the message is:
F403 'from bla import *' used; unable to detect undefined names

Change-Id: I486c0b2fc15a616e3fdf1e7e2eaeae1e45075537

12 years agoImplement attribute schema for resources
Randall Burt [Thu, 13 Jun 2013 17:58:29 +0000 (12:58 -0500)]
Implement attribute schema for resources

Similar to properties, adds attribute_schema and attributes members to
Resources in order to facilitate document generation and template
provider stubs for resources.

Change-Id: Ie858fc71a91078e14af552d8cafe0f2448f5d2b8
Implements: blueprint attributes-schema

12 years agoMerge "Introduce a schema for attributes"
Jenkins [Wed, 19 Jun 2013 23:46:15 +0000 (23:46 +0000)]
Merge "Introduce a schema for attributes"

12 years agoMerge "Convert Stack to separate action/status"
Jenkins [Wed, 19 Jun 2013 23:46:08 +0000 (23:46 +0000)]
Merge "Convert Stack to separate action/status"

12 years agoIntroduce a schema for attributes
Randall Burt [Thu, 13 Jun 2013 17:41:50 +0000 (12:41 -0500)]
Introduce a schema for attributes

Similar to properties, adds attribute_schema and attributes members to
Resources in order to facilitate document generation and template
provider stubs for resources.

Change-Id: I5e207360816fbc685c66db68a7fab8afad11bf10
Implements: blueprint attributes-schema

12 years agoRestore babel setup config options
Matt Riedemann [Wed, 19 Jun 2013 19:35:14 +0000 (12:35 -0700)]
Restore babel setup config options

Restore the babel configuration values from setup.cfg before the pbr
change so that you can compile the message catalog using "python
setup.py compile_catalog" again.

Fixes bug 1192685

Change-Id: I6db624940b7b8017700e8d2bc7ba56ba4295f091

12 years agoMerge "Add dependency between FloatingIP and RouterGateway"
Jenkins [Wed, 19 Jun 2013 17:46:43 +0000 (17:46 +0000)]
Merge "Add dependency between FloatingIP and RouterGateway"

12 years agoMerge "Initial provider template uploading"
Jenkins [Wed, 19 Jun 2013 17:46:18 +0000 (17:46 +0000)]
Merge "Initial provider template uploading"

12 years agoMerge "check content type in JSONRequestDeserializer"
Jenkins [Wed, 19 Jun 2013 17:44:22 +0000 (17:44 +0000)]
Merge "check content type in JSONRequestDeserializer"

12 years agoConvert Stack to separate action/status
Steven Hardy [Tue, 18 Jun 2013 17:07:57 +0000 (18:07 +0100)]
Convert Stack to separate action/status

Next and hopefully final step in decoupling action/status

This adjusts the Stack DB columns, model and class to be consistent with
Event/Resource, and split action/status.  This also modifies the both
APIs to join the action/status to avoid changing the API

Change-Id: Ifbdf254c62cad271b775b88de5b873f4e0b6d736

12 years agoUpdated common module from oslo
guohliu [Wed, 19 Jun 2013 12:18:39 +0000 (20:18 +0800)]
Updated common module from oslo

This patch updated common module from oslo for known issue.

Fixed bug: #1175808
Fixed bug: #1072917

Change-Id: Ic1de6b786a9d67b39d186e31a37049729d367464

12 years agoMerge "Detect failed instance creation in autoscaling"
Jenkins [Wed, 19 Jun 2013 11:44:56 +0000 (11:44 +0000)]
Merge "Detect failed instance creation in autoscaling"

12 years agoMerge "scheduler: Simplify DependencyTaskGroup interface"
Jenkins [Wed, 19 Jun 2013 09:49:45 +0000 (09:49 +0000)]
Merge "scheduler: Simplify DependencyTaskGroup interface"

12 years agoInitial provider template uploading
Angus Salkeld [Wed, 19 Jun 2013 08:54:51 +0000 (18:54 +1000)]
Initial provider template uploading

blueprint provider-upload
Change-Id: Iee475c6cccaa7ab87c630036cff120f46ab42103

12 years agocheck content type in JSONRequestDeserializer
Zhang Lei (Sneeze) [Wed, 19 Jun 2013 08:26:45 +0000 (16:26 +0800)]
check content type in JSONRequestDeserializer

Fixed Bug #1187882

Change-Id: I67dc20bddff570e7b9cf43093e06509a20aa9b60

12 years agoDetect failed instance creation in autoscaling
Thomas Herve [Wed, 19 Jun 2013 07:17:48 +0000 (09:17 +0200)]
Detect failed instance creation in autoscaling

Wait for instances to be created sucessfully before adding them to the
list in the Autoscaling resource.

Fixes: bug #1192125
Change-Id: Ie8676c23de5a62d3b8b2b4088b67d249ae90ceef

12 years agoMerge "Support cloud-specific suffixes to server status."
Jenkins [Tue, 18 Jun 2013 23:22:17 +0000 (23:22 +0000)]
Merge "Support cloud-specific suffixes to server status."

12 years agoMerge "Cleanup the doc strings in heat/rpc/client.py"
Jenkins [Tue, 18 Jun 2013 23:05:34 +0000 (23:05 +0000)]
Merge "Cleanup the doc strings in heat/rpc/client.py"

12 years agoMerge "API support for Environments"
Jenkins [Tue, 18 Jun 2013 23:05:27 +0000 (23:05 +0000)]
Merge "API support for Environments"

12 years agoMerge "Make template_format.parse usable by environments"
Jenkins [Tue, 18 Jun 2013 23:05:19 +0000 (23:05 +0000)]
Merge "Make template_format.parse usable by environments"

12 years agoMerge "Remove unused parameter.user_parameters()"
Jenkins [Tue, 18 Jun 2013 23:05:12 +0000 (23:05 +0000)]
Merge "Remove unused parameter.user_parameters()"

12 years agoMerge "Use the Environment from within the engine"
Jenkins [Tue, 18 Jun 2013 23:05:10 +0000 (23:05 +0000)]
Merge "Use the Environment from within the engine"

12 years agoMerge "Add a Fn::Split function to aid provider templates"
Jenkins [Tue, 18 Jun 2013 21:03:56 +0000 (21:03 +0000)]
Merge "Add a Fn::Split function to aid provider templates"

12 years agoMerge "suppress and log API internal exceptions"
Jenkins [Tue, 18 Jun 2013 20:18:19 +0000 (20:18 +0000)]
Merge "suppress and log API internal exceptions"

12 years agoSupport cloud-specific suffixes to server status.
Monty Taylor [Mon, 17 Jun 2013 21:34:33 +0000 (17:34 -0400)]
Support cloud-specific suffixes to server status.

Some clouds, *cough*HP*cough* append extra data to their
status strings. Such as: BUILD(scheduling) or BUILD(networking).
We don't really want to be on the hook for keeping a list of those,
but if we just grab the bit in front of the parenthetical, we should
be able to tell state sensibly, even when people are being weird.

Change-Id: Idaf079d6090db50c9041f398a257b427d63ff48d

12 years agoMerge "scheduler: Improve task descriptions in debug logs"
Jenkins [Tue, 18 Jun 2013 18:12:46 +0000 (18:12 +0000)]
Merge "scheduler: Improve task descriptions in debug logs"

12 years agoautoscaling fix LoadBalancer reload static resolve
Steven Hardy [Mon, 17 Jun 2013 14:54:51 +0000 (15:54 +0100)]
autoscaling fix LoadBalancer reload static resolve

Since https://review.openstack.org/#/c/31083/ we're using the
Resource.update() method to update the LoadBalancer, which requires
the resource snippet to be statically resolved (as is done in
parser.Stack for stack updates)

Fixes bug #1191705

Change-Id: Id2017a912472ddb48245682c5b6392cbcb9e4c60

12 years agoReturn None for physical resource name during validation
Zane Bitter [Tue, 18 Jun 2013 08:41:40 +0000 (10:41 +0200)]
Return None for physical resource name during validation

During template validation, the resources have not been stored in the
database. Therefore any resources that return self.physical_resource_name()
in either FnGetRef() or FnGetAtt() would cause assertions whenever either
of those functions were called during validation. Instead, return None from
physical_resource_name() in this phase, as we do for other data that is not
available yet during validation.

Fixes bug #1191931

Change-Id: I1a5b17557ae1ca2600fb930e74eb5248c82e0326

12 years agoStandardise resource names in Invalid Attribute errors
Zane Bitter [Tue, 18 Jun 2013 08:25:52 +0000 (10:25 +0200)]
Standardise resource names in Invalid Attribute errors

These should always refer to the resource name in the template (i.e.
logical resource name), and never the physcial resource name (since these
errors necessarily occur during validation, before any physical resource is
created).

Change-Id: I6cf6625cf32a90acb27adc6348695c086dc5e119

12 years agoMerge "Add InstanceId property to EIP resource"
Jenkins [Tue, 18 Jun 2013 03:11:00 +0000 (03:11 +0000)]
Merge "Add InstanceId property to EIP resource"

12 years agosuppress and log API internal exceptions
Liang Chen [Fri, 7 Jun 2013 15:01:02 +0000 (23:01 +0800)]
suppress and log API internal exceptions

add a context manager to handle exceptions generated by API
implementation methods or their decorators

Fixes bug #1187881

Change-Id: I4bd75e1e13f8327aaf2283380bf165a57a11ed8c

12 years agoMerge "engine : abstract state-transition logic"
Jenkins [Tue, 18 Jun 2013 01:05:13 +0000 (01:05 +0000)]
Merge "engine : abstract state-transition logic"

12 years agoMerge "Convert Resource to separate action/status"
Jenkins [Tue, 18 Jun 2013 01:05:09 +0000 (01:05 +0000)]
Merge "Convert Resource to separate action/status"

12 years agoAdd a Fn::Split function to aid provider templates
Angus Salkeld [Tue, 18 Jun 2013 00:15:41 +0000 (10:15 +1000)]
Add a Fn::Split function to aid provider templates

This needed to convert a parameter in CommaDelimedList into
a property of type List.

part of blueprint provider-resource
Change-Id: Id77a2c6be47427360a2be89ca1fea3c097807bac

12 years agoAdd dependency between FloatingIP and RouterGateway
Steve Baker [Tue, 21 May 2013 01:21:22 +0000 (13:21 +1200)]
Add dependency between FloatingIP and RouterGateway

When a template has a FloatingIP and a RouterGateway on the same
external network, there is an implicit dependency on create where
the gateway must be created before the floating ip.

This is implemented by overiding add_dependencies in FloatingIP
and looking in the stack for RouterGateway resource to depend on.

Fixed bug: #1182266

Change-Id: I40f281e5bf2a27280d328fe11d32e6404f412a79

12 years agoMerge "Initial Environment class and test"
Jenkins [Mon, 17 Jun 2013 17:01:50 +0000 (17:01 +0000)]
Merge "Initial Environment class and test"

12 years agoAdd InstanceId property to EIP resource
Jeff Peeler [Mon, 17 Jun 2013 16:19:49 +0000 (12:19 -0400)]
Add InstanceId property to EIP resource

This also changes the InstanceId property for an EIPAssociation
to not be required, which was necessary for testing and is inline
with AWS documentation.

Change-Id: I49dd506309fe6a38df6727bca7f6bbebd45fba3f
Fixes: bug #1164864
12 years agoscheduler: Simplify DependencyTaskGroup interface
Zane Bitter [Thu, 13 Jun 2013 18:03:27 +0000 (20:03 +0200)]
scheduler: Simplify DependencyTaskGroup interface

Instead of passing a function that takes one argument and returns a task
that takes no arguments, simply pass a task that takes one argument.

Change-Id: I73d5f137d5db492c09e6887f80e7e759734c211f

12 years agoscheduler: Improve task descriptions in debug logs
Zane Bitter [Mon, 17 Jun 2013 15:42:04 +0000 (17:42 +0200)]
scheduler: Improve task descriptions in debug logs

Tasks that were simply defined as ordinary functions (not methods) were
identified by their repr() in the logs, which is only really desirable as a
last resort and for objects (where the __call__() method is the task). Use
the function name instead.

Change-Id: Ie34a3602deb968979118b0961bcddf226cf5983f

12 years agoCleanup the doc strings in heat/rpc/client.py
Angus Salkeld [Mon, 3 Jun 2013 03:05:27 +0000 (13:05 +1000)]
Cleanup the doc strings in heat/rpc/client.py

Change-Id: Ia760937f729a1aa17d84c48054cb143bf6891bfd

12 years agoAPI support for Environments
Angus Salkeld [Mon, 17 Jun 2013 04:39:19 +0000 (14:39 +1000)]
API support for Environments

Support "Environment" section in the create/update body.
We the roll up the parameters and the environment and send
that as json using the rpc "params" argument. So no changes
to the rpc layer are needed. The engine knows how to deal
with both formats in the Environments class.

blueprint envirnonments
Change-Id: I6d6085d5c052a5f9115ecd46891b00d2fad4d1db

12 years agoMake template_format.parse usable by environments
Angus Salkeld [Thu, 13 Jun 2013 02:24:02 +0000 (12:24 +1000)]
Make template_format.parse usable by environments

(environments don't want template sections)

blueprint environments
Change-Id: I68ac0b8fb0889d245ace4d0ea8d298460c4c1b1a

12 years agoUse PhysName for testing Swift container names
Zane Bitter [Mon, 17 Jun 2013 10:24:50 +0000 (12:24 +0200)]
Use PhysName for testing Swift container names

Change-Id: Icc000a9235fcd9ee810581b932ded73319decfee

12 years agoFix bizarre Swift DeletionPolicy unit tests
Zane Bitter [Mon, 17 Jun 2013 10:24:50 +0000 (12:24 +0200)]
Fix bizarre Swift DeletionPolicy unit tests

If something shouldn't be called... don't tell the mocks to expect it to be
called. We will get UnexpectedMethodCallError if it is.

Change-Id: I61a7b77cb273b42177a37efa98fc62fd69770545

12 years agoUse physical_resource_name() for Swift containers
Zane Bitter [Mon, 17 Jun 2013 10:24:50 +0000 (12:24 +0200)]
Use physical_resource_name() for Swift containers

This returns names which are of the same form, but which are based on the
resource id (and hence are stable).

Change-Id: Id091bdef74e07fc0df0e6e4914dae8af8b29384c

12 years agoRemove unused parameter.user_parameters()
Angus Salkeld [Thu, 30 May 2013 01:51:17 +0000 (11:51 +1000)]
Remove unused parameter.user_parameters()

blueprint environments
Change-Id: I21246a62f82064120d6ebd4c5e1c607f43df55bc

12 years agoUse the Environment from within the engine
Angus Salkeld [Fri, 14 Jun 2013 10:56:02 +0000 (20:56 +1000)]
Use the Environment from within the engine

at this point the concept only exists in the engine, the
api and client changes will come in later patches.

blueprint environments
Change-Id: I3e208bb72a04bf275bead2aec89006cf680b501b

12 years agoUse physical resource names with a short_id
Zane Bitter [Mon, 17 Jun 2013 10:24:49 +0000 (12:24 +0200)]
Use physical resource names with a short_id

The short_id is a random, but stable, 12-character alphanumeric ID.

This will allow two resources of the same name to exist concurrently. That
is necessary for resources to be replaced during an update without
interruption.

Change-Id: If32904a47c6f8fb651e317ce91f2a04f6eadcc0b

12 years agoInitial Environment class and test
Angus Salkeld [Thu, 13 Jun 2013 03:59:08 +0000 (13:59 +1000)]
Initial Environment class and test

This implements the "resource-registry" and "parameters" section
I am holding off on the "properties" section until we really
know we need it.

blueprint environments
Change-Id: Ib6e9e5cd1c68c255dc048bdde21a6b3e1dc54243

12 years agoMerge "Remove unused python-memcached from requirements."
Jenkins [Mon, 17 Jun 2013 00:39:34 +0000 (00:39 +0000)]
Merge "Remove unused python-memcached from requirements."

12 years agoengine : abstract state-transition logic
Steven Hardy [Mon, 10 Jun 2013 15:27:18 +0000 (16:27 +0100)]
engine : abstract state-transition logic

Refactor to abstract the handle_create/check_create_complete
logic, so it can be reused without lots of duplication for
other action transitions

Prompted by review comments from:
https://review.openstack.org/#/c/31982/2/heat/engine/resource.py
related to blueprint: stack-suspend-resume

Change-Id: Idb18913ef6ff700b63d5ec6d340d2353fc2294b7

12 years agoConvert Resource to separate action/status
Steven Hardy [Fri, 14 Jun 2013 10:02:09 +0000 (11:02 +0100)]
Convert Resource to separate action/status

Next step in decoupling action/status

This adjusts the Resource DB columns, model and class to be consistent
with Event, and split action/status.  This also modifies the both APIs
to join the action/status to avoid changing the API (we can't change
the CFN one anyway and it's desirable to avoid breaking compatibility
with the ReST API, or needing a version bump for this simple change)

Change-Id: I02b56eb14045a058e67b9764d386530d555c339e

12 years agoStore stacks in the database when running unit tests
Zane Bitter [Fri, 14 Jun 2013 10:31:23 +0000 (12:31 +0200)]
Store stacks in the database when running unit tests

If stacks are not stored in the database before they are create()'d,
anything that refers to a stack (e.g. Resources and Events) cannot be added
to the database either, and we get numerous errors in any output logs.

Change-Id: Icd1012455d413aad617486c138fd4507e391bc7b

12 years agoUnit tests: Create User for testing AccessKey
Zane Bitter [Fri, 14 Jun 2013 10:31:22 +0000 (12:31 +0200)]
Unit tests: Create User for testing AccessKey

An AccessKey resource is not independent of its associated User resource,
which must be present in the same stack. Consequently, we need to create a
real User resource that is a member of the same stack in order to test the
AccessKey in a realistic environment.

Change-Id: I4b732c93fe9823552baf65c3f9c87c8ebab061a4

12 years agoMerge "Make resource ids UUIDs in the database"
Jenkins [Fri, 14 Jun 2013 09:59:13 +0000 (09:59 +0000)]
Merge "Make resource ids UUIDs in the database"

12 years agoMerge "Gate on H703"
Jenkins [Fri, 14 Jun 2013 08:53:26 +0000 (08:53 +0000)]
Merge "Gate on H703"

12 years agoUnit tests: Don't use mox to stub uuid.uuid4()
Zane Bitter [Thu, 13 Jun 2013 18:03:26 +0000 (20:03 +0200)]
Unit tests: Don't use mox to stub uuid.uuid4()

The wait condition unit tests require a fixed stack ID, but we don't want
to permanently stub out uuid4, since there are other potential uses of
uuids. Instead, just do it for that one operation.

Change-Id: Ib8b7107a5750caf67aa8905377c2755bf405fa3f

12 years agoMake resource ids UUIDs in the database
Zane Bitter [Thu, 13 Jun 2013 18:03:26 +0000 (20:03 +0200)]
Make resource ids UUIDs in the database

Change-Id: I3068e9e818f19994cc3aaecc34845d0d6aac0dfb

12 years agoMerge "allow using image uuid for instance resource"
Jenkins [Thu, 13 Jun 2013 14:52:15 +0000 (14:52 +0000)]
Merge "allow using image uuid for instance resource"

12 years agoMerge "fix an CFN API and AWS error mapping"
Jenkins [Thu, 13 Jun 2013 12:50:52 +0000 (12:50 +0000)]
Merge "fix an CFN API and AWS error mapping"

12 years agoConvert Events to separate action/status
Steven Hardy [Thu, 13 Jun 2013 10:19:32 +0000 (11:19 +0100)]
Convert Events to separate action/status

First step in decoupling action/status in Resource

This adjusts the Event DB columns, model and class to split
action/status, but in order to be backwards compatible we set the action
to None, which means we can do the right thing in the CFN API, and
resource_status still maps correctly to what is expected in
python-heatclient (which will need to change after the Resource
action/status split happens)

Change-Id: I261d47d2a3fdb3cdc2a8aaf6c159763f4636f633

12 years agoMerge "Use Python 3.x compatible except construct"
Jenkins [Thu, 13 Jun 2013 05:32:43 +0000 (05:32 +0000)]
Merge "Use Python 3.x compatible except construct"

12 years agoallow using image uuid for instance resource
Liang Chen [Fri, 7 Jun 2013 02:12:30 +0000 (10:12 +0800)]
allow using image uuid for instance resource

make the instance resource accept image uuid for its ImageId
properties in addition to unique image name.

Fixes bug #1186410

Change-Id: Iae7705e73fe223d80e85d261a04f88f8c5207487

12 years agofix an CFN API and AWS error mapping
Liang Chen [Wed, 12 Jun 2013 13:47:05 +0000 (21:47 +0800)]
fix an CFN API and AWS error mapping

StackExists should return AlreadyExists, not InvalidParameterValue

Fixes bug #1188473

Change-Id: Ia969cddc1b61caa13f4f70bcc29f3160595a779b

12 years agoRemove unused python-memcached from requirements.
Steve Baker [Wed, 12 Jun 2013 01:58:27 +0000 (13:58 +1200)]
Remove unused python-memcached from requirements.

Change-Id: I6da8607203d15275a05faa7f7ccc570c31f86762

12 years agoUse Python 3.x compatible except construct
Dirk Mueller [Wed, 12 Jun 2013 20:55:03 +0000 (22:55 +0200)]
Use Python 3.x compatible except construct

Python 3.x deprecated excecpt x,y. Use except x as y,
which works with any Python version >= 2.6

Change-Id: I264049ee41e75bcedea86adf7c2011c343f47ddb

12 years agoAdd bin/heat-manage to flake8 checks
Dirk Mueller [Wed, 12 Jun 2013 20:54:05 +0000 (22:54 +0200)]
Add bin/heat-manage to flake8 checks

Change-Id: I917e5b0aa571f2fced7df6a4818f32ce4b5f1561

12 years agoGate on H703
Dirk Mueller [Tue, 11 Jun 2013 18:17:18 +0000 (20:17 +0200)]
Gate on H703

Fix fallout by avoiding multiple positional arguments.

Change-Id: Ie25f7b9041fa5df85a244cb237124440bb7d8e32

12 years agoMerge "scheduler: Fix an issue with wrappertasks and exceptions"
Jenkins [Wed, 12 Jun 2013 14:10:23 +0000 (14:10 +0000)]
Merge "scheduler: Fix an issue with wrappertasks and exceptions"

12 years agoMerge "Fix various Sphinx errors/warnings"
Jenkins [Wed, 12 Jun 2013 10:56:52 +0000 (10:56 +0000)]
Merge "Fix various Sphinx errors/warnings"

12 years agoscheduler: Fix an issue with wrappertasks and exceptions
Zane Bitter [Wed, 12 Jun 2013 10:48:25 +0000 (12:48 +0200)]
scheduler: Fix an issue with wrappertasks and exceptions

Using a 'for' loop on a generator is incompatible with calling throw() on
it, because the latter causes the generator to advance to the next yield.
Consequently, ignoring an exception from a subtask in the parent task would
cause the next subtask to be skipped.

This issue does not affect any existing code to date.

The inner and outer loops should each be equivalent to the definition of
"yield from" (http://www.python.org/dev/peps/pep-0380/#formal-semantics) in
PEP 380, with the following simplifications:
 - Assume that the throw() and close() methods exist
 - Don't support send()
 - Don't support return values (these are Python 3-only feature)

Change-Id: Ie29e68d4505f667f408b67b365c37511f73372fe

12 years agoMerge "Remove explicit distribute depend."
Jenkins [Wed, 12 Jun 2013 09:15:47 +0000 (09:15 +0000)]
Merge "Remove explicit distribute depend."

12 years agoMerge "Fix H702 errors and enable them"
Jenkins [Wed, 12 Jun 2013 08:37:25 +0000 (08:37 +0000)]
Merge "Fix H702 errors and enable them"

12 years agoMerge "Key error when auth in standalone mode"
Jenkins [Wed, 12 Jun 2013 07:54:30 +0000 (07:54 +0000)]
Merge "Key error when auth in standalone mode"