Add --no-rollback option for stack cancel

This adds a new --no-rollback option for stack cancel.

Usage: openstack stack cancel --no-rollback <stack_name>

Change-Id: I46252823701779e3a3c6867bc470d5532cf9d7a7
Related-Bug: #1709041

2 files changed, 21 insertions, 0 deletions

diff --git a/heatclient/tests/unit/osc/v1/test_stack.py b/heatclient/tests/unit/osc/v1/test_stack.py
index 159056a..ebe5329 100644
--- a/heatclient/tests/unit/osc/v1/test_stack.py
+++ b/heatclient/tests/unit/osc/v1/test_stack.py
@@ -1221,6 +1221,18 @@ class TestStackCancel(_TestStackCheckBase, TestStack):
     def test_stack_cancel(self):
         self._test_stack_action(2)
 
+    def test_stack_cancel_no_rollback(self):
+        self.action = self.mock_client.actions.cancel_without_rollback
+        arglist = ['my_stack', '--no-rollback']
+        parsed_args = self.check_parser(self.cmd, arglist, [])
+        columns, rows = self.cmd.take_action(parsed_args)
+        self.action.assert_called_once_with('my_stack')
+        self.mock_client.stacks.get.assert_called_with('my_stack')
+        self.assertEqual(2,
+                         self.mock_client.stacks.get.call_count)
+        self.assertEqual(self.columns, columns)
+        self.assertEqual(1, len(rows))
+
     def test_stack_cancel_multi(self):
         self._test_stack_action_multi(4)
 
diff --git a/heatclient/tests/unit/test_actions.py b/heatclient/tests/unit/test_actions.py
index 93b6e49..512d566 100644
--- a/heatclient/tests/unit/test_actions.py
+++ b/heatclient/tests/unit/test_actions.py
@@ -98,6 +98,15 @@ class ActionManagerTest(testtools.TestCase):
         manager = self._base_test(expect_args, expect_kwargs)
         manager.cancel_update(**fields)
 
+    def test_cancel_without_rollback(self):
+        fields = {'stack_id': 'teststack%2Fabcd1234'}
+        expect_args = ('POST',
+                       '/stacks/teststack%2Fabcd1234/actions')
+        expect_kwargs = {'data': {'cancel_without_rollback': None}}
+
+        manager = self._base_test(expect_args, expect_kwargs)
+        manager.cancel_without_rollback(**fields)
+
     def test_check(self):
         fields = {'stack_id': 'teststack%2Fabcd1234'}
         expect_args = ('POST',