From 0df21ddeb07d8a3e4fa446d2b9020bdd15aa6771 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Wed, 6 Jan 2016 10:06:09 -0500 Subject: [PATCH] Amend core to pass shell objects through For 'handler' plugin definitions, also recognize the 'console' exception to allow the plugin to pass through to the shellserver infrastructure. --- confluent_server/confluent/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index fcf7b517..555130d9 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -170,7 +170,7 @@ noderesources = { '_shell': { 'session': PluginRoute({ # For now, not configurable, wait until there's demand - 'default': 'ssh', + 'handler': 'ssh', }) }, 'shell': { @@ -530,6 +530,8 @@ def handle_node_request(configmanager, inputdata, operation, inputdata=inputdata) if isnoderange: return passvalue + elif isinstance(passvalue, console.Console): + return passvalue else: return stripnode(passvalue, nodes[0]) elif 'pluginattrs' in plugroute: