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

refactored modelmanager getmodels to get_models

Browse source
This commit is contained in:
Blake J. Harnden 2018-06-13 16:23:51 -07:00
parent 25cfb21586
commit 8e3cd0e013
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/core/conf.py
View file

@ -328,7 +328,7 @@ class ModelManager(ConfigurableManager):
config = self.get_model_config(node.objid, model_class.name) config = self.get_model_config(node.objid, model_class.name)
node.setmodel(model_class, config) node.setmodel(model_class, config)
def getmodels(self, node): def get_models(self, node):
""" """
Return a list of model classes and values for a net if one has been Return a list of model classes and values for a net if one has been
configured. This is invoked when exporting a session to XML. configured. This is invoked when exporting a session to XML.

4
daemon/core/corehandlers.py
View file

@ -1577,7 +1577,7 @@ class CoreHandler(SocketServer.BaseRequestHandler):
# send mobility model info # send mobility model info
for node_id in self.session.mobility.nodes(): for node_id in self.session.mobility.nodes():
node = self.session.get_object(node_id) node = self.session.get_object(node_id)
for model_class, config in self.session.mobility.getmodels(node): for model_class, config in self.session.mobility.get_models(node):
logger.info("mobility config: node(%s) class(%s) values(%s)", node_id, model_class, config) logger.info("mobility config: node(%s) class(%s) values(%s)", node_id, model_class, config)
config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config) config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config)
self.session.broadcast_config(config_data) self.session.broadcast_config(config_data)
@ -1585,7 +1585,7 @@ class CoreHandler(SocketServer.BaseRequestHandler):
# send emane model info # send emane model info
for node_id in self.session.emane.nodes(): for node_id in self.session.emane.nodes():
node = self.session.get_object(node_id) node = self.session.get_object(node_id)
for model_class, config in self.session.emane.getmodels(node): for model_class, config in self.session.emane.get_models(node):
logger.info("emane config: node(%s) class(%s) values(%s)", node_id, model_class, config) logger.info("emane config: node(%s) class(%s) values(%s)", node_id, model_class, config)
config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config) config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config)
self.session.broadcast_config(config_data) self.session.broadcast_config(config_data)

4
daemon/core/xml/xmlwriter0.py
View file

@ -84,8 +84,8 @@ class CoreDocumentWriter0(Document):
for netif in net.netifs(sort=True): for netif in net.netifs(sort=True):
self.addnetem(n, netif) self.addnetem(n, netif)
# wireless/mobility models # wireless/mobility models
modelconfigs = net.session.mobility.getmodels(net) modelconfigs = net.session.mobility.get_models(net)
modelconfigs += net.session.emane.getmodels(net) modelconfigs += net.session.emane.get_models(net)
self.addmodels(n, modelconfigs) self.addmodels(n, modelconfigs)
self.addposition(net) self.addposition(net)

4
daemon/core/xml/xmlwriter1.py
View file

@ -475,8 +475,8 @@ class NetworkElement(NamedXmlElement):
""" """
if nodeutils.is_node(network_object, (NodeTypes.WIRELESS_LAN, NodeTypes.EMANE)): if nodeutils.is_node(network_object, (NodeTypes.WIRELESS_LAN, NodeTypes.EMANE)):
modelconfigs = network_object.session.mobility.getmodels(network_object) modelconfigs = network_object.session.mobility.get_models(network_object)
modelconfigs += network_object.session.emane.getmodels(network_object) modelconfigs += network_object.session.emane.get_models(network_object)
chan = None chan = None
for model, conf in modelconfigs: for model, conf in modelconfigs:

2
daemon/tests/test_conf.py
View file

@ -177,7 +177,7 @@ class TestConf:
session.mobility.set_model(wlan_node, BasicRangeModel) session.mobility.set_model(wlan_node, BasicRangeModel)
# when # when
models = session.mobility.getmodels(wlan_node) models = session.mobility.get_models(wlan_node)
# then # then
assert models assert models