From 6ec9f557325477b65ac6bebade97298a74fc3c94 Mon Sep 17 00:00:00 2001 From: Manish Tomar Date: Thu, 11 Feb 2016 10:38:00 -0800 Subject: [PATCH 1/2] enabling launch_stack test --- otter/integration/lib/trial_tools.py | 3 ++- otter/integration/tests/test_launch_stack.py | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/otter/integration/lib/trial_tools.py b/otter/integration/lib/trial_tools.py index d7a8be244..6285b02ba 100644 --- a/otter/integration/lib/trial_tools.py +++ b/otter/integration/lib/trial_tools.py @@ -102,7 +102,8 @@ def get_resource_mapping(): Get resource mapping based on the environment settings """ res = {'nova': (nova_key,), - 'loadbalancers': (clb_key,)} + 'loadbalancers': (clb_key,), + 'heat': (heat_key,)} if otter_local_url is not None: res['otter'] = ("badkey", otter_local_url) else: diff --git a/otter/integration/tests/test_launch_stack.py b/otter/integration/tests/test_launch_stack.py index 0b89d3ccf..0e3e41f82 100644 --- a/otter/integration/tests/test_launch_stack.py +++ b/otter/integration/tests/test_launch_stack.py @@ -18,8 +18,7 @@ TestHelper, get_identity, get_resource_mapping, - region, - skip_me) + region) from otter.util.deferredutils import retry_and_timeout from otter.util.http import check_success, headers @@ -112,7 +111,6 @@ def poll(): "Waiting for group {} to reach state {}".format( self.group.group_id, str(expected_states)))) - @skip_me('Due to https://github.com/rackerlabs/mimic/issues/513') @inlineCallbacks def test_create(self): """ From 3c8b11cccddda1b7e820d7e3c7a0da564ccb5e20 Mon Sep 17 00:00:00 2001 From: Manish Tomar Date: Thu, 11 Feb 2016 10:58:03 -0800 Subject: [PATCH 2/2] set imageRef for launch_server only --- otter/integration/lib/autoscale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/otter/integration/lib/autoscale.py b/otter/integration/lib/autoscale.py index 5730eafb9..30b9b033c 100644 --- a/otter/integration/lib/autoscale.py +++ b/otter/integration/lib/autoscale.py @@ -388,7 +388,8 @@ def record_results(resp): return rcs def send(image_id): - if image_id is not None: + lc_type = self.group_config["launchConfiguration"]["type"] + if image_id is not None and lc_type == "launch_server": self.group_config = update_in( self.group_config, ["launchConfiguration", "args", "server", "imageRef"],