afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed ignoring adding nodes to xml and xml links from network to network

Browse source
This commit is contained in:
bharnden 2019-06-04 16:03:07 -07:00
parent 86ada3da0b
commit 996a7715be
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
daemon/core/xml/corexml.py
View file

@ -1,4 +1,5 @@
import logging import logging
from core.nodes.base import CoreNetworkBase
from lxml import etree from lxml import etree
import core.nodes.base import core.nodes.base
@ -390,7 +391,6 @@ class CoreXmlWriter(object):
is_network_or_rj45 = isinstance(node, (core.nodes.base.CoreNetworkBase, core.nodes.physical.Rj45Node)) is_network_or_rj45 = isinstance(node, (core.nodes.base.CoreNetworkBase, core.nodes.physical.Rj45Node))
is_controlnet = nodeutils.is_node(node, NodeTypes.CONTROL_NET) is_controlnet = nodeutils.is_node(node, NodeTypes.CONTROL_NET)
if is_network_or_rj45 and not is_controlnet: if is_network_or_rj45 and not is_controlnet:
logging.info("network node: %s", node)
self.write_network(node) self.write_network(node)
# device node # device node
elif isinstance(node, core.nodes.base.CoreNodeBase): elif isinstance(node, core.nodes.base.CoreNodeBase):
@ -406,14 +406,7 @@ class CoreXmlWriter(object):
def write_network(self, node): def write_network(self, node):
# ignore p2p and other nodes that are not part of the api # ignore p2p and other nodes that are not part of the api
if not node.apitype: if not node.apitype:
return logging.warning("ignoring node with no apitype: %s", node)
# ignore nodes tied to a different network
if nodeutils.is_node(node, (NodeTypes.SWITCH, NodeTypes.HUB)):
for netif in node.netifs(sort=True):
othernet = getattr(netif, "othernet", None)
if othernet and othernet.id == node.id:
logging.info("writer ignoring node(%s) othernet(%s)", node.name, othernet.name)
return return
network = NetworkElement(self.session, node) network = NetworkElement(self.session, node)
@ -441,7 +434,7 @@ class CoreXmlWriter(object):
interface = etree.Element(element_name) interface = etree.Element(element_name)
node = self.session.get_node(node_id) node = self.session.get_node(node_id)
interface_name = None interface_name = None
if not nodeutils.is_node(node, NodeTypes.TUNNEL): if not isinstance(node, CoreNetworkBase):
node_interface = node.netif(interface_id) node_interface = node.netif(interface_id)
interface_name = node_interface.name interface_name = node_interface.name