Merge pull request #38 from QiufangMa/main

formatting & fix example to use "recurrence-description"
netmod-wg · Jun 25, 2024 · 7921e1d · 7921e1d
2 parents a8777ab + 8bd0384
commit 7921e1d
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 40 deletions.
diff --git a/draft-ietf-netmod-schedule-yang.md b/draft-ietf-netmod-schedule-yang.md
@@ -603,7 +603,7 @@ This section uses the template described in {{Section 3.7 of ?I-D.ietf-netmod-rf
 
 ~~~~
 {
-  "description": "forever recurrence rule",
+  "recurrence-description": "forever recurrence rule",
   "frequency": "ietf-schedule:daily",
   "interval": 2,
 }

diff --git a/yang/tree/ical-grp.txt b/yang/tree/ical-grp.txt
@@ -21,34 +21,34 @@ module: ietf-schedule
     |  +-- time-zone-identifier?   sys:timezone-name
     +-- (recurrence-bound)?
     |  +--:(until)
-    |  |  +-- until?        yang:date-and-time
+    |  |  +-- until?              yang:date-and-time
     |  +--:(count)
-    |     +-- count?        uint32
-    +-- description?        string
-    +-- frequency           identityref
-    +-- interval?           uint32
+    |     +-- count?              uint32
+    +-- recurrence-description?   string
+    +-- frequency                 identityref
+    +-- interval?                 uint32
     +-- period* [period-start]
-    |  +-- description             string
+    |  +-- period-description?     string
     |  +-- period-start            yang:date-and-time
     |  +-- time-zone-identifier?   sys:timezone-name
     |  +-- (period-type)?
     |     +--:(explicit)
     |     |  +-- period-end?       yang:date-and-time
     |     +--:(duration)
     |        +-- duration?         duration
-    +-- bysecond*           uint32
-    +-- byminute*           uint32
-    +-- byhour*             uint32
+    +-- bysecond*                 uint32
+    +-- byminute*                 uint32
+    +-- byhour*                   uint32
     +-- byday* [weekday]
     |  +-- direction*   int32
     |  +-- weekday      schedule:weekday
-    +-- bymonthday*         int32
-    +-- byyearday*          int32
-    +-- byyearweek*         int32
-    +-- byyearmonth*        uint32
-    +-- bysetpos*           int32
-    +-- workweek-start?     schedule:weekday
-    +-- exception-dates*    yang:date-and-time
+    +-- bymonthday*               int32
+    +-- byyearday*                int32
+    +-- byyearweek*               int32
+    +-- byyearmonth*              uint32
+    +-- bysetpos*                 int32
+    +-- workweek-start?           schedule:weekday
+    +-- exception-dates*          yang:date-and-time
   grouping schedule-status:
     ...
   grouping schedule-status-with-name:

diff --git a/yang/tree/rec-grp.txt b/yang/tree/rec-grp.txt
@@ -6,8 +6,8 @@ module: ietf-schedule
     ...
   grouping recurrence:
     +-- recurrence-description?   string
-    +-- frequency      identityref
-    +-- interval?      uint32
+    +-- frequency                 identityref
+    +-- interval?                 uint32
   grouping recurrence-utc:
     ...
   grouping recurrence-with-time-zone:

diff --git a/yang/tree/rec-tz-dt-grp.txt b/yang/tree/rec-tz-dt-grp.txt
@@ -19,14 +19,14 @@ module: ietf-schedule
     |  +-- time-zone-identifier?   sys:timezone-name
     +-- (recurrence-bound)?
     |  +--:(until)
-    |  |  +-- until?        yang:date-and-time
+    |  |  +-- until?              yang:date-and-time
     |  +--:(count)
-    |     +-- count?        uint32
-    +-- recurrence-description?        string
-    +-- frequency           identityref
-    +-- interval?           uint32
+    |     +-- count?              uint32
+    +-- recurrence-description?   string
+    +-- frequency                 identityref
+    +-- interval?                 uint32
     +-- period* [period-start]
-       +-- description?            string
+       +-- period-description?     string
        +-- period-start            yang:date-and-time
        +-- time-zone-identifier?   sys:timezone-name
        +-- (period-type)?

diff --git a/yang/tree/rec-tz-grp.txt b/yang/tree/rec-tz-grp.txt
@@ -15,12 +15,12 @@ module: ietf-schedule
     |  +-- time-zone-identifier?   sys:timezone-name
     +-- (recurrence-bound)?
     |  +--:(until)
-    |  |  +-- until?        yang:date-and-time
+    |  |  +-- until?              yang:date-and-time
     |  +--:(count)
-    |     +-- count?        uint32
-    +-- recurrence-description?        string
-    +-- frequency           identityref
-    +-- interval?           uint32
+    |     +-- count?              uint32
+    +-- recurrence-description?   string
+    +-- frequency                 identityref
+    +-- interval?                 uint32
   grouping recurrence-utc-with-date-times:
     ...
   grouping recurrence-time-zone-with-date-times:

diff --git a/yang/tree/rec-utc-dt-grp.txt b/yang/tree/rec-utc-dt-grp.txt
@@ -16,12 +16,12 @@ module: ietf-schedule
     |  +-- duration?         uint32
     +-- (recurrence-bound)?
     |  +--:(until)
-    |  |  +-- utc-until?    yang:date-and-time
+    |  |  +-- utc-until?          yang:date-and-time
     |  +--:(count)
-    |     +-- count?        uint32
-    +-- recurrence-description?        string
-    +-- frequency           identityref
-    +-- interval?           uint32
+    |     +-- count?              uint32
+    +-- recurrence-description?   string
+    +-- frequency                 identityref
+    +-- interval?                 uint32
     +-- period-timeticks* [period-start]
        +-- period-start    yang:timeticks
        +-- period-end?     yang:timeticks

diff --git a/yang/tree/rec-utc-grp.txt b/yang/tree/rec-utc-grp.txt
@@ -12,12 +12,12 @@ module: ietf-schedule
     |  +-- duration?         uint32
     +-- (recurrence-bound)?
     |  +--:(until)
-    |  |  +-- utc-until?    yang:date-and-time
+    |  |  +-- utc-until?          yang:date-and-time
     |  +--:(count)
-    |     +-- count?        uint32
-    +-- recurrence-description?        string
-    +-- frequency           identityref
-    +-- interval?           uint32
+    |     +-- count?              uint32
+    +-- recurrence-description?   string
+    +-- frequency                 identityref
+    +-- interval?                 uint32
   grouping recurrence-with-time-zone:
     ...
   grouping recurrence-utc-with-date-times: