]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agoMerge "Use correct stack_id arg name for metadata_update()"
Jenkins [Thu, 3 Jan 2013 07:34:17 +0000 (07:34 +0000)]
Merge "Use correct stack_id arg name for metadata_update()"

12 years agoheat tests : convert stack ID to uuid format
Steven Hardy [Wed, 2 Jan 2013 18:17:48 +0000 (18:17 +0000)]
heat tests : convert stack ID to uuid format

The functional tests still have the old non-uuid format so the regex needs
changing to match the new uuid4 format

Change-Id: Ic1c1026bc2a11ef108f0d33b14bbead7872836f4
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : functional tests poll_glance cleanup
Steven Hardy [Wed, 2 Jan 2013 17:37:38 +0000 (17:37 +0000)]
heat tests : functional tests poll_glance cleanup

There's no point passing self.glanceclient into poll_glance()
when we can just reference it directly

Change-Id: I8ee873f544f847ca9f203ad9da06244597cdff7a
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : convert functional tests to folsom glanceclient
Steven Hardy [Wed, 2 Jan 2013 17:19:17 +0000 (17:19 +0000)]
heat tests : convert functional tests to folsom glanceclient

Convert functional tests to work with folsom glanceclient, also
remove the conditional essex/folsom module import since this will
no longer work on essex (this was bogus anyway since this code can
never have worked on folsom)

Note : this breaks compatibility with essex for the functional tests, so
any platform running them must be running >= Folsom from now on.

(The essex/folsom glance client interfaces are too different to make it worth
supporting both for the functional tests, ref heat-jeos..)

Change-Id: I4463bfab7f8acf93b2eafa4bb702bf86d8c78652
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoUse correct stack_id arg name for metadata_update()
Steve Baker [Fri, 28 Dec 2012 00:23:51 +0000 (13:23 +1300)]
Use correct stack_id arg name for metadata_update()

Change-Id: I5e4554aa7670d505f45b1512b7135276079b3918

12 years agoRPC API: Simplify describe_stack_resources call
Zane Bitter [Thu, 20 Dec 2012 12:31:14 +0000 (13:31 +0100)]
RPC API: Simplify describe_stack_resources call

Remove the part with the physical_resource_id, which can now be done
through the find_physical_resource call.

Change-Id: Idff625014121aaa6ff3697b36fe38facaf54a499
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoUse the new find_physical_resource RPC call
Zane Bitter [Fri, 21 Dec 2012 12:47:28 +0000 (13:47 +0100)]
Use the new find_physical_resource RPC call

Change-Id: I79890f897912dd75acb6561598bb34862f09a534
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRPC API: Add a separate find_physical_resource call
Zane Bitter [Fri, 21 Dec 2012 16:25:26 +0000 (17:25 +0100)]
RPC API: Add a separate find_physical_resource call

The logic for this is currently mixed up with describe_stack_resources.

Change-Id: I14dadfc3ae6cde337dfb1bdee011cb7b32e5e4d9
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoCFN API: Fix DescribeStackResources with physical ID
Zane Bitter [Fri, 21 Dec 2012 16:47:10 +0000 (17:47 +0100)]
CFN API: Fix DescribeStackResources with physical ID

DescribeStackResources failed when called with a physical resource ID
instead of a stack name. Also add a unit test to alert us to any future
breakage.

Change-Id: I931cd0f74fa225253b06195609ec233ef86353c3
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoHandle duplicate physical resources IDs
Zane Bitter [Fri, 21 Dec 2012 16:25:25 +0000 (17:25 +0100)]
Handle duplicate physical resources IDs

Because the unit tests create multiple stacks in different tenants with the
same physical resource ID, the database lookup code must change to
accomodate this.

This enables us to add a unit test for the describe_stack_resources RPC
API call for the case where we pass a physical resource ID to lookup.

Change-Id: Id37b15bee595ba10f207235a3ff59526e4423be6
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRPC API: Clean up list_events results
Zane Bitter [Fri, 21 Dec 2012 16:25:25 +0000 (17:25 +0100)]
RPC API: Clean up list_events results

Just return a list, rather than wrapping it in an object. The client API
processes can (and do) do whatever wrapping they need.

Change-Id: Ia77facbc7577ec96d1fa0e6e2784f4e5cff68614
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRPC API: Clean up list_stacks results
Zane Bitter [Fri, 21 Dec 2012 16:25:25 +0000 (17:25 +0100)]
RPC API: Clean up list_stacks results

Just return a list, rather than wrapping it in an object. The client API
processes can (and do) do whatever wrapping they need.

Change-Id: I4a8e64e8e4a0f127e8fa5c12738353a1f3a0c22f
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRPC API: Clean up show_stack results
Zane Bitter [Fri, 21 Dec 2012 16:25:25 +0000 (17:25 +0100)]
RPC API: Clean up show_stack results

Just return a list, rather than wrapping it in an object. The client API
processes can (and do) do whatever wrapping they need.

Change-Id: Ibb9955a9c3fc25b88cf3914f2a3ea7cedaf2aa9b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoInclude new doc directory
Jeff Peeler [Thu, 20 Dec 2012 22:36:14 +0000 (17:36 -0500)]
Include new doc directory

Change-Id: If5041669717aaa9287bff315b9b6e4f9db7b374f
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agorun_tests.sh fixup venv/novenv logic
Steven Hardy [Thu, 20 Dec 2012 15:37:29 +0000 (15:37 +0000)]
run_tests.sh fixup venv/novenv logic

The section which prompts y/n for creating a new venv can never be
reached with any combination of CLI options (since always_venv=0 and
never_venv=0 can never happen simultaneously)

This actually makes the --no-virtual-env option pointless, so we may
as well remove it and explicitly set it as the default (it was anyway
previously but by virtue of the never_venv option being undefined)

Change-Id: I3c803533fda55a6814b7536b5c1328312acd3d57
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agorun_tests.sh cosmetic, make if/then style consistent
Steven Hardy [Thu, 20 Dec 2012 11:28:53 +0000 (11:28 +0000)]
run_tests.sh cosmetic, make if/then style consistent

I introduced an inconsistent style with the pep8 check patch, so fixing this up here

Change-Id: I9a1a612172e493e0d2476c7f6613bbb9b9de2878
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agorun_tests.sh cosmetic cleanup indents
Steven Hardy [Thu, 20 Dec 2012 11:24:12 +0000 (11:24 +0000)]
run_tests.sh cosmetic cleanup indents

fix indents so it's consistent ts=4

Change-Id: I6fb2e7b3670bba00ad45d76d2dbb6b56c25281ff
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "Avoid logging.getChild for python2.6 compatibility"
Jenkins [Thu, 20 Dec 2012 10:59:49 +0000 (10:59 +0000)]
Merge "Avoid logging.getChild for python2.6 compatibility"

12 years agoupdate tox.ini to pep8 latest (1.3.4)
Steven Hardy [Wed, 19 Dec 2012 17:27:49 +0000 (17:27 +0000)]
update tox.ini to pep8 latest (1.3.4)

Most of the core projects are currently 1.3.3, but since 1.3.4 is
the current latest it seemed best to align with the latest.A
Also add a check to run_tests.sh to ensure peoples local tests align
with the new gate version

fixes bug 1092057

Change-Id: I16dc7e51536781f7a14b7954c24b1aa078b37fa8
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat cleanups to align unit tests with pep8 1.3.4
Steven Hardy [Wed, 19 Dec 2012 17:23:05 +0000 (17:23 +0000)]
heat cleanups to align unit tests with pep8 1.3.4

Lots of (mostly whitespace) cleanups to align all the unit test code
with pep8 v1.3.4

ref bug 1092057

Change-Id: I5c847f20b3516af3dd3d7211b0fc697c59bf914c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat cleanups to align functional tests with pep8 1.3.4
Steven Hardy [Wed, 19 Dec 2012 13:45:21 +0000 (13:45 +0000)]
heat cleanups to align functional tests with pep8 1.3.4

Lots of (mostly whitespace) cleanups to align all the functional test code
with pep8 v1.3.4

ref bug 1092057

Change-Id: Ifd6ef02bf3abd0b2f351f63423ab8aa7ff0cbd7c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat cleanups to align with pep8 1.3.4
Steven Hardy [Wed, 19 Dec 2012 13:13:30 +0000 (13:13 +0000)]
heat cleanups to align with pep8 1.3.4

Lots of (mostly whitespace) cleanups to align all the non-test code with
pep8 v1.3.4

ref bug 1092057

Change-Id: I444b288444dba4ec1da5854bd276d091c06d8489
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoFix DescribeStacks command for all stacks
Zane Bitter [Wed, 19 Dec 2012 17:48:26 +0000 (18:48 +0100)]
Fix DescribeStacks command for all stacks

Fixes: bug 1092196
Change-Id: I05065c08b4072a9c179ebfb36fb15f062de3f06e
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoReST API: Improve format of resource_types response
Zane Bitter [Wed, 19 Dec 2012 17:48:25 +0000 (18:48 +0100)]
ReST API: Improve format of resource_types response

Wrap the list in a JSON object for consistency with other APIs, both in
Heat and the rest of OpenStack.

Change-Id: I626f1c2446416c8e869fdc7d4f3772ec6c6d191c
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoReturn an ARN as the Ref for nested stacks
Zane Bitter [Wed, 19 Dec 2012 17:48:25 +0000 (18:48 +0100)]
Return an ARN as the Ref for nested stacks

Change-Id: I32b6b952dcd29ba895fc7b22dd362352068c85bf
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoSplit nested stack implementation into abstract and concrete
Zane Bitter [Wed, 19 Dec 2012 18:31:32 +0000 (19:31 +0100)]
Split nested stack implementation into abstract and concrete

Split the Stack resource class into an abstract part from which other
resource types inherit and a concrete implementation of the
AWS::CloudFormation::Stack resource type.

Change-Id: Ie7600b94e17ec31b55bae5c4d9501d3f0cbca97c
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAvoid logging.getChild for python2.6 compatibility
Steven Hardy [Wed, 19 Dec 2012 18:01:15 +0000 (18:01 +0000)]
Avoid logging.getChild for python2.6 compatibility

Tweaking common.config setup_logging to avoid using the getChild()
convenience function means we can run on python 2.6, as getChild was
new in python 2.7

Change-Id: I03698ad09eb16d4f1004512d27b049f22b41c22c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoRPC API: Pass a stack identifier to metadata_update
Zane Bitter [Wed, 19 Dec 2012 17:48:25 +0000 (18:48 +0100)]
RPC API: Pass a stack identifier to metadata_update

This brings it into line with all of the other RPC functions.

bug 1088937

Change-Id: Ia45a12d652e96fb6bb03ce90d0b5a5e2ddeeb510
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoPass correct types in RPC Client unit tests
Zane Bitter [Wed, 19 Dec 2012 17:48:25 +0000 (18:48 +0100)]
Pass correct types in RPC Client unit tests

Pass an actual identity structure for the identity.

Change-Id: I0930520c8329100ba27aa6db0d977dfcd8a097c1
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoUpdate links in composed templates
Zane Bitter [Wed, 19 Dec 2012 17:48:25 +0000 (18:48 +0100)]
Update links in composed templates

These have changed due to the move of the project repository from the
heat-api to openstack organisations on GitHub.

Change-Id: Ib11116d7ca48e108e06d1dea9d9decd17bbf25cd
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoA new documention structure, ready for contributions
Steve Baker [Fri, 14 Dec 2012 01:13:05 +0000 (14:13 +1300)]
A new documention structure, ready for contributions

Here are some skeletons for the documentation which will need to be written.

doc/source
A Sphinx based document which will be aimed at heat developers.
     This also contains .rst files which generate the man files
doc/docbkx/api-ref
Docbook and WADL for the REST API, with the intent of moving this
to api-site to publish to api.openstack.org
doc/docbkx/heat-admin
Docbook manual targeted at Heat admins, with the intent of moving this
        to openstack-manuals to publish to docs.openstack.org
doc/docbkx/heat-cli
Docbook manual targeted at users of the Heat CLI, with the intent of
moving this to openstack-manuals to publish to docs.openstack.org

Dude, wheres my man pages?
docs/man
is deleted, now generated into doc/build/man

Packaging will need to be updated to generate the man pages

Change-Id: Idf2f37086b6f97df18ed57172de2f9e3d4c7706a

12 years agopip-requires PyCrypto should be >= 2.1.0
Steven Hardy [Tue, 18 Dec 2012 18:00:09 +0000 (18:00 +0000)]
pip-requires PyCrypto should be >= 2.1.0

We need PyCrypto>=2.1.0 for Random which is used in
heat.common.crypt

Change-Id: Ib951deaca17f972aa70a2a65f6e3ade5fb509981
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd support for missing Instance attributes PrivateIp and PublicDnsName.
Clint Byrum [Tue, 18 Dec 2012 01:57:30 +0000 (17:57 -0800)]
Add support for missing Instance attributes PrivateIp and PublicDnsName.

Change-Id: I9d85f00a8ca687ad791be4a9fa6708df3ad67a55
Fixes: bug #1091497
12 years agoGettingStarted: Install python-pip package
Zane Bitter [Mon, 17 Dec 2012 18:56:23 +0000 (19:56 +0100)]
GettingStarted: Install python-pip package

pip-python is not installed by default, so we need to install it in order
to be able to use it. (An alternative would be to use easy_install, which
is packaged as part of setuputils and therefore already present, but it
lacks any of pip-python's package management capabilities.)

Change-Id: I6a620d0864b6671348bbcf962c3c2cde06f9ed83
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix issues with deleting a WaitCondition
Zane Bitter [Mon, 17 Dec 2012 18:56:22 +0000 (19:56 +0100)]
Fix issues with deleting a WaitCondition

Previously we were ignoring the reference to the WaitConditionHandle stored
in the database by always setting it to None on load. This meant that we
had to try to recreate it on delete, which would fail if e.g. the
WaitConditionHandle had already been deleted.

bug 1089354

Change-Id: Ibc4145348a91b455e97ba27748ff72451b0c7bce
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix importing of novaclient exceptions
Zane Bitter [Mon, 17 Dec 2012 16:11:03 +0000 (17:11 +0100)]
Fix importing of novaclient exceptions

Broken by 3c702e38e9a51a15a8d1626b60f610c75cb1f8b7

Also, use novaclient's own mechanism for selecting the correct API version;
don't go fishing in the internals.

Change-Id: I296312f185735026587ba9849343aa79177856a3
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agotools/openstack_ubuntu fix nova-manage network create command
Steven Hardy [Mon, 17 Dec 2012 10:51:37 +0000 (10:51 +0000)]
tools/openstack_ubuntu fix nova-manage network create command

Command for creating nova network is wrong, as tested on 12.04

ref bug 1083507
Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I41ae9370c42a0e9b7df4d1810e0f90f32bd87bba

12 years agoHandle empty UserData for instance
Zane Bitter [Fri, 14 Dec 2012 21:45:07 +0000 (22:45 +0100)]
Handle empty UserData for instance

UserData is not required, so handle the case where it is not supplied (i.e.
is None).

bug 1090544

Change-Id: If8bfe9ba2aafe3bb2e9de14b01c57d1ddcf9b21d
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMake resource registration conditional
Zane Bitter [Fri, 14 Dec 2012 10:05:59 +0000 (11:05 +0100)]
Make resource registration conditional

If client libraries are not present for Swift or Quantum, don't register
the corresponding resource types.

Change-Id: I95a42973775b7f4c1d82caa47dc0660dfe54bb21
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd a resource type list to the ReST API
Zane Bitter [Fri, 14 Dec 2012 21:23:44 +0000 (22:23 +0100)]
Add a resource type list to the ReST API

Change-Id: I09f5e9fc97ef095c7ab8def8adf4dcc79c6fcd48
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd an RPC API to list resource types
Zane Bitter [Fri, 14 Dec 2012 21:23:44 +0000 (22:23 +0100)]
Add an RPC API to list resource types

Change-Id: I0218dcebf9213887e9b7883e6bba9b6b54a6e6ad
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoStandardise client imports
Zane Bitter [Fri, 14 Dec 2012 21:23:44 +0000 (22:23 +0100)]
Standardise client imports

Do all client imports once, in the clients module, using the normal
OpenStack idiom for optional imports where appropriate.

Change-Id: I1186eba21159fe20e80c1947779fd164dada5880
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix ReST API documentation for template validation
Zane Bitter [Fri, 14 Dec 2012 21:23:44 +0000 (22:23 +0100)]
Fix ReST API documentation for template validation

The user parameters are not used in template validation.

Change-Id: Iba438b2977f8029c0f0f7e6e65e853d23e4d2b0d
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Add ubuntu version of tools/openstack"
Jenkins [Fri, 14 Dec 2012 19:12:00 +0000 (19:12 +0000)]
Merge "Add ubuntu version of tools/openstack"

12 years agoinstall.sh non-root error should go to stderr
Steven Hardy [Fri, 14 Dec 2012 09:49:31 +0000 (09:49 +0000)]
install.sh non-root error should go to stderr

The non-root error should go to stderr like the other echo output

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I1d9c51c43f9a2db0b50c4c95fc0a0e4505078c51

12 years agoinstall.sh add logic detecting rabbitmq
Steven Hardy [Fri, 14 Dec 2012 09:47:33 +0000 (09:47 +0000)]
install.sh add logic detecting rabbitmq

Detect rabbitmq (On Ubuntu and Fedora), and sed the config files
with appropriate values if it looks like we're installing on a
system with rabbitmq and not the default qpidd

fixes bug 1090420

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I04a40aab00e7e13d245900aeb384d769d57c4012

12 years agoMerge "tools/openstack fixup header formatting"
Jenkins [Fri, 14 Dec 2012 17:15:00 +0000 (17:15 +0000)]
Merge "tools/openstack fixup header formatting"

12 years agotools/openstack fixup header formatting
Steven Hardy [Fri, 14 Dec 2012 16:11:02 +0000 (16:11 +0000)]
tools/openstack fixup header formatting

Current header is abbreviated, so paste in the full boilerplate
text like in other files

Change-Id: I8675f80f37ab6ea2ba2323f3f87985224883466a
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd ubuntu version of tools/openstack
Steven Hardy [Fri, 14 Dec 2012 15:33:40 +0000 (15:33 +0000)]
Add ubuntu version of tools/openstack

Initial version of the tools/openstack install script to simplify install/
testing on Ubuntu - tested on 12.04LTS (with the included Essex packages)
12.10 testing TODO

ref bug 1083507

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I450b20e18dfa3099cfd17152b5ec61cc34122665

12 years agoinstall.sh simplify heat-engine.conf conditional
Steven Hardy [Fri, 14 Dec 2012 09:44:03 +0000 (09:44 +0000)]
install.sh simplify heat-engine.conf conditional

Minor tweak to the conditional detecting heat-engine.conf to sed in the
encryption key - this will allow rabbitmq detection to only be done in
one place

ref bug 1090420

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I9031218796a52efd350c39167ecb112048dad218

12 years agoRemove heat-metadata man page
Jeff Peeler [Thu, 13 Dec 2012 22:25:46 +0000 (17:25 -0500)]
Remove heat-metadata man page

The binary no longer exists.

Change-Id: Ib914f94d091b1388d254c53dc3a7821750266b18
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMerge "heat_keystoneclient ec2 user fix"
Jenkins [Thu, 13 Dec 2012 18:07:41 +0000 (18:07 +0000)]
Merge "heat_keystoneclient ec2 user fix"

12 years agoGet rid of naked "except:" clauses in tests
Zane Bitter [Thu, 13 Dec 2012 15:11:54 +0000 (16:11 +0100)]
Get rid of naked "except:" clauses in tests

Change-Id: Idec15ef86ff0f9cb57b4a8c522e4f5ed63bad010
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoDon't skip watchrule test on exception
Zane Bitter [Thu, 13 Dec 2012 14:37:25 +0000 (15:37 +0100)]
Don't skip watchrule test on exception

There are no circumstances in which failing to import the
heat.engine.watchrule module would not be an issue.

Change-Id: I6d03ed8f761a24aa69409010390289e387523813
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoGet rid of unused imports
Zane Bitter [Thu, 13 Dec 2012 14:02:29 +0000 (15:02 +0100)]
Get rid of unused imports

This cruft just tends to build up over time...

Change-Id: I61fd067b431aaa57164c7ff781c9cc8bab04bd4b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoGet rid of nose.main() in unit test files
Zane Bitter [Thu, 13 Dec 2012 14:57:59 +0000 (15:57 +0100)]
Get rid of nose.main() in unit test files

This doesn't actually work and is not universally present, so get rid of
it. Tests are run through "nosetests", which does actually work.

Change-Id: Ib2d1e857e0aef4eab5fd75ffb1a498d8e9186c01
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat_keystoneclient ec2 user fix
Steven Hardy [Wed, 12 Dec 2012 17:06:55 +0000 (17:06 +0000)]
heat_keystoneclient ec2 user fix

Fix bug where we incorrectly use the request context user_id,
instead of the user_id associated with the resource calling
get_ec2_keypair()

fixes bug 1089035

Change-Id: Ibb5e6d11461fb3ff1dd743066a9f7de3ee65b445
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "heat cfn api, format waitcondition error responses correctly"
Jenkins [Thu, 13 Dec 2012 12:59:34 +0000 (12:59 +0000)]
Merge "heat cfn api, format waitcondition error responses correctly"

12 years agoMove the cfn client code to a subpackage
Zane Bitter [Thu, 13 Dec 2012 10:20:33 +0000 (11:20 +0100)]
Move the cfn client code to a subpackage

This will make packaging easier.

Change-Id: I8e0f0a3d85bdf073a3b3272f920ad60f27e929e3
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat cfn api, format waitcondition error responses correctly
Steven Hardy [Wed, 12 Dec 2012 15:01:54 +0000 (15:01 +0000)]
heat cfn api, format waitcondition error responses correctly

Return errors from the waitcondition part of the CFN API in a similar
format to other CFN API responses, by catching engine errors and mapping
the error to an appropriate HeatAPIException.

fixes bug 1089032

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I40486ed53fd4968519f623a3ea5a96f6c3374ea5

12 years agoOverride events for AutoScalingGroup instances
Steven Hardy [Wed, 12 Dec 2012 14:59:02 +0000 (14:59 +0000)]
Override events for AutoScalingGroup instances

Override state-transition events by subclassing the Instance
resource to AutoScalingGroupInstance, this avoids problems where
events can't lookup the resource via parser.Stack (since these
resources aren't "real" resources defined in the template)

fixes bug 1089338

Change-Id: Ia064cd067eefdaa5ca81b0cb822ce2fa443bac85
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoresource state_set, abstract update/store logic
Steven Hardy [Wed, 12 Dec 2012 14:57:11 +0000 (14:57 +0000)]
resource state_set, abstract update/store logic

Abstract the DB update/store logic so the state_set function
can be more cleanly overridden for AutoScalingGroupInstance

ref bug 1089338

Change-Id: I02dc52068feaeed8ec8210269d9abb7b124f0a19
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoDon't allow identifiers with slashes
Zane Bitter [Wed, 12 Dec 2012 11:06:56 +0000 (12:06 +0100)]
Don't allow identifiers with slashes

Ensure that creating an Identifier with a slash in either the stack name or
the resource name results in an immediate exception.

Change-Id: I79121a26009b5b7b3eee994f98ba802b239f5f12
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoDon't allow slashes in Stack or Resource names
Zane Bitter [Wed, 12 Dec 2012 12:47:33 +0000 (13:47 +0100)]
Don't allow slashes in Stack or Resource names

There is no way for the ReST API to handle Stack or Resource names that
contain slashes since WSGI decodes the path before passing it to the
application, such that even correctly url-encoded slashes are
indistinguishable from path separators. Therefore, prohibit slashes in
Stack and Resource names.

bug 1088928

Change-Id: Ie6fa5a1bc7b5ae7054300419644008c5cc42187e
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Fix race condition in list_stacks"
Jenkins [Wed, 12 Dec 2012 08:27:53 +0000 (08:27 +0000)]
Merge "Fix race condition in list_stacks"

12 years agoMove resolved template comparison to stack update
Steve Baker [Wed, 12 Dec 2012 01:48:17 +0000 (14:48 +1300)]
Move resolved template comparison to stack update

This partially reverts the following commit
https://review.openstack.org/#/c/17563/3

Resource comparison is now done as per Zane's last comment in that review.

Change-Id: I1663d262b79603ab86bc5bdb4f2ee75e87c0075e

12 years agoFix race condition in list_stacks
Steve Baker [Mon, 10 Dec 2012 03:18:26 +0000 (16:18 +1300)]
Fix race condition in list_stacks

A stack may be deleted between querying the stacks to list and formatting
each stack.

This issue was found by concurrently creating and deleting 100 stacks
while running heat list.

Change-Id: I4a47bbdbde111454672c2579caf28b4675c3cf10

12 years agoGet rid of glanceclient dependency
Zane Bitter [Tue, 11 Dec 2012 19:23:36 +0000 (20:23 +0100)]
Get rid of glanceclient dependency

We're not actually using it anywhere, and its keystoneclient version
requirements are causing us not to be able to install. Move it instead to
the test-requires, since the functional tests are still actually using it.

Change-Id: I74e68ddb4b65235b6c192c619e9e8e85e30beab9
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat engine : convert WaitConditionHandle URL to ARN format
Steven Hardy [Tue, 4 Dec 2012 16:33:51 +0000 (16:33 +0000)]
heat engine : convert WaitConditionHandle URL to ARN format

Convert the WaitConditionHandle URL format to use the ARN format,
the resulting URL will be similar to the AWS format

fixes bug 1087799

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: I04b1f6cd913c54c9f4fa82cc1e76be22a19fe2ea

12 years agoMerge "heat : Add HeatIdentifier from_url function"
Jenkins [Tue, 11 Dec 2012 14:37:28 +0000 (14:37 +0000)]
Merge "heat : Add HeatIdentifier from_url function"

12 years agoheat : Add HeatIdentifier from_url function
Steven Hardy [Tue, 4 Dec 2012 16:33:13 +0000 (16:33 +0000)]
heat : Add HeatIdentifier from_url function

Add method to create a HeatIdentifier from a URL containing an ARN

ref bug 1087799

Signed-off-by: Steven Hardy <shardy@redhat.com>
Change-Id: Ie325de9105e85dbf9fd12be5e7b8c3d055e77795

12 years agoMerge "Eventlet monkey-patch heat-api-cloudwatch."
Jenkins [Mon, 10 Dec 2012 22:09:13 +0000 (22:09 +0000)]
Merge "Eventlet monkey-patch heat-api-cloudwatch."

12 years agoMerge "Eventlet monkey-patch heat-api-cfn"
Jenkins [Mon, 10 Dec 2012 22:06:49 +0000 (22:06 +0000)]
Merge "Eventlet monkey-patch heat-api-cfn"

12 years agoMerge "Eventlet monkey-patch heat-api"
Jenkins [Mon, 10 Dec 2012 22:05:58 +0000 (22:05 +0000)]
Merge "Eventlet monkey-patch heat-api"

12 years agoMerge "Add test to simply run a few binaries"
Jenkins [Mon, 10 Dec 2012 21:43:21 +0000 (21:43 +0000)]
Merge "Add test to simply run a few binaries"

12 years agoEventlet monkey-patch heat-api-cloudwatch.
Steve Baker [Mon, 10 Dec 2012 02:19:53 +0000 (15:19 +1300)]
Eventlet monkey-patch heat-api-cloudwatch.

Tested by getting responses from cloudwatch, but not with a full
end-to-end cloudwatch validation
Change-Id: I2d81adc8e63b9be7dec02083509ab706ae0c5a7f

12 years agoEventlet monkey-patch heat-api-cfn
Steve Baker [Mon, 10 Dec 2012 02:19:20 +0000 (15:19 +1300)]
Eventlet monkey-patch heat-api-cfn

Tested by running bin/heat-cfn commands
Change-Id: I158a0d8d9b545191001ecdabfa9f331cf937bf4e

12 years agoEventlet monkey-patch heat-api
Steve Baker [Mon, 10 Dec 2012 02:07:40 +0000 (15:07 +1300)]
Eventlet monkey-patch heat-api

I have a stress test which uses python-heatclient to create
an empty template, list the stacks, and delete the created stack.

Running 100 of these jobs concurrently takes 64 seconds without this patch,
and 17 seconds with it.

Change-Id: I8963da477aa8fcec724e2e5afcd5ec92ff5b07d1

12 years agoMerge "Don't pass -1 as a stack_id in unit tests"
Jenkins [Mon, 10 Dec 2012 18:38:37 +0000 (18:38 +0000)]
Merge "Don't pass -1 as a stack_id in unit tests"

12 years agoMerge "Make Volume tests independent"
Jenkins [Mon, 10 Dec 2012 18:33:46 +0000 (18:33 +0000)]
Merge "Make Volume tests independent"

12 years agoMerge "Clean up the volume test"
Jenkins [Mon, 10 Dec 2012 18:29:30 +0000 (18:29 +0000)]
Merge "Clean up the volume test"

12 years agoMerge "Fix Instance unit tests"
Jenkins [Mon, 10 Dec 2012 18:26:48 +0000 (18:26 +0000)]
Merge "Fix Instance unit tests"

12 years agoMerge "Switch over missed file in version switch"
Jenkins [Mon, 10 Dec 2012 17:08:12 +0000 (17:08 +0000)]
Merge "Switch over missed file in version switch"

12 years agoAdd test to simply run a few binaries
Jeff Peeler [Sat, 8 Dec 2012 04:18:31 +0000 (23:18 -0500)]
Add test to simply run a few binaries

This is not really a unit test, but it's so fast that I think it could
be considered as such. And it would be nice to gate on such blatant
breakage.

Change-Id: I8ff4ca27a912c30bd962168418ac44217ea9e54d
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoSwitch over missed file in version switch
Jeff Peeler [Mon, 10 Dec 2012 16:45:28 +0000 (11:45 -0500)]
Switch over missed file in version switch

Bug 1078480

Change-Id: Ic196086467c68bfe718ba6845711da172b237688
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoDon't pass -1 as a stack_id in unit tests
Zane Bitter [Mon, 10 Dec 2012 13:47:17 +0000 (14:47 +0100)]
Don't pass -1 as a stack_id in unit tests

We now use UUIDs as stack IDs, but in most cases even that is not
necessary.

Change-Id: I0ef4efb5c3289c6c3d0fd3d0232118c0e906f8b5
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMake Volume tests independent
Zane Bitter [Mon, 10 Dec 2012 16:03:14 +0000 (17:03 +0100)]
Make Volume tests independent

Previously, the VolumeAttachment tests relied on stuff left in the database
by the Volume tests.

Change-Id: I8ff63cb6dac0968e63a83fb5c2f78e2a9024dd7c
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoClean up the volume test
Zane Bitter [Mon, 10 Dec 2012 14:24:34 +0000 (15:24 +0100)]
Clean up the volume test

Various renaming/reformatting done while debugging an issue of the tests
not being independent.

Change-Id: I65f2f6ba2f5af2f5a233ea15faa62a7e087e2bd1
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix Instance unit tests
Zane Bitter [Mon, 10 Dec 2012 13:36:51 +0000 (14:36 +0100)]
Fix Instance unit tests

These were all kinds of broken.

Change-Id: Ib219886f5d8e0fea3ee9c71a78b6c7603d1adc98
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd back catch_error which is used for CLI errors
Jeff Peeler [Fri, 7 Dec 2012 21:56:49 +0000 (16:56 -0500)]
Add back catch_error which is used for CLI errors

Change-Id: Ib8b975d22950d5ba6aa9d5f150403a64356a8aa3
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMerge "Switch to openstack style versioning"
Jenkins [Sat, 8 Dec 2012 02:48:47 +0000 (02:48 +0000)]
Merge "Switch to openstack style versioning"

12 years agoMerge "heat-db-setup read engine config file for DB connection details"
Jenkins [Sat, 8 Dec 2012 02:46:52 +0000 (02:46 +0000)]
Merge "heat-db-setup read engine config file for DB connection details"

12 years agoSwitch to openstack style versioning
Jeff Peeler [Thu, 6 Dec 2012 22:15:05 +0000 (17:15 -0500)]
Switch to openstack style versioning

Bug 1078480

Change-Id: I32471acc16e7ca6f60672474c9bf70537ba76fd2
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMerge "Update openstack-common to get newly fixed version.py"
Jenkins [Sat, 8 Dec 2012 01:48:47 +0000 (01:48 +0000)]
Merge "Update openstack-common to get newly fixed version.py"

12 years agoUpdate openstack-common to get newly fixed version.py
Jeff Peeler [Wed, 5 Dec 2012 21:44:08 +0000 (16:44 -0500)]
Update openstack-common to get newly fixed version.py

Now at oslo-incubator version ea7ced276d2f080718cd89f3a77378cdf24fabf5

Bug 1078480

Change-Id: I0569a1c0b8af42ceb768095d4b852b557b238e61
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoheat-db-setup read engine config file for DB connection details
Steven Hardy [Fri, 7 Dec 2012 17:16:04 +0000 (17:16 +0000)]
heat-db-setup read engine config file for DB connection details

Currently heat-db-setup, or rather the underlying python -m heat.db.sqlalchemy.manage
has a hard-coded database connection URL, so DB setup will fail if a non-default
configuration exists in /etc/heat/heat-engine.conf.

This attempts to read the sql_connection from the DEFAULT section of heat-engine.conf
falling back to the old default string on failure.

bug/1087741

Change-Id: Ieb41503a58ee0804d79a32a8286268803c9f456c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoDon't get nested stacks by name
Zane Bitter [Fri, 7 Dec 2012 16:40:26 +0000 (17:40 +0100)]
Don't get nested stacks by name

Don't return nested stacks from stack_get_by_name(). This prevented the
user creating a stack with the same name as a nested stack, and was a
temporary workaround for the metadata server (see
be3c066ab87cc6e1a2ca8c097eeccd9217d7329a)

bug 1072954

Change-Id: I1e3d0289476377f5b4169835119052f4fa573f86
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix exception handling in AccessKey fetching
Zane Bitter [Fri, 7 Dec 2012 16:12:41 +0000 (17:12 +0100)]
Fix exception handling in AccessKey fetching

bug 1087527

Change-Id: I3de5b27e927ac18aa91f124cd5ef0333c1a83fe2
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMove utils.py to a more appropriate location
Zane Bitter [Fri, 7 Dec 2012 14:38:51 +0000 (15:38 +0100)]
Move utils.py to a more appropriate location

It's only used by the database code.

Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoGet rid of leftover heat-jeos code in utils
Zane Bitter [Fri, 7 Dec 2012 14:36:54 +0000 (15:36 +0100)]
Get rid of leftover heat-jeos code in utils

This code, including the Glance client dependency, was left over from when
what is now heat-jeos was part of the heat codebase.

Change-Id: I35081fb7911ad1ea3284cbb6e3f83dd8c6a1807f
Signed-off-by: Zane Bitter <zbitter@redhat.com>