diff --git a/daemon/core/conf.py b/daemon/core/conf.py index 99c9a738..2a9e30eb 100644 --- a/daemon/core/conf.py +++ b/daemon/core/conf.py @@ -328,7 +328,7 @@ class ModelManager(ConfigurableManager): config = self.get_model_config(node.objid, model_class.name) 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 configured. This is invoked when exporting a session to XML. diff --git a/daemon/core/corehandlers.py b/daemon/core/corehandlers.py index bb7967fb..182ffaaf 100644 --- a/daemon/core/corehandlers.py +++ b/daemon/core/corehandlers.py @@ -1577,7 +1577,7 @@ class CoreHandler(SocketServer.BaseRequestHandler): # send mobility model info for node_id in self.session.mobility.nodes(): 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) config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config) self.session.broadcast_config(config_data) @@ -1585,7 +1585,7 @@ class CoreHandler(SocketServer.BaseRequestHandler): # send emane model info for node_id in self.session.emane.nodes(): 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) config_data = ConfigShim.config_data(0, node_id, ConfigFlags.UPDATE.value, model_class, config) self.session.broadcast_config(config_data) diff --git a/daemon/core/xml/xmlwriter0.py b/daemon/core/xml/xmlwriter0.py index acbfb537..a11e099a 100644 --- a/daemon/core/xml/xmlwriter0.py +++ b/daemon/core/xml/xmlwriter0.py @@ -84,8 +84,8 @@ class CoreDocumentWriter0(Document): for netif in net.netifs(sort=True): self.addnetem(n, netif) # wireless/mobility models - modelconfigs = net.session.mobility.getmodels(net) - modelconfigs += net.session.emane.getmodels(net) + modelconfigs = net.session.mobility.get_models(net) + modelconfigs += net.session.emane.get_models(net) self.addmodels(n, modelconfigs) self.addposition(net) diff --git a/daemon/core/xml/xmlwriter1.py b/daemon/core/xml/xmlwriter1.py index 98d7de89..6f5deb50 100644 --- a/daemon/core/xml/xmlwriter1.py +++ b/daemon/core/xml/xmlwriter1.py @@ -475,8 +475,8 @@ class NetworkElement(NamedXmlElement): """ if nodeutils.is_node(network_object, (NodeTypes.WIRELESS_LAN, NodeTypes.EMANE)): - modelconfigs = network_object.session.mobility.getmodels(network_object) - modelconfigs += network_object.session.emane.getmodels(network_object) + modelconfigs = network_object.session.mobility.get_models(network_object) + modelconfigs += network_object.session.emane.get_models(network_object) chan = None for model, conf in modelconfigs: diff --git a/daemon/tests/test_conf.py b/daemon/tests/test_conf.py index f19fc168..9f21da78 100644 --- a/daemon/tests/test_conf.py +++ b/daemon/tests/test_conf.py @@ -177,7 +177,7 @@ class TestConf: session.mobility.set_model(wlan_node, BasicRangeModel) # when - models = session.mobility.getmodels(wlan_node) + models = session.mobility.get_models(wlan_node) # then assert models