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

fixed issue for link data not including per/loss when it is a ptp node, for host to host links

Browse source
This commit is contained in:
Blake Harnden 2019-06-05 09:54:11 -07:00
parent c262778209
commit 4381615f1d
3 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/config.py
View file

@ -159,7 +159,6 @@ class ConfigurableManager(object):
:param int node_id: node id to clear configurations for, default is None and clears all configurations :param int node_id: node id to clear configurations for, default is None and clears all configurations
:return: nothing :return: nothing
""" """
logging.debug("resetting all configurations: %s", self.__class__.__name__)
if not node_id: if not node_id:
self.node_configurations.clear() self.node_configurations.clear()
elif node_id in self.node_configurations: elif node_id in self.node_configurations:
@ -175,7 +174,6 @@ class ConfigurableManager(object):
:param str config_type: configuration type to store configuration for :param str config_type: configuration type to store configuration for
:return: nothing :return: nothing
""" """
logging.debug("setting config for node(%s) type(%s): %s=%s", node_id, config_type, _id, value)
node_configs = self.node_configurations.setdefault(node_id, OrderedDict()) node_configs = self.node_configurations.setdefault(node_id, OrderedDict())
node_type_configs = node_configs.setdefault(config_type, OrderedDict()) node_type_configs = node_configs.setdefault(config_type, OrderedDict())
node_type_configs[_id] = value node_type_configs[_id] = value
@ -204,7 +202,6 @@ class ConfigurableManager(object):
:return: configuration value :return: configuration value
:rtype str :rtype str
""" """
logging.debug("getting config for node(%s) type(%s): %s", node_id, config_type, _id)
result = default result = default
node_type_configs = self.get_configs(node_id, config_type) node_type_configs = self.get_configs(node_id, config_type)
if node_type_configs: if node_type_configs:
@ -220,7 +217,6 @@ class ConfigurableManager(object):
:return: configurations :return: configurations
:rtype: dict :rtype: dict
""" """
logging.debug("getting configs for node(%s) type(%s)", node_id, config_type)
result = None result = None
node_configs = self.node_configurations.get(node_id) node_configs = self.node_configurations.get(node_id)
if node_configs: if node_configs:
@ -235,7 +231,6 @@ class ConfigurableManager(object):
:return: all configuration types for a node :return: all configuration types for a node
:rtype: dict :rtype: dict
""" """
logging.debug("getting all configs for node(%s)", node_id)
return self.node_configurations.get(node_id) return self.node_configurations.get(node_id)

1
daemon/core/nodes/interface.py
View file

@ -141,6 +141,7 @@ class CoreInterface(object):
:return: True if parameter changed, False otherwise :return: True if parameter changed, False otherwise
""" """
# treat None and 0 as unchanged values # treat None and 0 as unchanged values
logging.debug("setting param: %s - %s", key, value)
if value is None or value <= 0: if value is None or value <= 0:
return False return False

1
daemon/core/nodes/network.py
View file

@ -894,6 +894,7 @@ class PtpNet(CoreNetwork):
unidirectional=unidirectional, unidirectional=unidirectional,
delay=if1.getparam("delay"), delay=if1.getparam("delay"),
bandwidth=if1.getparam("bw"), bandwidth=if1.getparam("bw"),
per=if1.getparam("loss"),
dup=if1.getparam("duplicate"), dup=if1.getparam("duplicate"),
jitter=if1.getparam("jitter"), jitter=if1.getparam("jitter"),
interface1_id=if1.node.getifindex(if1), interface1_id=if1.node.getifindex(if1),