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

removed xmlfilever from config, since not used

Browse source
This commit is contained in:
Blake Harnden 2019-09-30 10:36:27 -07:00
parent 1fb99e8690
commit 6b43c00031
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/emulator/session.py
View file

@ -1229,12 +1229,12 @@ class Session(object):
""" """
if state == EventTypes.RUNTIME_STATE.value: if state == EventTypes.RUNTIME_STATE.value:
self.emane.poststartup() self.emane.poststartup()
xml_file_version = self.options.get_config("xmlfilever")
if xml_file_version in ("1.0",): # create session deployed xml
xml_file_name = os.path.join(self.session_dir, "session-deployed.xml") xml_file_name = os.path.join(self.session_dir, "session-deployed.xml")
xml_writer = corexml.CoreXmlWriter(self) xml_writer = corexml.CoreXmlWriter(self)
corexmldeployment.CoreXmlDeployment(self, xml_writer.scenario) corexmldeployment.CoreXmlDeployment(self, xml_writer.scenario)
xml_writer.write(xml_file_name) xml_writer.write(xml_file_name)
def get_environment(self, state=True): def get_environment(self, state=True):
""" """

1
daemon/data/core.conf
View file

@ -6,7 +6,6 @@
### core-daemon configuration options ### ### core-daemon configuration options ###
[core-daemon] [core-daemon]
xmlfilever = 1.0
listenaddr = localhost listenaddr = localhost
port = 4038 port = 4038
numthreads = 1 numthreads = 1

1
daemon/scripts/core-daemon
View file

@ -93,7 +93,6 @@ def get_merged_config(filename):
defaults = { defaults = {
"port": "%d" % enumerations.CORE_API_PORT, "port": "%d" % enumerations.CORE_API_PORT,
"listenaddr": "localhost", "listenaddr": "localhost",
"xmlfilever": "1.0",
"numthreads": "1", "numthreads": "1",
"grpcport": "50051", "grpcport": "50051",
"grpcaddress": "localhost", "grpcaddress": "localhost",