Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update ce_interface to fix bugs #57907

Merged
merged 3 commits into from
Jun 28, 2019
Merged

update ce_interface to fix bugs #57907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b1a088
update ce_interface
yuandongx Jun 16, 2019
a0d4d1c
update ce_interface
yuandongx Jun 17, 2019
eb282de
add a changelog fragment.
yuandongx Jun 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelogs/fragments/57907-update-ce_interface-to-fix-bugs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
bugfixes:
- ce_interface - It is not a good way to find data from a xml tree by regular. lin379 line405.
- ce_interface - line 750,779 Some attributes of interfaces are missing, 'ifAdminStatus', 'ifDescr', 'isL2SwitchPort'.So add them when get interface status.
93 changes: 58 additions & 35 deletions lib/ansible/modules/network/cloudengine/ce_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@


import re
from xml.etree import ElementTree
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.network.cloudengine.ce import get_nc_config, set_nc_config, ce_argument_spec

Expand Down Expand Up @@ -193,7 +194,7 @@
CE_NC_XML_CREATE_INTF = """
<ifm xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
<interfaces>
<interface operation="create">
<interface operation="merge">
<ifName>%s</ifName>
<ifDescr>%s</ifDescr>
</interface>
Expand All @@ -204,7 +205,7 @@
CE_NC_XML_CREATE_INTF_L2SUB = """
<ifm xmlns="http://www.huawei.com/netconf/vrp" content-version="1.0" format-version="1.0">
<interfaces>
<interface operation="create">
<interface operation="merge">
<ifName>%s</ifName>
<ifDescr>%s</ifDescr>
<l2SubIfFlag>true</l2SubIfFlag>
Expand Down Expand Up @@ -376,21 +377,22 @@ def get_interfaces_dict(self):
if "<data/>" in recv_xml:
return intfs_info

intf = re.findall(
r'.*<ifName>(.*)</ifName>.*\s*<ifPhyType>(.*)</ifPhyType>.*\s*'
r'<ifNumber>(.*)</ifNumber>.*\s*<ifDescr>(.*)</ifDescr>.*\s*'
r'<isL2SwitchPort>(.*)</isL2SwitchPort>.*\s*<ifAdminStatus>'
r'(.*)</ifAdminStatus>.*\s*<ifMtu>(.*)</ifMtu>.*', recv_xml)

for tmp in intf:
if tmp[1]:
if not intfs_info.get(tmp[1].lower()):
# new interface type list
intfs_info[tmp[1].lower()] = list()
intfs_info[tmp[1].lower()].append(dict(ifName=tmp[0], ifPhyType=tmp[1], ifNumber=tmp[2],
ifDescr=tmp[3], isL2SwitchPort=tmp[4],
ifAdminStatus=tmp[5], ifMtu=tmp[6]))

xml_str = recv_xml.replace('\r', '').replace('\n', '').\
replace('xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"', "").\
replace('xmlns="http://www.huawei.com/netconf/vrp"', "")

root = ElementTree.fromstring(xml_str)
intfs = root.findall("ifm/interfaces/")
if intfs:
for intf in intfs:
intf_type = intf.find("ifPhyType").text.lower()
if intf_type:
if not intfs_info.get(intf_type):
intfs_info[intf_type] = list()
intf_info = dict()
for tmp in intf:
intf_info[tmp.tag] = tmp.text
intfs_info[intf_type].append(intf_info)
return intfs_info

def get_interface_dict(self, ifname):
Expand All @@ -402,22 +404,15 @@ def get_interface_dict(self, ifname):

if "<data/>" in recv_xml:
return intf_info

intf = re.findall(
r'.*<ifName>(.*)</ifName>.*\s*'
r'<ifPhyType>(.*)</ifPhyType>.*\s*'
r'<ifNumber>(.*)</ifNumber>.*\s*'
r'<ifDescr>(.*)</ifDescr>.*\s*'
r'<isL2SwitchPort>(.*)</isL2SwitchPort>.*\s*'
r'<ifAdminStatus>(.*)</ifAdminStatus>.*\s*'
r'<ifMtu>(.*)</ifMtu>.*', recv_xml)

if intf:
intf_info = dict(ifName=intf[0][0], ifPhyType=intf[0][1],
ifNumber=intf[0][2], ifDescr=intf[0][3],
isL2SwitchPort=intf[0][4],
ifAdminStatus=intf[0][5], ifMtu=intf[0][6])

xml_str = recv_xml.replace('\r', '').replace('\n', '').\
replace('xmlns="urn:ietf:params:xml:ns:netconf:base:1.0"', "").\
replace('xmlns="http://www.huawei.com/netconf/vrp"', "")

root = ElementTree.fromstring(xml_str)
intfs = root.findall("ifm/interfaces/interface/")
if intfs:
for intf in intfs:
intf_info[intf.tag] = intf.text
return intf_info

def create_interface(self, ifname, description, admin_state, mode, l2sub):
Expand Down Expand Up @@ -752,10 +747,23 @@ def get_existing(self):
else:
self.existing["mode"] = "layer3"

if self.intfs_info:
intfs = self.intfs_info.get(self.intf_type.lower())
for intf in intfs:
intf_para = dict()
if intf["ifAdminStatus"]:
intf_para["admin_state"] = intf["ifAdminStatus"]
intf_para["description"] = intf["ifDescr"]

if intf["isL2SwitchPort"] == "true":
intf_para["mode"] = "layer2"
else:
intf_para["mode"] = "layer3"
self.existing[intf["ifName"]] = intf_para

def get_end_state(self):
"""get_end_state"""

if self.intf_info:
if self.interface:
end_info = self.get_interface_dict(self.interface)
if end_info:
self.end_state["interface"] = end_info["ifName"]
Expand All @@ -768,6 +776,21 @@ def get_end_state(self):
else:
self.end_state["mode"] = "layer3"

if self.interface_type:
end_info = self.get_interfaces_dict()
intfs = end_info.get(self.intf_type.lower())
for intf in intfs:
intf_para = dict()
if intf["ifAdminStatus"]:
intf_para["admin_state"] = intf["ifAdminStatus"]
intf_para["description"] = intf["ifDescr"]

if intf["isL2SwitchPort"] == "true":
intf_para["mode"] = "layer2"
else:
intf_para["mode"] = "layer3"
self.end_state[intf["ifName"]] = intf_para

def work(self):
"""worker"""

Expand Down