cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

update to fix a bug (#58227)

Browse source
This commit is contained in:
YuandongXu 2019-06-29 04:14:28 +08:00 committed by ansibot
parent 8acf71f78f
commit e0f3e404c9
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/modules/network/cloudengine/ce_evpn_bd_vni.py
View file

@ -248,6 +248,7 @@ changed:
sample: true sample: true
''' '''
import re
import copy import copy
from xml.etree import ElementTree from xml.etree import ElementTree
from ansible.module_utils.basic import AnsibleModule from ansible.module_utils.basic import AnsibleModule
@ -260,7 +261,7 @@ CE_NC_GET_VNI_BD = """
<nvo3Vni2Bds> <nvo3Vni2Bds>
<nvo3Vni2Bd> <nvo3Vni2Bd>
<vniId></vniId> <vniId></vniId>
<bdId>%s</bdId> <bdId></bdId>
</nvo3Vni2Bd> </nvo3Vni2Bd>
</nvo3Vni2Bds> </nvo3Vni2Bds>
</nvo3> </nvo3>
@ -552,7 +553,7 @@ class EvpnBd(object):
replace('xmlns="http://www.huawei.com/netconf/vrp"', "") replace('xmlns="http://www.huawei.com/netconf/vrp"', "")
root = ElementTree.fromstring(xml_str) root = ElementTree.fromstring(xml_str)
evpn_inst = root.find("data/evpn/evpnInstances/evpnInstance") evpn_inst = root.find("evpn/evpnInstances/evpnInstance")
if evpn_inst: if evpn_inst:
for eles in evpn_inst: for eles in evpn_inst:
if eles.tag in ["evpnAutoRD", "evpnRD", "evpnRTs", "evpnAutoRTs"]: if eles.tag in ["evpnAutoRD", "evpnRD", "evpnRTs", "evpnAutoRTs"]:
@ -1006,9 +1007,9 @@ class EvpnBd(object):
def check_vni_bd(self): def check_vni_bd(self):
"""Check whether vxlan vni is configured in BD view""" """Check whether vxlan vni is configured in BD view"""
xml_str = CE_NC_GET_VNI_BD % self.bridge_domain_id xml_str = CE_NC_GET_VNI_BD
xml_str = get_nc_config(self.module, xml_str) xml_str = get_nc_config(self.module, xml_str)
if "<data/>" in xml_str: if "<data/>" in xml_str or not re.findall(r'<vniId>\S+</vniId>\s+<bdId>%s</bdId>' % self.bridge_domain_id, xml_str):
self.module.fail_json( self.module.fail_json(
msg='Error: The vxlan vni is not configured or the bridge domain id is invalid.') msg='Error: The vxlan vni is not configured or the bridge domain id is invalid.')