Merge pull request #1094 from dpino/enable-leafrefs-ietf-alarms

Enable leafrefs in ietf-alarms
Igalia · Jun 13, 2018 · 8907970 · 8907970
2 parents bd216c2 + 660e9b2
commit 8907970
Showing 1 changed file with 0 additions and 62 deletions.
diff --git a/src/lib/yang/ietf-alarms.yang b/src/lib/yang/ietf-alarms.yang
@@ -376,8 +376,6 @@ module ietf-alarms {
         }
 
 
-        /*
-         * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
         list related-alarm {
             key "resource alarm-type-id alarm-type-qualifier";
 
@@ -415,30 +413,6 @@ module ietf-alarms {
                     "The alarm qualifier for the related alarm.";
             }
         }
-        */
-        list related-alarm {
-            key "resource alarm-type-id alarm-type-qualifier";
-
-            description
-                "References to related alarms.  Note that the related alarm
-                might have been removed from the alarm list.";
-
-            leaf resource {
-                type string;
-                description
-                    "The alarming resource for the related alarm.";
-            }
-            leaf alarm-type-id {
-                type string;
-                description
-                    "The alarm type identifier for the related alarm.";
-            }
-            leaf alarm-type-qualifier {
-                type string;
-                description
-                    "The alarm qualifier for the related alarm.";
-            }
-        }
 
         leaf-list impacted-resource {
             type resource;
@@ -990,8 +964,6 @@ module ietf-alarms {
             alarms.  Conditions in the input are logically ANDed.  If no
             input condition is given, all alarms are compressed.";
         input {
-            /*
-             * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
             leaf resource {
                 type leafref {
                     path "/alarms/alarm-list/alarm/resource";
@@ -1014,22 +986,6 @@ module ietf-alarms {
                 description
                     "Compress the alarms with this alarm-type-qualifier.";
             }
-            */
-            leaf resource {
-                type string;
-                description
-                    "Compress the alarms with this resource.";
-            }
-            leaf alarm-type-id {
-                type string;
-                description
-                    "Compress alarms with this alarm-type-id.";
-            }
-            leaf alarm-type-qualifier {
-                type string;
-                description
-                    "Compress the alarms with this alarm-type-qualifier.";
-            }
         }
         output {
             leaf compressed-alarms {
@@ -1197,8 +1153,6 @@ module ietf-alarms {
             "This notification is used to report that an operator
             acted upon an alarm.";
 
-        /*
-         * XXX: Temporarily replace leafref datatype for string as leafref is not supported.
         leaf resource {
             type leafref {
                 path "/alarms/alarm-list/alarm/resource";
@@ -1228,22 +1182,6 @@ module ietf-alarms {
             description
                 "The alarm qualifier for the alarm.";
         }
-        */
-        leaf resource {
-            type string;
-            description
-                "The alarming resource.";
-        }
-        leaf alarm-type-id {
-            type string;
-            description
-                "The alarm type identifier for the alarm.";
-        }
-        leaf alarm-type-qualifier {
-            type string;
-            description
-                "The alarm qualifier for the alarm.";
-        }
         uses operator-parameters;
     }
 }