yang: modifications to frr-pim.yang, frr-igmp.yang

Signed-off-by: Sarita Patra <saritap@vmware.com>

diff --git a/yang/frr-igmp.yang b/yang/frr-igmp.yang
index b63d0f97ecbd697461f09ad901e7b8db835b5415..e2971dc5cfe0bdaa78fac2dd65fdf726e76a8caa 100644 (file)
--- a/yang/frr-igmp.yang
+++ b/yang/frr-igmp.yang
@@ -71,14 +71,13 @@ module frr-igmp {
       type boolean;
       default "false";
       description
-        "Enable IGMP protocol on the interface.";
+        "Enable IGMP flag on the interface.";
     }
 
     leaf version {
       type uint8 {
         range "2..3";
       }
-      default "3";
       description
         "IGMP version.";
     }
@@ -156,8 +155,8 @@ module frr-igmp {
    */
   augment "/frr-interface:lib/frr-interface:interface" {
     container igmp {
-      description
-        "IGMP interface parameters.";
+      presence
+        "Configure IGMP on an interface.";
       uses interface-config-attributes;
       list address-family {
         key "address-family";

diff --git a/yang/frr-pim.yang b/yang/frr-pim.yang
index 2135d22f67b0c47b185ab62676babd21d6943984..f959ff8be5c859e8bf61c624352cdd523b42e9a2 100644 (file)
--- a/yang/frr-pim.yang
+++ b/yang/frr-pim.yang
@@ -82,26 +82,19 @@ module frr-pim {
       "A grouping defining pim global attributes.";
 
     leaf ecmp {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Enable PIM ECMP.";
     }
 
     leaf ecmp-rebalance {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Enable PIM ECMP Rebalance.";
     }
 
-    leaf join-prune-interval {
-      type uint16 {
-        range "60..600";
-      }
-      default "60";
-      description
-        "Join Prune Send Interval in seconds.";
-    }
-
     leaf keep-alive-timer {
       type uint16 {
         range "31..60000";
@@ -119,26 +112,7 @@ module frr-pim {
       description
         "RP keep alive Timer in seconds.";
     }
-
-    leaf packets {
-      type uint8 {
-        range "1..100";
-      }
-      default "3";
-      description
-        "Number of packets to process at one time per fd.";
-    }
-
-    leaf register-suppress-time {
-      type uint16 {
-        range "5..60000";
-      }
-      default "60";
-      description
-        "Register Suppress Timer.";
-    }
   }
-
   grouping per-af-global-pim-config-attributes {
     description
       "A grouping defining per address family pim global attributes";
@@ -148,7 +122,8 @@ module frr-pim {
         description
           "Only applicable to IPv4 address family.";
       }
-      type empty;
+      type boolean;
+      default "true";
       description
         "Send v6 secondary addresses.";
     }
@@ -241,7 +216,7 @@ module frr-pim {
     }
 
     container mlag {
-      description
+      presence
         "Multi-chassis link aggregation.";
 
      leaf peerlink-rif {
@@ -300,22 +275,14 @@ module frr-pim {
       "A grouping defining pim interface attributes.";
 
     leaf pim-enable {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Enable PIM flag on the interface.";
     }
 
-    leaf dr-priority {
-      type uint32 {
-        range "1..4294967295";
-      }
-      default 1;
-      description
-        "DR (Designated Router) priority";
-    }
-
     leaf hello-interval {
-      type uint16 {
+      type uint8 {
         range "1..180";
       }
       default "30";
@@ -324,7 +291,7 @@ module frr-pim {
     }
 
     leaf hello-holdtime {
-      type uint16 {
+      type uint8 {
         range "1..180";
       }
       description
@@ -364,22 +331,34 @@ module frr-pim {
     }
 
     leaf bsm {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Enables BSM support on the interface.";
     }
 
     leaf unicast-bsm {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Accept/Send unicast BSM on the interface.";
     }
 
     leaf active-active {
-      type empty;
+      type boolean;
+      default "false";
       description
         "Mark interface as Active-Active for MLAG operations.";
     }
+
+    leaf dr-priority {
+      type uint32 {
+        range "1..4294967295";
+      }
+      default 1;
+      description
+        "DR (Designated Router) priority";
+    }
   } // interface-pim-config-attributes
 
   grouping per-af-interface-pim-config-attributes {
@@ -455,8 +434,8 @@ module frr-pim {
    */
   augment "/frr-interface:lib/frr-interface:interface" {
     container pim {
-      description
-        "PIM interface parameters.";
+      presence
+        "Configure PIM on an interface.";
       uses interface-pim-config-attributes;
       list address-family {
         key "address-family";
@@ -467,5 +446,33 @@ module frr-pim {
       }
     }
   }
-}
 
+  container pim {
+    description
+      "PIM router parameters.";
+    leaf packets {
+      type uint8 {
+        range "1..100";
+      }
+      default "3";
+      description
+        "Number of packets to process at one time per fd.";
+    }
+    leaf join-prune-interval {
+      type uint16 {
+        range "60..600";
+      }
+      default "60";
+      description
+        "Join Prune Send Interval in seconds.";
+    }
+    leaf register-suppress-time {
+      type uint16 {
+        range "5..60000";
+      }
+      default "60";
+      description
+        "Register Suppress Timer.";
+    }
+  }
+}