Move CREATE_COMPLETE constant to stack.py

Change-Id: I3bedfa9a0097eeb727f51fca599da0f22c29312d
This commit is contained in:
Federico Ressi 2018-12-07 15:45:55 +01:00
parent 5e058e7026
commit e92c7dfa73
6 changed files with 13 additions and 10 deletions

View File

@ -15,7 +15,6 @@ from __future__ import absolute_import
from tobiko import config
COMPLETE_STATUS = "CREATE_COMPLETE"
TEMPLATE_SUFFIX = ".yaml"
DEFAULT_PARAMS = {

View File

@ -23,6 +23,9 @@ import yaml
from tobiko.common import constants
CREATE_COMPLETE = 'CREATE_COMPLETE'
class StackManager(object):
"""Manages Heat stacks."""
@ -37,7 +40,7 @@ class StackManager(object):
return yaml.safe_dump(template)
def create_stack(self, stack_name, template_name, parameters,
status=constants.COMPLETE_STATUS):
status=CREATE_COMPLETE):
"""Creates stack based on passed parameters."""
template = self.load_template(os.path.join(self.templates_dir,
template_name))
@ -66,7 +69,7 @@ class StackManager(object):
res = self.client.resources.get(stack_id, resource_name)
def wait_for_stack_status(self, stack_name,
status=constants.COMPLETE_STATUS):
status=CREATE_COMPLETE):
"""Waits for the stack to reach the given status."""
stack = self.get_stack(stack_name=stack_name)
while (stack.stack_status != status):
@ -76,7 +79,7 @@ class StackManager(object):
def get_output(self, stack, key):
"""Returns a specific value from stack outputs by using a given key."""
if stack.stack_status != constants.COMPLETE_STATUS:
if stack.stack_status != CREATE_COMPLETE:
raise ValueError("Invalid stack status: {!r}".format(
stack.stack_status))
for output in stack.outputs:

View File

@ -20,6 +20,7 @@ import mock
from tobiko.cmd import create
from tobiko.common import constants
from tobiko.common.managers import stack
from tobiko.tests.base import TobikoTest
@ -80,7 +81,7 @@ class TestMain(TobikoTest):
@mock.patch('os.walk')
def _test_main(self, mock_walk, MockClient, stack_names, walk_dir):
# Break wait for stack status loop
MockClient().stacks.get().stack_status = constants.COMPLETE_STATUS
MockClient().stacks.get().stack_status = stack.CREATE_COMPLETE
mock_walk.return_value = [(None, None, [(name + '.yaml')
for name in stack_names])]

View File

@ -19,7 +19,7 @@ import os.path
import mock
from tobiko.cmd import delete
from tobiko.common import constants
from tobiko.common.managers import stack
from tobiko.tests.base import TobikoTest
@ -81,7 +81,7 @@ class TestMain(TobikoTest):
@mock.patch('os.walk')
def _test_main(self, mock_walk, MockClient, stack_names, walk_dir):
# Break wait for stack status loop
MockClient().stacks.get().stack_status = constants.COMPLETE_STATUS
MockClient().stacks.get().stack_status = stack.CREATE_COMPLETE
mock_walk.return_value = [(None, None, [(name + '.yaml')
for name in stack_names])]
MockClient().stacks.list.return_value = [

View File

@ -19,7 +19,7 @@ import os.path
import mock
from tobiko.cmd import list as list_cmd
from tobiko.common import constants
from tobiko.common.managers import stack
from tobiko.tests.base import TobikoTest
@ -105,7 +105,7 @@ class TestMain(TobikoTest):
def _test_main(self, mock_write, mock_walk, MockClient, stack_names,
show_templates):
# Break wait for stack status loop
MockClient().stacks.get().stack_status = constants.COMPLETE_STATUS
MockClient().stacks.get().stack_status = stack.CREATE_COMPLETE
mock_walk.return_value = [(None, None, [(name + '.yaml')
for name in stack_names])]
MockClient().stacks.list.return_value = [

View File

@ -70,4 +70,4 @@ class ScenarioTestsBase(base.TobikoTest):
stack_name=self.stack_name,
template_name="%s.yaml" % self.stack_name,
parameters=self.params,
status=constants.COMPLETE_STATUS)
status=stack.CREATE_COMPLETE)