allign the YANG and the tree to lastest changes

Yang/ietf-l3-isis-topology.yang

@@ -82,57 +82,82 @@ module ietf-l3-isis-topology {
     }
   }
 
+  grouping isis-link-attributes {
+     description "Identifies the IS-IS link attributes.";
+     container isis-link-attributes {
+     leaf metric {
+      type uint32 {
+         range "0 .. 16777215";
+       }
+      description
+        "This type defines wide style format of IS-IS metric.";
+     }
+     leaf level {
+      type ietf-isis:level;
+      description
+        "Level of an IS-IS node - can be level-1,
+        level-2 or level-all.";
+    }
+    } 
+  }
+
   grouping isis-node-attributes {
     description "isis node scope attributes";
     container isis-timer-attributes {
       description
         "Contains node timer attributes";
       uses ietf-isis:lsp-parameters;
     }
-    container isis-status {
-      description
-        "Contains the ISIS status attributes";
+    container isis-node-attributes {
+      leaf system-id {
+          type ietf-isis:system-id;
+          description
+            "System-id of the node.";
+        }
       leaf level {
-        type ietf-isis:level;
-        description
-          "Level of an IS-IS node - can be level-1,
-          level-2 or level-all.";
-      }
-
+          type ietf-isis:level;
+          description
+            "Level of an IS-IS node - can be level-1,
+            level-2 or level-all.";
+        }
       leaf-list area-address {
-        type ietf-isis:area-address;
-        description
-          "List of areas supported by the protocol instance.";
-      }
-
-      leaf system-id {
-        type ietf-isis:system-id;
-        description 
-          "System-id of the node.";
+          type ietf-isis:area-address;
+          description
+            "List of areas supported by the protocol instance.";
+        }
+      leaf lsp-lifetime {
+          type uint16 {
+             range "1..65535";
+           }
+          units "seconds";
+          description
+            "Lifetime of the router's LSPs in seconds.";
+        }
+      leaf lsp-refresh-interval {
+          type uint16 {
+             range "1..65535";
+           }
+          units "seconds";
+          description
+            "Refresh interval of the router's LSPs in seconds.";
+        }
       }
-
-      leaf-list neighbors {
-        type inet:ip-address;
-        config false;
-        description
-          "Topology flags";
-      }
-    }
   }
 
-  grouping isis-termination-point-attributes {
-    description "ISIS termination point scope attributes";
+grouping isis-termination-point-attributes {
+    description "IS-IS termination point scope attributes";
     container isis-termination-point-attributes {
-      description
+       description
       "Indicates the termination point from the
-      which the ISIS is configured. A termination
+      which the IS-IS is configured. A termination
       point can be a physical port, an interface, etc.";
 
     leaf interface-type {
       type ietf-isis:interface-type;
       description
-        "Type of adjacency to be established for the interface. This
-        dictates the type of hello messages that are used.";
+        "Type of adjacency (broadcast or point-to-point) to be established 
+        for the interface.
+        This dictates the type of hello messages that are used.";
     }
 
     leaf level {
@@ -142,14 +167,6 @@ module ietf-l3-isis-topology {
         level-2 or level-all.";
     }
 
-    leaf metric {
-      type uint32 {
-         range "0 .. 16777215";
-       }
-      description
-        "This type defines wide style format of IS-IS metric.";
-    }
-
     leaf is-passive{
       type boolean;
       description
@@ -164,7 +181,7 @@ module ietf-l3-isis-topology {
       "Introduces new network type for L3 Unicast topology";
     uses isis-topology-type;
   }
-  
+
   augment "/nw:networks/nw:network/nw:node/l3t:l3-node-attributes" {
     when "/nw:networks/nw:network/nw:network-types/isisnt:isis-topology" {
       description
@@ -180,22 +197,24 @@ module ietf-l3-isis-topology {
     when "/nw:networks/nw:network/nw:network-types/isisnt:isis-topology" {
       description
         "Augmentation parameters apply only for networks with
-        ISIS topology";
+        IS-IS topology";
     }
-    description 
+    description
       "Augments topology link configuration";
-    uses isis-termination-point-attributes;
+    uses isis-link-attributes;
   }
 
-  augment "/nw:networks/nw:network/nw:node/nt:termination-point/l3t:l3-termination-point-attributes" {
+
+
+  augment "/nw:networks/nw:network/nw:node/nt:termination-point"+
+  "/l3t:l3-termination-point-attributes" {
     when "/nw:networks/nw:network/nw:network-types/isisnt:isis-topology" {
       description
         "Augmentation parameters apply only for networks with
-        ISIS topology";
+        IS-IS topology";
     }
-    description 
+    description
       "Augments topology termination point configuration";
     uses isis-termination-point-attributes;
   }
 }
-

Yang/ietf-topology.tree

@@ -0,0 +1,25 @@
+module: ietf-l3-isis-topology
+
+  augment /nw:networks/nw:network/nw:network-types:
+    +--rw isis-topology!
+  augment /nw:networks/nw:network/nw:node/l3t:l3-node-attributes:
+    +--rw isis-timer-attributes
+    |  +--rw lsp-mtu?        uint16
+    |  +--rw lsp-lifetime?   uint16
+    |  +--rw lsp-refresh?    rt-types:timer-value-seconds16 {lsp-refresh}?
+    |  +--rw poi-tlv?        boolean {poi-tlv}?
+    +--rw isis-node-attributes
+       +--rw system-id?              ietf-isis:system-id
+       +--rw level?                  ietf-isis:level
+       +--rw area-address*           ietf-isis:area-address
+       +--rw lsp-lifetime?           uint16
+       +--rw lsp-refresh-interval?   uint16
+  augment /nw:networks/nw:network/nt:link/l3t:l3-link-attributes:
+    +--rw isis-link-attributes
+       +--rw metric?   uint32
+       +--rw level?    ietf-isis:level
+  augment /nw:networks/nw:network/nw:node/nt:termination-point/l3t:l3-termination-point-attributes:
+    +--rw isis-termination-point-attributes
+       +--rw interface-type?   ietf-isis:interface-type
+       +--rw level?            ietf-isis:level
+       +--rw is-passive?       boolean