From cdb5c4f4128852aa06b3485a47c33e930ee1fba6 Mon Sep 17 00:00:00 2001 From: "Ing. Jan KRCMAR" Date: Wed, 26 Sep 2018 09:53:23 +0200 Subject: [PATCH] fix wvmInterface get_ipv4/6: xml_path should specify protocol family --- vrtManager/interface.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/vrtManager/interface.py b/vrtManager/interface.py index 9d04630..c91aaf9 100644 --- a/vrtManager/interface.py +++ b/vrtManager/interface.py @@ -81,7 +81,7 @@ class wvmInterface(wvmConnect): def get_ipv4_type(self): try: xml = self._XMLDesc(VIR_INTERFACE_XML_INACTIVE) - ipaddr = util.get_xml_path(xml, "/interface/protocol/ip/@address") + ipaddr = util.get_xml_path(xml, "/interface/protocol[@family='ipv4']/ip/@address") if ipaddr: return 'static' else: @@ -91,8 +91,8 @@ class wvmInterface(wvmConnect): def get_ipv4(self): xml = self._XMLDesc() - int_ipv4_ip = util.get_xml_path(xml, "/interface/protocol/ip/@address") - int_ipv4_mask = util.get_xml_path(xml, "/interface/protocol/ip/@prefix") + int_ipv4_ip = util.get_xml_path(xml, "/interface/protocol[@family='ipv4']/ip/@address") + int_ipv4_mask = util.get_xml_path(xml, "/interface/protocol[@family='ipv4']/ip/@prefix") if not int_ipv4_ip or not int_ipv4_mask: return None else: @@ -101,7 +101,7 @@ class wvmInterface(wvmConnect): def get_ipv6_type(self): try: xml = self._XMLDesc(VIR_INTERFACE_XML_INACTIVE) - ipaddr = util.get_xml_path(xml, "/interface/protocol[2]/ip/@address") + ipaddr = util.get_xml_path(xml, "/interface/protocol[@family='ipv6']/ip/@address") if ipaddr: return 'static' else: @@ -111,8 +111,8 @@ class wvmInterface(wvmConnect): def get_ipv6(self): xml = self._XMLDesc() - int_ipv6_ip = util.get_xml_path(xml, "/interface/protocol[2]/ip/@address") - int_ipv6_mask = util.get_xml_path(xml, "/interface/protocol[2]/ip/@prefix") + int_ipv6_ip = util.get_xml_path(xml, "/interface/protocol[@family='ipv6']/ip/@address") + int_ipv6_mask = util.get_xml_path(xml, "/interface/protocol[@family='ipv6']/ip/@prefix") if not int_ipv6_ip or not int_ipv6_mask: return None else: