From 4e94423e412457eb547b6702b5af0b0a037e181e Mon Sep 17 00:00:00 2001
From: Xu Yuandong <786018072@qq.com>
Date: Thu, 8 Aug 2019 12:57:55 +0800
Subject: [PATCH] Backport/2.8/60071 ce_config : It is necessary to undo
 mmi-mode enable after running commands. (#60071) (#60085)

* It is necessary to undo mmi-mode enable after running commands. (#60071)


(cherry picked from commit 13c8f7b00c4a2ae8d93120dabd9e2f5eeb706ae5)

* add a changelog fragment.
---
 changelogs/fragments/60085-ce_config _set_mmi-mode.yml | 2 ++
 lib/ansible/modules/network/cloudengine/ce_config.py   | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 changelogs/fragments/60085-ce_config _set_mmi-mode.yml

diff --git a/changelogs/fragments/60085-ce_config _set_mmi-mode.yml b/changelogs/fragments/60085-ce_config _set_mmi-mode.yml
new file mode 100644
index 00000000000..17ff34fc3b1
--- /dev/null
+++ b/changelogs/fragments/60085-ce_config _set_mmi-mode.yml	
@@ -0,0 +1,2 @@
+bugfixes:
+  - ce_config  - It is also necessary to undo mmi-mode enable after running commands.Otherwise it will make a effect to next tasks.(https://github.com/ansible/ansible/pull/60071).
diff --git a/lib/ansible/modules/network/cloudengine/ce_config.py b/lib/ansible/modules/network/cloudengine/ce_config.py
index 011dba46b13..9a07642e0a9 100644
--- a/lib/ansible/modules/network/cloudengine/ce_config.py
+++ b/lib/ansible/modules/network/cloudengine/ce_config.py
@@ -261,7 +261,12 @@ def _load_config(module, config):
                         print_msg = print_msg2
                     module.fail_json(msg=print_msg)
 
-    exec_command(module, 'return')
+    rc, out, err = exec_command(module, 'return')
+    if rc != 0:
+        module.fail_json(msg='unable to return', output=err)
+    rc, out, err = exec_command(module, 'undo mmi-mode enable')
+    if rc != 0:
+        module.fail_json(msg='unable to undo mmi-mode enable', output=err)
 
 
 def conversion_src(module):