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

updated open_xml functionality, grpc open_xml can optionally start now, added opened files to grpc get_sessions

Browse source
This commit is contained in:
Blake Harnden 2019-10-22 12:08:55 -07:00
parent 0a689a3e96
commit f39b7e9f96
6 changed files with 29 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/core/api/grpc/client.py
View file

@ -880,17 +880,18 @@ class CoreGrpcClient(object):
with open(file_path, "w") as xml_file:
xml_file.write(response.data)
def open_xml(self, file_path):
def open_xml(self, file_path, start=False):
"""
Load a local scenario XML file to open as a new session.
:param str file_path: path of scenario XML file
:param bool start: True to start session, False otherwise
:return: response with opened session id
:rtype: core_pb2.OpenXmlResponse
"""
with open(file_path, "r") as xml_file:
data = xml_file.read()
request = core_pb2.OpenXmlRequest(data=data)
request = core_pb2.OpenXmlRequest(data=data, start=start, file=file_path)
return self.stub.OpenXml(request)
def emane_link(self, session_id, nem_one, nem_two, linked):

18
daemon/core/api/grpc/server.py
View file

@ -305,7 +305,10 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
for session_id in self.coreemu.sessions:
session = self.coreemu.sessions[session_id]
session_summary = core_pb2.SessionSummary(
id=session_id, state=session.state, nodes=session.get_node_count()
id=session_id,
state=session.state,
nodes=session.get_node_count(),
file=session.file_name,
)
sessions.append(session_summary)
return core_pb2.GetSessionsResponse(sessions=sessions)
@ -1555,19 +1558,22 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
"""
logging.debug("open xml: %s", request)
session = self.coreemu.create_session()
session.set_state(EventTypes.CONFIGURATION_STATE)
_, temp_path = tempfile.mkstemp()
with open(temp_path, "w") as xml_file:
xml_file.write(request.data)
temp = tempfile.NamedTemporaryFile(delete=False)
temp.write(request.data.encode("utf-8"))
temp.close()
try:
session.open_xml(temp_path, start=True)
session.open_xml(temp.name, request.start)
session.name = os.path.basename(request.file)
session.file_name = request.file
return core_pb2.OpenXmlResponse(session_id=session.id, result=True)
except IOError:
logging.exception("error opening session file")
self.coreemu.delete_session(session.id)
context.abort(grpc.StatusCode.INVALID_ARGUMENT, "invalid xml file")
finally:
os.unlink(temp.name)
def GetInterfaces(self, request, context):
"""