removing cmd_output function from utils and nodes
This commit is contained in:
parent
c3d27eb8a5
commit
4a6d69bb09
10 changed files with 51 additions and 193 deletions
|
@ -10,6 +10,7 @@ from queue import Empty, Queue
|
|||
|
||||
import grpc
|
||||
|
||||
from core import utils
|
||||
from core.api.grpc import core_pb2, core_pb2_grpc
|
||||
from core.emane.nodes import EmaneNet
|
||||
from core.emulator.data import (
|
||||
|
@ -22,7 +23,7 @@ from core.emulator.data import (
|
|||
)
|
||||
from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
|
||||
from core.emulator.enumerations import EventTypes, LinkTypes, NodeTypes
|
||||
from core.errors import CoreError
|
||||
from core.errors import CoreCommandError, CoreError
|
||||
from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
|
||||
from core.nodes.base import CoreNetworkBase
|
||||
from core.nodes.docker import DockerNode
|
||||
|
@ -882,7 +883,11 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
|
|||
logging.debug("sending node command: %s", request)
|
||||
session = self.get_session(request.session_id, context)
|
||||
node = self.get_node(session, request.node_id, context)
|
||||
_, output = node.cmd_output(request.command)
|
||||
try:
|
||||
args = utils.split_args(request.command)
|
||||
output = node.node_net_cmd(args)
|
||||
except CoreCommandError as e:
|
||||
output = e.stderr
|
||||
return core_pb2.NodeCommandResponse(output=output)
|
||||
|
||||
def GetNodeTerminal(self, request, context):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue