From b12b9465ed13bf2eb7c0fe379c22dcb3b86c4054 Mon Sep 17 00:00:00 2001 From: Martin Braun Date: Wed, 15 Nov 2017 17:21:27 -0800 Subject: mpm/mpmd: Move to request_xport()/commit_xport() architecture This commit combines code from various branches to finally enable both UDP and Liberio transports. --- mpm/python/usrp_mpm/rpc_server.py | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'mpm/python/usrp_mpm/rpc_server.py') diff --git a/mpm/python/usrp_mpm/rpc_server.py b/mpm/python/usrp_mpm/rpc_server.py index 10d37a3d7..2cd44dfe5 100644 --- a/mpm/python/usrp_mpm/rpc_server.py +++ b/mpm/python/usrp_mpm/rpc_server.py @@ -54,7 +54,7 @@ class MPMServer(RPCServer): RPC calls to appropiate calls in the periph_manager and dboard_managers. """ # This is a list of methods in this class which require a claim - default_claimed_methods = ['init', 'reclaim', 'unclaim', 'allocate_sid'] + default_claimed_methods = ['init', 'reclaim', 'unclaim'] def __init__(self, state, mgr, *args, **kwargs): self.log = get_main_logger().getChild('RPCServer') @@ -332,20 +332,6 @@ class MPMServer(RPCServer): """ return self._last_error - def allocate_sid(self, token, *args): - """ - Forwards the call to periph_manager._allocate_sid with the client ip addresss - as argument. Should be used to setup interfaces - """ - if not self._check_token_valid(token): - self.log.warning("Attempt to allocate SID without valid token!") - return None - try: - return self.periph_manager._allocate_sid(self.client_host, *args) - except Exception as ex: - self._last_error = str(ex) - self.log.error("allocate_sid() failed: %s", str(ex)) - raise def _rpc_server_process(shared_state, port, mgr): -- cgit v1.2.3