6 files changed, 101 insertions, 5 deletions
diff --git a/src/services/api/graphql/graphql/directives.py b/src/services/api/graphql/graphql/directives.py
index f5cd88acd..4bc31c6b5 100644
--- a/src/services/api/graphql/graphql/directives.py
+++ b/src/services/api/graphql/graphql/directives.py
@@ -1,5 +1,5 @@
 from ariadne import SchemaDirectiveVisitor, ObjectType
-from . mutations import make_configure_resolver, make_config_file_resolver
+from . mutations import *
 
 def non(arg):
     pass
@@ -19,19 +19,36 @@ class VyosDirective(SchemaDirectiveVisitor):
 class ConfigureDirective(VyosDirective):
     """
     Class providing implementation of 'configure' directive in schema.
-
     """
     def visit_field_definition(self, field, object_type):
         super().visit_field_definition(field, object_type,
                                        make_resolver=make_configure_resolver)
 
+class ShowConfigDirective(VyosDirective):
+    """
+    Class providing implementation of 'show' directive in schema.
+    """
+    def visit_field_definition(self, field, object_type):
+        super().visit_field_definition(field, object_type,
+                                       make_resolver=make_show_config_resolver)
+
 class ConfigFileDirective(VyosDirective):
     """
     Class providing implementation of 'configfile' directive in schema.
-
     """
     def visit_field_definition(self, field, object_type):
         super().visit_field_definition(field, object_type,
                                        make_resolver=make_config_file_resolver)
 
-directives_dict = {"configure": ConfigureDirective, "configfile": ConfigFileDirective}
+class ShowDirective(VyosDirective):
+    """
+    Class providing implementation of 'show' directive in schema.
+    """
+    def visit_field_definition(self, field, object_type):
+        super().visit_field_definition(field, object_type,
+                                       make_resolver=make_show_resolver)
+
+directives_dict = {"configure": ConfigureDirective,
+                   "showconfig": ShowConfigDirective,
+                   "configfile": ConfigFileDirective,
+                   "show": ShowDirective}
diff --git a/src/services/api/graphql/graphql/mutations.py b/src/services/api/graphql/graphql/mutations.py
index 8a28b13d7..0ba2cd4bb 100644
--- a/src/services/api/graphql/graphql/mutations.py
+++ b/src/services/api/graphql/graphql/mutations.py
@@ -51,7 +51,8 @@ def make_resolver(mutation_name, class_name, session_func):
                 klass = type(class_name, (Session,), {})
             k = klass(session, data)
             method = getattr(k, session_func)
-            method()
+            result = method()
+            data['result'] = result
 
             return {
                 "success": True,
@@ -69,6 +70,10 @@ def make_configure_resolver(mutation_name):
     class_name = mutation_name
     return make_resolver(mutation_name, class_name, 'configure')
 
+def make_show_config_resolver(mutation_name):
+    class_name = mutation_name
+    return make_resolver(mutation_name, class_name, 'show_config')
+
 def make_config_file_resolver(mutation_name):
     if 'Save' in mutation_name:
         class_name = mutation_name.replace('Save', '', 1)
@@ -78,3 +83,7 @@ def make_config_file_resolver(mutation_name):
         return make_resolver(mutation_name, class_name, 'load')
     else:
         raise Exception
+
+def make_show_resolver(mutation_name):
+    class_name = mutation_name
+    return make_resolver(mutation_name, class_name, 'show')
diff --git a/src/services/api/graphql/graphql/schema/schema.graphql b/src/services/api/graphql/graphql/schema/schema.graphql
index 9e97a0d60..375b88cc5 100644
--- a/src/services/api/graphql/graphql/schema/schema.graphql
+++ b/src/services/api/graphql/graphql/schema/schema.graphql
@@ -9,6 +9,8 @@ type Query {
 
 directive @configure on FIELD_DEFINITION
 directive @configfile on FIELD_DEFINITION
+directive @show on FIELD_DEFINITION
+directive @showconfig on FIELD_DEFINITION
 
 type Mutation {
     CreateDhcpServer(data: DhcpServerConfigInput) : CreateDhcpServerResult @configure
@@ -18,4 +20,6 @@ type Mutation {
     RemoveFirewallAddressGroupMembers(data: RemoveFirewallAddressGroupMembersInput) : RemoveFirewallAddressGroupMembersResult @configure
     SaveConfigFile(data: SaveConfigFileInput) : SaveConfigFileResult @configfile
     LoadConfigFile(data: LoadConfigFileInput) : LoadConfigFileResult @configfile
+    Show(data: ShowInput) : ShowResult @show
+    ShowConfig(data: ShowConfigInput) : ShowConfigResult @showconfig
 }
diff --git a/src/services/api/graphql/graphql/schema/show.graphql b/src/services/api/graphql/graphql/schema/show.graphql
new file mode 100644
index 000000000..c7709e48b
--- /dev/null
+++ b/src/services/api/graphql/graphql/schema/show.graphql
@@ -0,0 +1,14 @@
+input ShowInput {
+    path: [String!]!
+}
+
+type Show {
+    path: [String]
+    result: String
+}
+
+type ShowResult {
+    data: Show
+    success: Boolean!
+    errors: [String]
+}
diff --git a/src/services/api/graphql/graphql/schema/show_config.graphql b/src/services/api/graphql/graphql/schema/show_config.graphql
new file mode 100644
index 000000000..34afd2aa9
--- /dev/null
+++ b/src/services/api/graphql/graphql/schema/show_config.graphql
@@ -0,0 +1,21 @@
+"""
+Use 'scalar Generic' for show config output, to avoid attempts to
+JSON-serialize in case of JSON output.
+"""
+scalar Generic
+
+input ShowConfigInput {
+    path: [String!]!
+    configFormat: String
+}
+
+type ShowConfig {
+    path: [String]
+    result: Generic
+}
+
+type ShowConfigResult {
+    data: ShowConfig
+    success: Boolean!
+    errors: [String]
+}
diff --git a/src/services/api/graphql/recipes/session.py b/src/services/api/graphql/recipes/session.py
index b96cc1753..f8c072b39 100644
--- a/src/services/api/graphql/recipes/session.py
+++ b/src/services/api/graphql/recipes/session.py
@@ -1,6 +1,10 @@
+import json
+
 from ariadne import convert_camel_case_to_snake
+
 import vyos.defaults
 from vyos.config import Config
+from vyos.configtree import ConfigTree
 from vyos.template import render
 
 class Session(object):
@@ -43,6 +47,21 @@ class Session(object):
             session.delete(path)
             session.commit()
 
+    def show_config(self):
+        session = self._session
+        data = self._data
+        out = ''
+
+        try:
+            out = session.show_config(data['path'])
+            if data.get('config_format', '') == 'json':
+                config_tree = vyos.configtree.ConfigTree(out)
+                out = json.loads(config_tree.to_json())
+        except Exception as error:
+            raise error
+
+        return out
+
     def save(self):
         session = self._session
         data = self._data
@@ -63,3 +82,15 @@ class Session(object):
             session.commit()
         except Exception as error:
             raise error
+
+    def show(self):
+        session = self._session
+        data = self._data
+        out = ''
+
+        try:
+            out = session.show(data['path'])
+        except Exception as error:
+            raise error
+
+        return out