From 3cde0b5693fbd7008800873dab3cec66cf24f848 Mon Sep 17 00:00:00 2001
From: yanzhangi <51999930+yanzhangi@users.noreply.github.com>
Date: Wed, 18 Sep 2019 10:52:32 +0800
Subject: [PATCH] Update ce_evpn_global to fix bugs (#61013)
---
.../modules/network/cloudengine/ce_evpn_global.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/ansible/modules/network/cloudengine/ce_evpn_global.py b/lib/ansible/modules/network/cloudengine/ce_evpn_global.py
index b57c887ed58..bdc9d296264 100644
--- a/lib/ansible/modules/network/cloudengine/ce_evpn_global.py
+++ b/lib/ansible/modules/network/cloudengine/ce_evpn_global.py
@@ -102,7 +102,7 @@ changed:
from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network.cloudengine.ce import get_config, load_config
+from ansible.module_utils.network.cloudengine.ce import exec_command, load_config
from ansible.module_utils.network.cloudengine.ce import ce_argument_spec
@@ -153,11 +153,11 @@ class EvpnGlobal(object):
""" get current EVPN global configuration"""
self.global_info['evpnOverLay'] = 'disable'
- flags = list()
- exp = " | include evpn-overlay enable"
- flags.append(exp)
- config = get_config(self.module, flags)
- if config:
+ cmd = "display current-configuration | include ^evpn-overlay enable"
+ rc, out, err = exec_command(self.module, cmd)
+ if rc != 0:
+ self.module.fail_json(msg=err)
+ if out:
self.global_info['evpnOverLay'] = 'enable'
def get_existing(self):