ncserver: Make operational and running truly separate

This makes it easier to add more modules later.

3 files changed, 2 insertions, 1 deletions

diff --git a/ncserver/module/openrc.py b/ncserver/module/openrc.py
index bd10b98..c4e45fa 100644
--- a/ncserver/module/openrc.py
+++ b/ncserver/module/openrc.py
@@ -249,6 +249,7 @@ def running(node):
 
 def operational(node):
     """Retrieve the service state for this device."""
+    running(node)  # Include the running configuration.
     svcs = util.subelm(node, 'svcs:service-status')
 
     for service in service_list():
diff --git a/ncserver/module/system.py b/ncserver/module/system.py
index 5f72ab0..371ff39 100644
--- a/ncserver/module/system.py
+++ b/ncserver/module/system.py
@@ -358,6 +358,7 @@ def running(node):
 
 def operational(node):
     """Retrieve the operational configuration for this system."""
+    running(node)  # Include the running configuration.
     state = util.subelm(node, 'sys:system-state')
 
     plat = util.subelm(state, 'sys:platform')
diff --git a/ncserver/server.py b/ncserver/server.py
index 188f022..173d165 100644
--- a/ncserver/server.py
+++ b/ncserver/server.py
@@ -164,7 +164,6 @@ class Server:
         """Handle the <get/> RPC."""
         log_read(session, rpc)
         root = util.elm('nc:data')
-        self.modman.collect_running(root)
         self.modman.collect_operational(root)
 
         return util.filter_results(rpc, root, filter_or_none, self.debug)