]> review.fuel-infra Code Review - openstack-build/heat-build.git/log
openstack-build/heat-build.git
12 years agoMerge "heat : Revert "Make sure the properties are defined in all cases.""
Jenkins [Thu, 13 Sep 2012 13:19:07 +0000 (13:19 +0000)]
Merge "heat : Revert "Make sure the properties are defined in all cases.""

12 years agoMerge "heat : bugfix convert User resource to physical_resource_name()"
Jenkins [Thu, 13 Sep 2012 13:18:58 +0000 (13:18 +0000)]
Merge "heat : bugfix convert User resource to physical_resource_name()"

12 years agoMerge "Update openstack-common"
Jenkins [Thu, 13 Sep 2012 11:56:15 +0000 (11:56 +0000)]
Merge "Update openstack-common"

12 years agoheat : Revert "Make sure the properties are defined in all cases."
Steven Hardy [Thu, 13 Sep 2012 11:01:03 +0000 (12:01 +0100)]
heat : Revert "Make sure the properties are defined in all cases."

bugfix : backout #194 fix as it breaks RDS (or maybe all resoures
implemented as nested-stacks)

This reverts commit ae0b853499296763dae77aa5c1e4c22225674489.

reopens #194

Change-Id: I349a1625a040e33e080549a137824d1d2cfca9f8
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat : bugfix convert User resource to physical_resource_name()
Steven Hardy [Thu, 13 Sep 2012 10:27:15 +0000 (11:27 +0100)]
heat : bugfix convert User resource to physical_resource_name()

engine user.py needs the self.name references changed to
self.physical_resource_name() to align with the recent resource
naming changes.

Change-Id: I4620a4afc5e9c11d7b6d9348aaac35bcfa31bbac
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agocreating instances failed as a result of regression in last commit
Steven Dake [Thu, 13 Sep 2012 05:43:30 +0000 (22:43 -0700)]
creating instances failed as a result of regression in last commit

The previous commit to the tree organizes resource names by
stack.resource.  Most of the openstack APIs take resource ids
but the instance create operation requires text identifiers.

Rewrite the text identifiers for the nova security groups before
starting an instance.

Change-Id: I8a842868781ecb353f66b5a4e3d022766a4c8a0e
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoUpdate openstack-common
Angus Salkeld [Thu, 13 Sep 2012 03:50:24 +0000 (13:50 +1000)]
Update openstack-common

Change-Id: I002574a60b4f59543bc6aa73256c2f0b3b79d378
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoMake physical resource names unique based upon stack name
Steven Dake [Wed, 12 Sep 2012 22:12:50 +0000 (15:12 -0700)]
Make physical resource names unique based upon stack name

Some templates use the same resource name when registering with
nova.  Nova will not allow mulitple resource names to register
with the same name in all cases, and in those it does, it often
becomes confused (in the case of EIP).  This patch creates a
dot notation

For the LB test, an example of the resources would be:
teststack.LoadBalancer.LB_instance
teststack.DatabaseServer.MySqlDatabaseServer
teststack.WikiServerOne

Fixes Issue #160
Fixes Issue #136

Thanks to asalkeld@redhat.com for helping sort out the unit
test cases.

Change-Id: I14f4551feb41c7f98caa30dd98f997da6d00c467
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoMerge "Add 2 instance with EBS test."
Jenkins [Wed, 12 Sep 2012 22:41:25 +0000 (22:41 +0000)]
Merge "Add 2 instance with EBS test."

12 years agoChange Stack to support user defined parameter
Jeff Peeler [Wed, 12 Sep 2012 20:25:25 +0000 (16:25 -0400)]
Change Stack to support user defined parameter

This change allows tests to specify DBUsername/DBPassword if necessary.
The keyname is still looked up in nova and the distribution is retrieved
from the already existing Stack parameter.

Change-Id: I3732ffb685d68c8a72a83247f74ed11a50a74cd1
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMerge "Make S3 import except on ImportError rather then all exceptions"
Jenkins [Wed, 12 Sep 2012 20:47:20 +0000 (20:47 +0000)]
Merge "Make S3 import except on ImportError rather then all exceptions"

12 years agoAdd 2 instance with EBS test.
Ian Main [Wed, 12 Sep 2012 19:12:31 +0000 (12:12 -0700)]
Add 2 instance with EBS test.

Seems to work even.

Change-Id: Ie09d97dc86a68525783f1f9c080fed13e651ef78
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoChange VerifyClass to have a generic verify_url method
Jeff Peeler [Wed, 12 Sep 2012 15:36:43 +0000 (11:36 -0400)]
Change VerifyClass to have a generic verify_url method

Change-Id: I0e1298e7852e336d6271c4014b11935ac3ce6689
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoUpdate WordPress_Compsed_Instances to new test infrastructure
Steven Dake [Wed, 12 Sep 2012 16:34:21 +0000 (09:34 -0700)]
Update WordPress_Compsed_Instances to new test infrastructure

Change-Id: I08a175d28b99b861ce29b2278e415896e79cf72a
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoMake S3 import except on ImportError rather then all exceptions
Steven Dake [Wed, 12 Sep 2012 15:11:30 +0000 (08:11 -0700)]
Make S3 import except on ImportError rather then all exceptions

Change-Id: Icb98aed65ccba825f8402fdde95ac38b2a12c1a6
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoMake S3 optional since swiftclient is not available in all distributions
Steven Dake [Tue, 11 Sep 2012 20:49:09 +0000 (13:49 -0700)]
Make S3 optional since swiftclient is not available in all distributions

Change-Id: Ic5f61ac41090fd599f01b3eaae4ffb03aac2ebdd
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoheat : test utils, extract ec2 credentials from keystone
Steven Hardy [Tue, 11 Sep 2012 18:23:27 +0000 (19:23 +0100)]
heat : test utils, extract ec2 credentials from keystone

For StackBoto extract the ec2 credentials from keystone and
pass them into the client, so the functional tests don't rely
on ec2 credentials from config-files and only need the currently
provided keystone credentials

Change-Id: Ifc959011cc5b9ee77ebf04e380dc6a4059903c6d
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat : allow boto_client to accept credentials
Steven Hardy [Tue, 11 Sep 2012 18:07:00 +0000 (19:07 +0100)]
heat : allow boto_client to accept credentials

Allow ec2 credentials to optionally be passed in to boto
rather than purely relying on config-files

Change-Id: Ib821f2bca9bc3f61af521955a9ed52f0059e70e4
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat : move boto.cfg to correct location
Steven Hardy [Tue, 11 Sep 2012 18:05:36 +0000 (19:05 +0100)]
heat : move boto.cfg to correct location

boto.cfg needs to be under /etc not /etc/heat
or boto won't find it

Change-Id: I0981bb3bd46dd1630633576fc77d085410bf6362
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat : comment credentials in template boto.cfg
Steven Hardy [Tue, 11 Sep 2012 18:03:41 +0000 (19:03 +0100)]
heat : comment credentials in template boto.cfg

Comment out the credentials section in /etc/boto.cfg
this allows us to pass the correct host/endpoint without
having world-readable credentials.  This can then be used
as a template for per-user ~/.boto files if desired

Change-Id: I4cea0cb3b790186ddc041edad0ab4ee4b7e8f956
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : add new Boto wordpress functional test
Steven Hardy [Tue, 11 Sep 2012 12:08:22 +0000 (13:08 +0100)]
heat tests : add new Boto wordpress functional test

Add new test_WordPress_Single_Instance_Boto.py, which
does a wordpress single instance test using StackBoto

Note, this will require a valid /etc/boto.cfg to work,
and probably a recent (git) version of boto

Fixes #220

Change-Id: Ia95de35dc9d1d52ba6b9f4fae333e4fad02762ca
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : functional test utils add StackBoto class
Steven Hardy [Tue, 11 Sep 2012 12:06:09 +0000 (13:06 +0100)]
heat tests : functional test utils add StackBoto class

Add StackBoto, subclass of Stack, which implements stack
setup using the boto client wrapper, allows us to test
AWS auth and boto client libraries

Ref #220

Change-Id: Id5cb5ab72c7ba2e7accd76a73a94ff8fe45c62fa
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoImplement the AWS::S3::Bucket resource type.
Steve Baker [Tue, 11 Sep 2012 02:58:34 +0000 (14:58 +1200)]
Implement the AWS::S3::Bucket resource type.

An attempt was made to make created bucket names readable and unique.
Names are of the format heat-<resource name>-<random hex>. eg:
heat-S3Bucket-b420d12d02e5d6e46f13

Only the swift v2 auth is currently supported, which means swift will need to
use keystone for auth. This may be a valid assumption for any environment that
is running Heat.

When DeletionPolicy is Delete then an attempt is made to delete the container,
but the stack will still be deleted if container delete fails.

Run the template S3_Single_Instance.template to give it a try.

Functional tests will be coming in a later change.

Change-Id: Ifa2c3c4fcbdb00a44f8c6b347a61f8e1735e8328

12 years agoUpdate documentation on configuring metadata server
Zane Bitter [Mon, 10 Sep 2012 20:13:07 +0000 (22:13 +0200)]
Update documentation on configuring metadata server

The docs need to reflect the fact that the metadata server cannot be
configured and launched until after Nova has created the virtual bridge
interface.

See issue #196

Change-Id: Ia1a004106fa2b535b54c7b88e8ed177e47e72844
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoHandle verification errors in create/update in cfn API
Zane Bitter [Mon, 10 Sep 2012 16:04:34 +0000 (18:04 +0200)]
Handle verification errors in create/update in cfn API

If a StackCreate or StackUpdate call fails verification in the engine, we
get an error message returned rather than a stack identifier.

Fixes #224

Change-Id: I5f47f5d0e25e8bc05633d29605adcc8827edd379
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat tools : nova_create_flavors.sh additional retry logic
Steven Hardy [Mon, 10 Sep 2012 09:52:13 +0000 (10:52 +0100)]
heat tools : nova_create_flavors.sh additional retry logic

Add retry logic in order to make creating flavors more
robust.  Nova rate-limiting frequently causes actions to fail
so wrap all requests in retry/sleep logic and check we can
connect to nova before attempting to change anything

Ref #225

Change-Id: I1b1014df04602935f561c08ba29287061224b5f3
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tools : add ephemeral disk for all flavors
Steven Hardy [Mon, 10 Sep 2012 10:03:37 +0000 (11:03 +0100)]
heat tools : add ephemeral disk for all flavors

Add ephemeral disk for all flavors in nova_create_flavors.sh
as it's currently not possible for EBS to work without a fixed
mapping to a specific block device name, meaning the EBS templates
will break for micro/tiny if there if no ephemeral disk defined

Change-Id: I801f00aba5b431d30362cd4b34da2f66457220c5
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tools : check services running after openstack install
Steven Hardy [Mon, 10 Sep 2012 09:49:45 +0000 (10:49 +0100)]
heat tools : check services running after openstack install

Check all expected services are running after starting them when
doing tools/openstack install, should avoid possible racy behavior
when we assume everything is up and immediately call nova_create_flavors.sh

Ref #225

Change-Id: I87ec0ca31579173cb9218fa79e027fd5b15031f0
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoRework functional test case infrasatructure
Steven Dake [Fri, 7 Sep 2012 20:22:42 +0000 (13:22 -0700)]
Rework functional test case infrasatructure

To support multi-instance, two new classes were made:
Stack - represents a stack
Instance - represents an instance

For multi-instance stacks, create multiple Instance objects
for each instance in the stack.

For each instance in a stack, an instance object can be created which
helps validate the individual instance sets up properly.

test_WordPress_Single_Instance_With_EBS.py fails - see issue #226

Change-Id: Iddec87cd1332a9b5796c5c7e7d382ef723c3544e
Signed-off-by: Steven Dake <sdake@redhat.com>
Signed-off-by: Tomas Sedovic <tsedovic@redhat.com>
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoAdd a string representation for identifiers
Zane Bitter [Fri, 7 Sep 2012 12:55:54 +0000 (14:55 +0200)]
Add a string representation for identifiers

This makes debugging in unit tests a lot easier.

Change-Id: I320cdf754e405377abfeb61496b017809d25d719
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd unit tests for EngineManager create/update/delete_stack
Zane Bitter [Fri, 7 Sep 2012 12:57:13 +0000 (14:57 +0200)]
Add unit tests for EngineManager create/update/delete_stack

Change-Id: I25aeb43ea3f5a9426b8f742a605b9699dc2b9851
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoFix update_stack call in EngineManager
Zane Bitter [Fri, 7 Sep 2012 12:54:55 +0000 (14:54 +0200)]
Fix update_stack call in EngineManager

This was broken by 38f886947c91ebf610ab2972649a06bec630746b

Change-Id: I134bee2df35d6b025f0ac88334ab30a9a22c7922
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoReorganise etc directory for easier installation
Zane Bitter [Fri, 7 Sep 2012 13:09:54 +0000 (15:09 +0200)]
Reorganise etc directory for easier installation

This also means that the install script will install bash-completion for
heat.

Change-Id: Ib60346c72ce6277951cb51952e359f97be20a1be
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Switch to keystone service_type=orchestration."
Jenkins [Fri, 7 Sep 2012 03:58:50 +0000 (03:58 +0000)]
Merge "Switch to keystone service_type=orchestration."

12 years agoDelete unused heat-engine-paste.ini
Angus Salkeld [Fri, 7 Sep 2012 03:12:27 +0000 (13:12 +1000)]
Delete unused heat-engine-paste.ini

Change-Id: I4c8d5b2d98634aa4d711d3fe8816891476645548
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoMake sure the properties are defined in all cases.
Angus Salkeld [Fri, 7 Sep 2012 00:12:29 +0000 (10:12 +1000)]
Make sure the properties are defined in all cases.

fixes #194

Change-Id: I994283734d551f81143e7f5de50da0180a277119
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoAdd test case for WordPress_With_LB.template
Steven Dake [Thu, 6 Sep 2012 22:04:03 +0000 (15:04 -0700)]
Add test case for WordPress_With_LB.template

Change-Id: I324da126b5a775a00b97d868cbd347dd65cb16aa
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoMerge "Rename heat-api to heat-api-cfn"
Jenkins [Thu, 6 Sep 2012 21:50:36 +0000 (21:50 +0000)]
Merge "Rename heat-api to heat-api-cfn"

12 years agoAdd a Wordpress+MySQL composed instance functional test case
Steven Dake [Thu, 6 Sep 2012 20:27:50 +0000 (13:27 -0700)]
Add a Wordpress+MySQL composed instance functional test case

Change-Id: I6a905b186be59c929e530519414e46d222b4ea08
Signed-off-by: Steven Dake <sdake@redhat.com>
12 years agoMerge "Add EBS test."
Jenkins [Thu, 6 Sep 2012 18:24:39 +0000 (18:24 +0000)]
Merge "Add EBS test."

12 years agoAdd EBS test.
Ian Main [Thu, 6 Sep 2012 18:10:48 +0000 (11:10 -0700)]
Add EBS test.

Single wordpress EBS functional test.

Change-Id: I3a3e53b418a38a2bb8573d7abb16c9c7fe8837ca
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoheat tests : new wordpress EBS_EIP functional test
Steven Hardy [Thu, 6 Sep 2012 16:51:10 +0000 (17:51 +0100)]
heat tests : new wordpress EBS_EIP functional test

Add new functional test for the
WordPress_Single_Instance_With_EBS_EIP template

Fixes #209

Change-Id: I800cbe21ef42611f93644e6a0c60b732af663025
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoForgot commas, doh!
Ian Main [Thu, 6 Sep 2012 16:40:42 +0000 (09:40 -0700)]
Forgot commas, doh!

I had this in and tested but forgot to put commas in after update.

Change-Id: I7fbcacea0a4ab40f1e6b6e016fd5940ba8432c26
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoMore EBS fixes.
Ian Main [Thu, 6 Sep 2012 15:27:45 +0000 (08:27 -0700)]
More EBS fixes.

Single instance with EBS apparently needs an httpd restart in order to
keep talking to mysql after we change the partition.  Also change other
EBS templates to use vdc.

Change-Id: I180cca2166a0210d5d8dd3e0aea111ea625b865a
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoRename heat-api to heat-api-cfn
Zane Bitter [Thu, 30 Aug 2012 11:32:47 +0000 (13:32 +0200)]
Rename heat-api to heat-api-cfn

The previous heat-api is, in fact, a CloudFormation-compatible API. Rename
it to heat-api-cfn, analogous to how the EC2 API in Nova is named
nova-api-ec2.

Change-Id: I9759f10cee6a60cdc9cb917966eb9fb95a618f85
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat templates : EBS templates, attach volume to vdc
Steven Hardy [Thu, 6 Sep 2012 13:32:14 +0000 (14:32 +0100)]
heat templates : EBS templates, attach volume to vdc

Fix Single_Instance_With_EBS templates, need the EBS
disk to attach to vdc not vdb which is used for the
ephemeral disk (fix from imain)

Fixes #185

Change-Id: I47d1b640d25c0f53dd4535e4bd73846d01f4fc86
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : bugfix FuncUtils check StackId not StackName
Steven Hardy [Thu, 6 Sep 2012 10:41:15 +0000 (11:41 +0100)]
heat tests : bugfix FuncUtils check StackId not StackName

CreateStack response no longer contains StackName, so
we need to parse the StackId and extract the name from
the new ARN format

Change-Id: If55ff286c98e8396a14fa4ee2b08622faa680a03
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat templates : Add default LinuxDistribution parameter
Steven Hardy [Thu, 6 Sep 2012 10:01:10 +0000 (11:01 +0100)]
heat templates : Add default LinuxDistribution parameter

Add default value to LinuxDistribution template parameter
for MySQL_Single_Instance.template

Change-Id: I6431b717dee700f9db588ddbaf58511d0a3b107c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoFix identify_stack call
Zane Bitter [Thu, 6 Sep 2012 10:37:24 +0000 (12:37 +0200)]
Fix identify_stack call

It needs to return a dictionary in order for the result to be converted to
JSON.

Change-Id: Ieef360fd6872624325470fab626d371ed28535e6
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoMerge "Add a newline to user data injection."
Jenkins [Thu, 6 Sep 2012 04:13:49 +0000 (04:13 +0000)]
Merge "Add a newline to user data injection."

12 years agoModify to use systemctl and move func_utils outside of setUp
Jeff Peeler [Thu, 6 Sep 2012 02:47:18 +0000 (22:47 -0400)]
Modify to use systemctl and move func_utils outside of setUp

Change-Id: I420991fa4e881f6f9fadd0add02a9d1493240dfc
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoAdd a newline to user data injection.
Ian Main [Thu, 6 Sep 2012 02:00:54 +0000 (19:00 -0700)]
Add a newline to user data injection.

If no newline is present at the end of the user-data section of the
template, the addition of the touch command will cause the last
line to break.

Change-Id: I15ba402f83f6fba03f7d0455a63a5dc03480973d
Signed-off-by: Ian Main <imain@redhat.com>
12 years agoFix pep8 warning
Angus Salkeld [Thu, 30 Aug 2012 01:41:25 +0000 (11:41 +1000)]
Fix pep8 warning

Change-Id: Ia0b4336e7e861fefc7afebc99a3c6ddf48841d71
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoSupport lookup of stacks by name or ARN
Zane Bitter [Wed, 5 Sep 2012 19:51:25 +0000 (21:51 +0200)]
Support lookup of stacks by name or ARN

Previously stacks could only be referenced by name. Now, use the canonical
stack identifier to act on them. The identifier can be obtained from the
RPC API by looking it up with identify_stack. In the AWS API, the user
can pass an ARN that is converted into an identifier.

Change-Id: I29309d12e522ed301c3f6269df5d1d14382b024b
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd an identify_stack RPC call
Zane Bitter [Wed, 5 Sep 2012 19:51:25 +0000 (21:51 +0200)]
Add an identify_stack RPC call

This call converts a stack name into a fully-qualified stack identifier.

This allows us to, e.g., add support for keeping deleted stacks around in
the database while still allowing stack names to be reused, since the
deleted stacks can be referenced using this ID.

Change-Id: Ide19841a92a25d2f6172f19c2627d24ab6d2fd63
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoReport StackId in ARN format
Zane Bitter [Wed, 5 Sep 2012 19:51:25 +0000 (21:51 +0200)]
Report StackId in ARN format

In the RPC API, return a full stack identifier instead of just the database
ID of a stack. In the AWS API, convert this to an ARN for the user.

Change-Id: I5c3ede4885c4ac5801cfef49e05695f3d13622da
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoCreate a unique identifier for stacks
Zane Bitter [Wed, 5 Sep 2012 19:51:25 +0000 (21:51 +0200)]
Create a unique identifier for stacks

Change-Id: I1517502a2a5d9a96803565297315e7b276f2e974
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoUse assertEqual() instead of assert_()
Zane Bitter [Wed, 5 Sep 2012 19:51:25 +0000 (21:51 +0200)]
Use assertEqual() instead of assert_()

assertEqual(x, y) reports helpful error messages, unlike assert_(x == y)
which reports only that False is not True.

Change-Id: Idbea59dc4dbbe4ac00bad6f358896fbc9401acab
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoheat tests : add functional test for Wordpress RDS
Steven Hardy [Wed, 5 Sep 2012 15:26:27 +0000 (16:26 +0100)]
heat tests : add functional test for Wordpress RDS

Add functional test for WordPress_With_RDS template

Fixes: #215
Change-Id: I0613c40e218acaab987a2b0e0df7737cb6f6b6b3
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : convert functional test to class
Steven Hardy [Wed, 5 Sep 2012 14:13:59 +0000 (15:13 +0100)]
heat tests : convert functional test to class

Covert test_WordPress_Single_Instance_With_EIP to be nose
unittest.TestCase subclass, so run_tests.sh outputs a more
informative test identifier

Change-Id: I21968b4ae9e0e8f7bc1ef9d3f6db0433f106826a
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : update WordPress_Single_Instance_With_EIP
Steven Hardy [Wed, 5 Sep 2012 13:39:44 +0000 (14:39 +0100)]
heat tests : update WordPress_Single_Instance_With_EIP

Update functional test WordPress_Single_Instance_With_EIP
to use the new verify_wordpress which checks that the wordpress
homepage specified in the stack output looks OK

Change-Id: I6b839e95f2c9fc8d89a22c062c393d6f14fb5df9
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : convert functional test to testcase class
Steven Hardy [Wed, 5 Sep 2012 13:20:19 +0000 (14:20 +0100)]
heat tests : convert functional test to testcase class

Covert test_WordPress_Single_Instance to be nose unittest.TestCase
subclass, so run_tests.sh outputs a more informative test identifier

Change-Id: I19fe8565d99253cabcbc93d2f003c69d953be615
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : FuncUtils use heat_client in create_stack
Steven Hardy [Wed, 5 Sep 2012 09:47:46 +0000 (10:47 +0100)]
heat tests : FuncUtils use heat_client in create_stack

Use heat_client (not subprocess) to create the stack,
as this will allow easier testing of the boto_client
library and easier checking of create_stack result

Change-Id: Ic3f710ec2e467bcd2fde1a2451709d444b89aca0
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : FuncUtils cleanup use heat_client
Steven Hardy [Tue, 4 Sep 2012 18:03:24 +0000 (19:03 +0100)]
heat tests : FuncUtils cleanup use heat_client

Use heat_client calls (not subprocess) in cleanup

Change-Id: Ie622d22af66ce00272df975823a74a8fa7bd25c8
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "Add functional test for HA template"
Jenkins [Wed, 5 Sep 2012 12:33:29 +0000 (12:33 +0000)]
Merge "Add functional test for HA template"

12 years agoSwitch to keystone service_type=orchestration.
Steve Baker [Tue, 4 Sep 2012 20:16:55 +0000 (08:16 +1200)]
Switch to keystone service_type=orchestration.

This is to match the service type configured in devstack heat.

12 years agoheat tests : test_WordPress_Single_Instance.py update
Steven Hardy [Tue, 4 Sep 2012 16:25:29 +0000 (17:25 +0100)]
heat tests : test_WordPress_Single_Instance.py update

Update test_WordPress_Single_Instance.py to use the new
verify_wordpress which checks that the wordpress homepage
specified in the stack output looks OK

Change-Id: I9c2c35215ac97f98e62bf1787db3d8645b50c762
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : Add verify_wordpress helper function
Steven Hardy [Tue, 4 Sep 2012 16:18:37 +0000 (17:18 +0100)]
heat tests : Add verify_wordpress helper function

Functional tests : Add a new VerifyStack class and retry decorator,
which allows easy implementation of tests for stack successful creation.

Initial simple verify_wordpress function scrapes a wordpress homepage
and looks for a known string in the html result.

Change-Id: I32bd4bea04228c4f393894c65d040d55c65ddbca
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : FuncUtils add get_stack_output function
Steven Hardy [Tue, 4 Sep 2012 16:08:34 +0000 (17:08 +0100)]
heat tests : FuncUtils add get_stack_output function

Add a function to FuncUtils which allows us to easily parse
the stack outputs defined in a template

Change-Id: Ie1891cb11f54d019315350d449bdc5e22e340458
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoMerge "heat tools : add qpid-cpp-server-daemon to tools/openstack"
Jenkins [Tue, 4 Sep 2012 16:02:21 +0000 (16:02 +0000)]
Merge "heat tools : add qpid-cpp-server-daemon to tools/openstack"

12 years agoFix support for eventlet 0.9.16
Tomas Sedovic [Mon, 3 Sep 2012 14:59:57 +0000 (16:59 +0200)]
Fix support for eventlet 0.9.16

The changes in c7059ae54ef2712e7599a6de30a631d3a0bb6bd2 were not enough
to provide compatibility with 0.9.16 and 0.9.17.ith 0.9.16 and 0.9.17.

Change-Id: Id1ddc988443e162f1c835505b619b7b45e86578d
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
12 years agoheat tools : add qpid-cpp-server-daemon to tools/openstack
Steven Hardy [Mon, 3 Sep 2012 13:04:31 +0000 (14:04 +0100)]
heat tools : add qpid-cpp-server-daemon to tools/openstack

As of qpid-cpp-server-0.16-5 the service scripts have been
moved to a separate qpid-cpp-server-daemon package, so add
this to the list of required packages for openstack install

Fixes : #219

Change-Id: I6c8b53a69953c543df7cd68637e4ff5e4ca495ad
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd functional test for HA template
Angus Salkeld [Tue, 28 Aug 2012 03:16:32 +0000 (13:16 +1000)]
Add functional test for HA template

Change-Id: I6d3304b807492e7041264402d161365447fa6ce1
Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
12 years agoheat : run_tests.sh allow easier test selection
Steven Hardy [Fri, 31 Aug 2012 12:49:40 +0000 (13:49 +0100)]
heat : run_tests.sh allow easier test selection

Allow each category of test (unit/funtional/pep) to be
more easily selected via CLI options, default with no args
remains unit+pep8

Change-Id: I85bbe0afe6170559a42f8c1619db24df16c6d9b0
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat cli : initial heat-watch cloudwatch API client
Steven Hardy [Wed, 22 Aug 2012 09:30:46 +0000 (10:30 +0100)]
heat cli : initial heat-watch cloudwatch API client

Implements new client to demonstrate new Cloudwatch API

Currently only provides options for DescribeAlarms,
ListMetrics, PutMetricData and SetAlarmState

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

12 years agoheat API : Implement initial CloudWatch API
Steven Hardy [Wed, 22 Aug 2012 09:30:03 +0000 (10:30 +0100)]
heat API : Implement initial CloudWatch API

Initial AWS-compatible CloudWatch API implementation
Supports the following API actions:
- DescribeAlarms : describe alarm/watch details
- ListMetrics : List watch metric datapoints
- PutMetricData : Create metric datapoint
- SetAlarmState : temporarily set alarm state

Skeleton implementation of all other TODO actions which
returns HeatAPINotImplementedError.

Only basic filtering parameters supported at this time.

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

12 years agoMerge "Add new functional test for WordPress_Single_Instance_With_EIP"
Jenkins [Fri, 31 Aug 2012 15:25:47 +0000 (15:25 +0000)]
Merge "Add new functional test for WordPress_Single_Instance_With_EIP"

12 years agoMerge "Connect to heat client, add accessor method, and fix ip check"
Jenkins [Fri, 31 Aug 2012 15:24:36 +0000 (15:24 +0000)]
Merge "Connect to heat client, add accessor method, and fix ip check"

12 years agoMerge "Add new methods to get access to nova/glance clients"
Jenkins [Fri, 31 Aug 2012 15:23:30 +0000 (15:23 +0000)]
Merge "Add new methods to get access to nova/glance clients"

12 years agoMerge "Make sure the functional test always cleans up"
Jenkins [Fri, 31 Aug 2012 15:22:08 +0000 (15:22 +0000)]
Merge "Make sure the functional test always cleans up"

12 years agoheat engine : Add set_watch_state engine RPC action
Steven Hardy [Thu, 30 Aug 2012 12:56:47 +0000 (13:56 +0100)]
heat engine : Add set_watch_state engine RPC action

Add set_watch_state which allows a watch/alarm state
to be temporarily overridden, simplified asynchronous
version following review/discussion

Change-Id: I9f1424007fc16d1cec2f7dc504600455fe5ab3bb
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat engine : Expose valid watch states via engine.api
Steven Hardy [Wed, 29 Aug 2012 14:11:06 +0000 (15:11 +0100)]
heat engine : Expose valid watch states via engine.api

Expose valid watch states via engine.api

Change-Id: I26a1d8939ce75a0be88e646858f3f3b4feb5e8d0
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd new functional test for WordPress_Single_Instance_With_EIP
Jeff Peeler [Fri, 31 Aug 2012 05:57:37 +0000 (01:57 -0400)]
Add new functional test for WordPress_Single_Instance_With_EIP

Change-Id: I483c5c32b9c29dc966bd154d760108292fcdbf5f
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoConnect to heat client, add accessor method, and fix ip check
Jeff Peeler [Fri, 31 Aug 2012 05:19:39 +0000 (01:19 -0400)]
Connect to heat client, add accessor method, and fix ip check

Search server list for IP based on the PhysicalResourceId, not an arbitrary
server name. Wait until stack create event before obtaining value.

Change-Id: Ie9e3df5369132dbf668f8b42cd10a7f2faec1922
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoAdd new methods to get access to nova/glance clients
Jeff Peeler [Thu, 30 Aug 2012 15:38:09 +0000 (11:38 -0400)]
Add new methods to get access to nova/glance clients

Change-Id: I5be8d7d57d021635422035742f59acdaeb8b409a
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMake sure the functional test always cleans up
Tomas Sedovic [Thu, 30 Aug 2012 13:44:41 +0000 (15:44 +0200)]
Make sure the functional test always cleans up

Change-Id: I740f676452905d3aceb3d2df37e4c4cdb6b81d7e
Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
12 years agoheat API : add get_param_value to API utils
Steven Hardy [Tue, 28 Aug 2012 18:25:28 +0000 (19:25 +0100)]
heat API : add get_param_value to API utils

Add get_param_value helper to common aws API utils

Change-Id: I69ab3ed1e34f8691457f3d986b4af06b1d381039
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd new arguments to run_tests
Jeff Peeler [Wed, 29 Aug 2012 17:30:47 +0000 (13:30 -0400)]
Add new arguments to run_tests

Execute unit tests and pep8 by default. Allow tests to be chosen in a more
additive fashion. Cleaned up unnecessary let statements and variable
defines.

Change-Id: I40676c5d0deda7bd3abc4bdadfd404f5909c166e
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoRefactor reformat_dict_keys()
Zane Bitter [Wed, 29 Aug 2012 17:12:48 +0000 (19:12 +0200)]
Refactor reformat_dict_keys()

This way is a little more Pythonic.

Change-Id: Ib48d0e9b7e8a4ed6e220c645a29510c893e97419
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRefactor extract_param_pairs()
Zane Bitter [Wed, 29 Aug 2012 17:35:12 +0000 (19:35 +0200)]
Refactor extract_param_pairs()

Implement it in terms of the more general extract_param_list().

Change-Id: Ifbf0dd8205da87e707610c0b8cb0ca616d7b2e22
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoRefactor extract_param_list()
Zane Bitter [Wed, 29 Aug 2012 14:10:31 +0000 (16:10 +0200)]
Refactor extract_param_list()

Change-Id: Ia338c7c4a17af90885b1c83297d32a61d2177ecd
Signed-off-by: Zane Bitter <zbitter@redhat.com>
12 years agoAdd link to RPM repository in getting started
Jeff Peeler [Tue, 28 Aug 2012 19:23:44 +0000 (15:23 -0400)]
Add link to RPM repository in getting started

Change-Id: I79fcc10b2594b977097d7d91022cbd50adcc9167
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoheat API : Add api.aws.utils.extract_param_list
Steven Hardy [Thu, 23 Aug 2012 17:21:07 +0000 (18:21 +0100)]
heat API : Add api.aws.utils.extract_param_list

Add new common helper function which extracts
AWS parameter lists

Change-Id: Ic77ff6014a4f39d4fb5d59a1391f87cdd94f0f7f
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : rename test_stacks
Steven Hardy [Tue, 28 Aug 2012 08:35:20 +0000 (09:35 +0100)]
heat tests : rename test_stacks

Rename test_stacks.py to test_engine_manager.py
as this better reflects what is being tested

Change-Id: I612351286fbb008b2be3db7519f0a24ab9d2d8e2
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : add test for new manager show_watch_metric method
Steven Hardy [Tue, 28 Aug 2012 08:33:01 +0000 (09:33 +0100)]
heat tests : add test for new manager show_watch_metric method

Add unit tests for new manager show_watch_metric action

Change-Id: Ie1b7c0a0e1eb5c7e5fad74674b1a9669bf7c9a1c
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : add tests for new manager show_watch method
Steven Hardy [Fri, 24 Aug 2012 15:33:19 +0000 (16:33 +0100)]
heat tests : add tests for new manager show_watch method

Add unit test for new show_watch engine action

Change-Id: I00153f258687e02837b901c399df51085bb34303
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat engine : bugfix show_watch, fix single-watch mode
Steven Hardy [Fri, 24 Aug 2012 15:30:39 +0000 (16:30 +0100)]
heat engine : bugfix show_watch, fix single-watch mode

When called with watch_name!=None we need to wrap the
watch_rule_get response in a list

Change-Id: I83bbe816758767afd3eb49b090b0b652036cad60
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoheat tests : add new engine rpcapi unit tests
Steven Hardy [Fri, 24 Aug 2012 12:22:16 +0000 (13:22 +0100)]
heat tests : add new engine rpcapi unit tests

Add tests for new watch engine methods

Change-Id: Icbfc900d7578d7d0f8cd9024d8a5b57a9695c0a4
Signed-off-by: Steven Hardy <shardy@redhat.com>
12 years agoAdd test-requires in RPM package list form
Jeff Peeler [Mon, 27 Aug 2012 20:33:59 +0000 (16:33 -0400)]
Add test-requires in RPM package list form

This is to allow automated installation of dependences since functional
tests are not going to be run with packages from pip.

Change-Id: Ia9f74bc353bab79d7c78cb086210d8628d701387
Signed-off-by: Jeff Peeler <jpeeler@redhat.com>
12 years agoMerge "Functional test improvements"
Jenkins [Mon, 27 Aug 2012 14:46:51 +0000 (14:46 +0000)]
Merge "Functional test improvements"