openrc: Split state to container; add start-time code

1 files changed, 36 insertions, 14 deletions

diff --git a/yang-modules/adelie-services.yang b/yang-modules/adelie-services.yang
index 39a2fae..f006845 100644
--- a/yang-modules/adelie-services.yang
+++ b/yang-modules/adelie-services.yang
@@ -36,6 +36,11 @@ module adelie-services {
      This version of this YANG module is part of the NETCONF APK
      1.0 distribution; see the distributon for full legal notices.";
 
+  revision 2020-09-29 {
+    description
+      "Separate state into its own container.";
+  }
+
   revision 2020-09-22 {
     description
       "Initial revision.";
@@ -89,17 +94,6 @@ module adelie-services {
            Changing the name of the service may have surprising
            consequences.  It is not recommended.";
       }
- 
-      leaf description {
-        type string;
-        config false;
-        description
-          "A textual description of the service.
-
-           Depending on the service manager in use on the device,
-           this node may be empty or contain only the name of the
-           service.";
-      }
 
       leaf enabled {
         type boolean;
@@ -110,10 +104,39 @@ module adelie-services {
            When this leaf is true, the service will be started
            automatically by the device during system bootup.";
       }
- 
+    }
+  }
+
+  container service-status {
+    config false;
+    description
+      "Contains information about the state of services on the
+       device.";
+
+    list service {
+      key "name";
+
+      description
+        "The list of services on the device.";
+
+      leaf name {
+        type string;
+        description
+          "The name of the service.";
+      }
+
+      leaf description {
+        type string;
+        description
+          "A textual description of the service.
+
+           Depending on the service manager in use on the device,
+           this node may be empty or contain only the name of the
+           service.";
+      }
+
       leaf status {
         type service-status;
-        config false;
         mandatory true;
         description
           "The current status of the service.";
@@ -121,7 +144,6 @@ module adelie-services {
 
       leaf start-time {
         type yang:date-and-time;
-        config false;
         when "./status = 'running'";
         description
           "The time that this service entered the running state.";