|
|
@ -169,7 +169,7 @@ changed:
|
|
|
|
|
|
|
|
|
|
|
|
import re
|
|
|
|
import re
|
|
|
|
from ansible.module_utils.basic import AnsibleModule
|
|
|
|
from ansible.module_utils.basic import AnsibleModule
|
|
|
|
from ansible.module_utils.network.cloudengine.ce import get_config, load_config, ce_argument_spec
|
|
|
|
from ansible.module_utils.network.cloudengine.ce import exec_command, load_config, ce_argument_spec
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def is_config_exist(cmp_cfg, test_cfg):
|
|
|
|
def is_config_exist(cmp_cfg, test_cfg):
|
|
|
@ -259,19 +259,17 @@ class EvpnBgpRr(object):
|
|
|
|
def get_config_in_bgp_view(self):
|
|
|
|
def get_config_in_bgp_view(self):
|
|
|
|
"""Get configuration in BGP view"""
|
|
|
|
"""Get configuration in BGP view"""
|
|
|
|
|
|
|
|
|
|
|
|
flags = list()
|
|
|
|
cmd = "display current-configuration | section include"
|
|
|
|
exp = " | section include"
|
|
|
|
|
|
|
|
if self.as_number:
|
|
|
|
if self.as_number:
|
|
|
|
if self.bgp_instance:
|
|
|
|
if self.bgp_instance:
|
|
|
|
exp += " bgp %s instance %s" % (self.as_number,
|
|
|
|
cmd += " bgp %s instance %s" % (self.as_number,
|
|
|
|
self.bgp_instance)
|
|
|
|
self.bgp_instance)
|
|
|
|
else:
|
|
|
|
else:
|
|
|
|
exp += " bgp %s" % self.as_number
|
|
|
|
cmd += " bgp %s" % self.as_number
|
|
|
|
|
|
|
|
rc, out, err = exec_command(self.module, cmd)
|
|
|
|
flags.append(exp)
|
|
|
|
if rc != 0:
|
|
|
|
config = get_config(self.module, flags)
|
|
|
|
self.module.fail_json(msg=err)
|
|
|
|
cmd = 'display current-configuration ' + exp
|
|
|
|
config = out.strip() if out else ""
|
|
|
|
config = config.strip() if config else ""
|
|
|
|
|
|
|
|
if cmd == config:
|
|
|
|
if cmd == config:
|
|
|
|
return ''
|
|
|
|
return ''
|
|
|
|
|
|
|
|
|
|
|
|