Implement Stack status and action properties
This splits the stack_status back to an action and status, as it is represented internally in heat-engine. It assumes there will not be an action which contains an _. This change is needed for code (such as tempest) which assumes a convention of all openstack client resources having a status property. Change-Id: If00db5508bf8469b1106cac20b8fc10f7e1a854d
This commit is contained in:
parent
cae2c0fd7b
commit
529d429d49
45
heatclient/tests/test_stacks.py
Normal file
45
heatclient/tests/test_stacks.py
Normal file
@ -0,0 +1,45 @@
|
||||
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
||||
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||
# not use this file except in compliance with the License. You may obtain
|
||||
# a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from heatclient.v1.stacks import Stack
|
||||
|
||||
import testscenarios
|
||||
from testscenarios.scenarios import multiply_scenarios
|
||||
import testtools
|
||||
|
||||
|
||||
load_tests = testscenarios.load_tests_apply_scenarios
|
||||
|
||||
|
||||
class StackStatusActionTest(testtools.TestCase):
|
||||
|
||||
scenarios = multiply_scenarios([
|
||||
('CREATE', dict(action='CREATE')),
|
||||
('DELETE', dict(action='DELETE')),
|
||||
('UPDATE', dict(action='UPDATE')),
|
||||
('ROLLBACK', dict(action='ROLLBACK')),
|
||||
('SUSPEND', dict(action='SUSPEND')),
|
||||
('RESUME', dict(action='RESUME'))
|
||||
], [
|
||||
('IN_PROGRESS', dict(status='IN_PROGRESS')),
|
||||
('FAILED', dict(status='FAILED')),
|
||||
('COMPLETE', dict(status='COMPLETE'))
|
||||
])
|
||||
|
||||
def test_status_action(self):
|
||||
stack_status = '%s_%s' % (self.action, self.status)
|
||||
stack = Stack(None, {'stack_status': stack_status})
|
||||
self.assertEqual(self.action, stack.action)
|
||||
self.assertEqual(self.status, stack.status)
|
@ -33,6 +33,18 @@ class Stack(base.Resource):
|
||||
def data(self, **kwargs):
|
||||
return self.manager.data(self, **kwargs)
|
||||
|
||||
@property
|
||||
def action(self):
|
||||
s = self.stack_status
|
||||
# Return everything before the first underscore
|
||||
return s[:s.index('_')]
|
||||
|
||||
@property
|
||||
def status(self):
|
||||
s = self.stack_status
|
||||
# Return everything after the first underscore
|
||||
return s[s.index('_') + 1:]
|
||||
|
||||
|
||||
class StackManager(base.Manager):
|
||||
resource_class = Stack
|
||||
|
Loading…
x
Reference in New Issue
Block a user