Merge 34d46e5 into 3457d3e

ncclient · Mar 5, 2018 · c453573 · c453573
2 parents 3457d3e + 34d46e5
commit c453573
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/docs/source/operations.rst b/docs/source/operations.rst
@@ -75,6 +75,10 @@ Editing
     :members: request
     :show-inheritance:
 
+.. autoclass:: CancelCommit
+    :members: request
+    :show-inheritance:
+
 Locking
 ........
 

diff --git a/ncclient/manager.py b/ncclient/manager.py
@@ -38,6 +38,7 @@
     "validate": operations.Validate,
     "commit": operations.Commit,
     "discard_changes": operations.DiscardChanges,
+    "cancel_commit": operations.CancelCommit,
     "delete_config": operations.DeleteConfig,
     "lock": operations.Lock,
     "unlock": operations.Unlock,

diff --git a/ncclient/operations/__init__.py b/ncclient/operations/__init__.py
@@ -18,7 +18,7 @@
 # rfc4741 ops
 
 from ncclient.operations.retrieve import Get, GetConfig, GetSchema, GetReply, Dispatch
-from ncclient.operations.edit import EditConfig, CopyConfig, DeleteConfig, Validate, Commit, DiscardChanges
+from ncclient.operations.edit import EditConfig, CopyConfig, DeleteConfig, Validate, Commit, DiscardChanges, CancelCommit
 from ncclient.operations.session import CloseSession, KillSession
 from ncclient.operations.lock import Lock, Unlock, LockContext
 from ncclient.operations.subscribe import CreateSubscription
@@ -41,6 +41,7 @@
     'Validate',
     'Commit',
     'DiscardChanges',
+    'CancelCommit',
     'DeleteConfig',
     'Lock',
     'Unlock',

diff --git a/test/unit/operations/test_edit.py b/test/unit/operations/test_edit.py
@@ -164,3 +164,16 @@ def test_discard_changes(self, mock_request):
         call = mock_request.call_args_list[0][0][0]
         call = ElementTree.tostring(call)
         self.assertEqual(call, xml)
+
+    @patch('ncclient.operations.RPC._request')
+    def test_cancel_commit(self, mock_request):
+        session = ncclient.transport.SSHSession(self.device_handler)
+        session._server_capabilities = [':candidate', ":confirmed-commit"]
+        obj = CancelCommit(session, self.device_handler, raise_mode=RaiseMode.ALL)
+        obj.request(persist_id="foo")
+        node = new_ele("cancel-commit")
+        sub_ele(node, "persist-id").text = "foo"
+        xml = ElementTree.tostring(node)
+        call = mock_request.call_args_list[0][0][0]
+        call = ElementTree.tostring(call)
+        self.assertEqual(call, xml)