grpc added get/set emane config test, fixed logic for setting emane/session configs in grpc server
This commit is contained in:
parent
6d79014aad
commit
d880960cf7
2 changed files with 36 additions and 2 deletions
|
@ -320,7 +320,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
|
||||||
def SetSessionOptions(self, request, context):
|
def SetSessionOptions(self, request, context):
|
||||||
logging.debug("set session options: %s", request)
|
logging.debug("set session options: %s", request)
|
||||||
session = self.get_session(request.id, context)
|
session = self.get_session(request.id, context)
|
||||||
session.options.set_configs(request.config)
|
config = session.options.get_configs()
|
||||||
|
config.update(request.config)
|
||||||
return core_pb2.SetSessionOptionsResponse(result=True)
|
return core_pb2.SetSessionOptionsResponse(result=True)
|
||||||
|
|
||||||
def GetSession(self, request, context):
|
def GetSession(self, request, context):
|
||||||
|
@ -898,7 +899,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
|
||||||
def SetEmaneConfig(self, request, context):
|
def SetEmaneConfig(self, request, context):
|
||||||
logging.debug("set emane config: %s", request)
|
logging.debug("set emane config: %s", request)
|
||||||
session = self.get_session(request.session, context)
|
session = self.get_session(request.session, context)
|
||||||
session.emane.set_configs(request.config)
|
config = session.emane.get_configs()
|
||||||
|
config.update(request.config)
|
||||||
return core_pb2.SetEmaneConfigResponse(result=True)
|
return core_pb2.SetEmaneConfigResponse(result=True)
|
||||||
|
|
||||||
def GetEmaneModels(self, request, context):
|
def GetEmaneModels(self, request, context):
|
||||||
|
|
|
@ -3,6 +3,7 @@ import time
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
|
from core.emane.ieee80211abg import EmaneIeee80211abgModel
|
||||||
from core.emulator.emudata import NodeOptions, LinkOptions
|
from core.emulator.emudata import NodeOptions, LinkOptions
|
||||||
from core.grpc import core_pb2
|
from core.grpc import core_pb2
|
||||||
from core.enumerations import NodeTypes, EventTypes
|
from core.enumerations import NodeTypes, EventTypes
|
||||||
|
@ -157,6 +158,8 @@ class TestGrpc:
|
||||||
# then
|
# then
|
||||||
assert response.result is True
|
assert response.result is True
|
||||||
assert session.options.get_config(option) == value
|
assert session.options.get_config(option) == value
|
||||||
|
config = session.options.get_configs()
|
||||||
|
assert len(config) > 0
|
||||||
|
|
||||||
def test_set_session_state(self, grpc_server):
|
def test_set_session_state(self, grpc_server):
|
||||||
# given
|
# given
|
||||||
|
@ -401,3 +404,32 @@ class TestGrpc:
|
||||||
assert response.result is True
|
assert response.result is True
|
||||||
config = session.mobility.get_model_config(wlan.objid, BasicRangeModel.name)
|
config = session.mobility.get_model_config(wlan.objid, BasicRangeModel.name)
|
||||||
assert config[range_key] == range_value
|
assert config[range_key] == range_value
|
||||||
|
|
||||||
|
def test_get_emane_config(self, grpc_server):
|
||||||
|
# given
|
||||||
|
client = CoreGrpcClient()
|
||||||
|
session = grpc_server.coreemu.create_session()
|
||||||
|
|
||||||
|
# then
|
||||||
|
with client.context_connect():
|
||||||
|
response = client.get_emane_config(session.session_id)
|
||||||
|
|
||||||
|
# then
|
||||||
|
assert len(response.groups) > 0
|
||||||
|
|
||||||
|
def test_set_emane_config(self, grpc_server):
|
||||||
|
# given
|
||||||
|
client = CoreGrpcClient()
|
||||||
|
session = grpc_server.coreemu.create_session()
|
||||||
|
config_key = "platform_id_start"
|
||||||
|
config_value = "2"
|
||||||
|
|
||||||
|
# then
|
||||||
|
with client.context_connect():
|
||||||
|
response = client.set_emane_config(session.session_id, {config_key: config_value})
|
||||||
|
|
||||||
|
# then
|
||||||
|
assert response.result is True
|
||||||
|
config = session.emane.get_configs()
|
||||||
|
assert len(config) > 1
|
||||||
|
assert config[config_key] == config_value
|
||||||
|
|
Loading…
Reference in a new issue