Bump models to match draft-clemm-netmod-yang-network-topo-01

Change-Id: I6ebc3326d0d7be4f8ace70f09d747100e30c305e
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/programming/tunnel-api/src/main/yang/topology-tunnel-programming.yang b/programming/tunnel-api/src/main/yang/topology-tunnel-programming.yang
index c12a5d25cd0d7f19d6dab353af59e1956779c392..8c9361b765ee07f69a31f41d1d9a8349b09d0b8c 100644 (file)
--- a/programming/tunnel-api/src/main/yang/topology-tunnel-programming.yang
+++ b/programming/tunnel-api/src/main/yang/topology-tunnel-programming.yang
@@ -3,7 +3,7 @@ module topology-tunnel-programming {
        namespace "urn:opendaylight:params:xml:ns:yang:topology:tunnel:programming";
        prefix "ttp";
 
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
        import topology-tunnel { prefix tt; revision-date 2013-08-19; }
        import programming { prefix pgm; revision-date 2013-09-30; }
 

diff --git a/topology/api/src/main/yang/isis-topology.yang b/topology/api/src/main/yang/isis-topology.yang
index 9158ce69e751ca4b1f21aac52a22c17426e991d7..2e704bc50a8617e59f4a93bf23d0dd79346b95bd 100644 (file)
--- a/topology/api/src/main/yang/isis-topology.yang
+++ b/topology/api/src/main/yang/isis-topology.yang
@@ -14,17 +14,16 @@ module isis-topology {
     }
 
     organization "TBD";
-
     contact "TBD";
     description "ISIS Topology model";
 
-    revision "2013-07-12" {
+    revision "2013-10-21" {
         description "Initial version";
     }
     typedef iso-system-id {
         description "ISO System ID. RFC 1237";
         type string {
-            pattern '[0-9a-fA-F]{4}(.[0-9a-fA-F]{4}){2}';
+            pattern '[0-9a-fA-F]{4}(\.[0-9a-fA-F]{4}){2}';
         }
     }
 
@@ -37,7 +36,7 @@ module isis-topology {
     typedef iso-net-id {
         description "ISO NET ID. RFC 1237";
         type string {
-            pattern '[0-9a-fA-F]{2}((.[0-9a-fA-F]{4}){6}*)';
+            pattern '[0-9a-fA-F]{2}((\.[0-9a-fA-F]{4}){6})';
         }
     }
 
@@ -52,8 +51,8 @@ module isis-topology {
     }
 
     augment "/nt:network-topology/nt:topology/igp:igp-topology-attributes" {
-        when "../../topology-types/isis";
-        container isis-topogloy-attributes {
+        when "../nt:topology-types/l3t:l3-unicast-igp-topology/isis";
+        container isis-topology-attributes {
             leaf net {
                 type iso-net-id;
             }
@@ -61,13 +60,13 @@ module isis-topology {
     }
 
     augment "/nt:network-topology/nt:topology/nt:node/igp:igp-node-attributes" {
-        when "../../../topology-types/isis";
+        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/isis";
         uses isis-node-attributes;
-
     }
 
     augment "/nt:network-topology/nt:topology/nt:link/igp:igp-link-attributes" {
-        when "../../../../topology-types/isis";
+
+        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/isis";
         uses isis-link-attributes;
     }
 
@@ -112,7 +111,6 @@ module isis-topology {
             }
             container ted {
                 uses ted:ted-node-attributes;
-
             }
         }
     }

diff --git a/topology/api/src/main/yang/l3-unicast-igp-topology.yang b/topology/api/src/main/yang/l3-unicast-igp-topology.yang
index 6a9383ad5986b61bdaaeaa2d3ff772f3e97322d7..f01d43b0c7488a2913206573c96c10d465da7a0f 100644 (file)
--- a/topology/api/src/main/yang/l3-unicast-igp-topology.yang
+++ b/topology/api/src/main/yang/l3-unicast-igp-topology.yang
@@ -14,7 +14,7 @@ module l3-unicast-igp-topology {
     organization "TBD";
     contact "TBD";
 
-    revision "2013-07-12" {
+    revision "2013-10-21" {
         description "Initial revision";
         reference "TBD";
     }
@@ -44,8 +44,8 @@ module l3-unicast-igp-topology {
         base "flag-identity";
     }
 
-
     typedef flag-type {
+
         type identityref {
             base "flag-identity";
         }
@@ -93,8 +93,8 @@ module l3-unicast-igp-topology {
                 type flag-type;
             }
             leaf-list router-id {
-
                 description "Router-id for the node";
+
                 type inet:ip-address;
             }
             list prefix {
@@ -142,8 +142,8 @@ module l3-unicast-igp-topology {
                 case unnumbered {
                     leaf unnumbered-id {
                     description "Unnumbered interface identifier";
-
                     type uint32;
+
                     }
                 }
             }
@@ -156,20 +156,20 @@ module l3-unicast-igp-topology {
     }
 
     augment "/nt:network-topology/nt:topology" {
-        when "topology-types/l3-unicast-igp-topology";
+        when "nt:topology-types/l3-unicast-igp-topology";
         uses igp-topology-attributes;
     }
 
     augment "/nt:network-topology/nt:topology/nt:node" {
-        when "../../topology-types/l3-unicast-igp-topology";
+        when "../nt:topology-types/l3-unicast-igp-topology";
         uses igp-node-attributes;
     }
     augment "/nt:network-topology/nt:topology/nt:link" {
-        when "../../topology-types/l3-unicast-igp-topology";
+        when "../nt:topology-types/l3-unicast-igp-topology";
         uses igp-link-attributes;
     }
     augment "/nt:network-topology/nt:topology/nt:node/nt:termination-point" {
-        when "../../topology-types/l3-unicast-igp-topology";
+        when "../../nt:topology-types/l3-unicast-igp-topology";
         uses igp-termination-point-attributes;
     }
 
@@ -191,8 +191,8 @@ module l3-unicast-igp-topology {
         }
         leaf topology-ref {
             type nt:topology-ref;
-
         }
+
         uses l3-unicast-igp-topology-type;
         uses nt:link-attributes;
         uses igp-link-attributes;

diff --git a/topology/api/src/main/yang/network-topology.yang b/topology/api/src/main/yang/network-topology.yang
index 4f1855baef86f62a9e49d791c7ea2a2cf88db5aa..3c5ae5e7e385cd245fbf1a906cf809bb1c687e92 100644 (file)
--- a/topology/api/src/main/yang/network-topology.yang
+++ b/topology/api/src/main/yang/network-topology.yang
@@ -21,7 +21,7 @@ module network-topology  {
         through a hierarchy of nodes, then connecting nodes at
         upper layers of the hierarchy.";
 
-    revision 2013-07-12 {
+    revision 2013-10-21 {
         description
             "Initial revision.";
     }
@@ -45,6 +45,7 @@ module network-topology  {
             and/or the type of topology that the node is a part of.";
     }
 
+
     typedef link-id {
         type inet:uri;
         description
@@ -80,7 +81,6 @@ module network-topology  {
             (This type should not be used for relative references.
             In such a case, a relative path should be used instead.)";
     }
-
     typedef topology-ref {
         type leafref {
             path "/network-topology/topology/topology-id";
@@ -94,6 +94,7 @@ module network-topology  {
             path "/network-topology/topology/node/node-id";
         }
         description
+
             "A type for an absolute reference to a node instance.
             (This type should not be used for relative references.
             In such a case, a relative path should be used instead.)";
@@ -129,7 +130,6 @@ module network-topology  {
                 in a supporting node.
                 This dependency information can be inferred from
                 the dependencies between links.  For this reason,
-
                 this item is not separately configurable.  Hence no
                 corresponding constraint needs to be articulated.
                 The corresponding information is simply provided by the
@@ -143,6 +143,7 @@ module network-topology  {
             The objects are provided in a grouping so that in addition to
             the datastore, the data can also be included in notifications
             as needed.";
+
         leaf node-id {
             type node-id;
             description
@@ -178,7 +179,6 @@ module network-topology  {
             type link-id;
             description
                 "The identifier of a link in the topology.
-
                 A link is specific to a topology to which it belongs.";
         }
         container source {
@@ -192,6 +192,7 @@ module network-topology  {
                 type tp-ref;
                 description
                     "Termination point within source node that terminates the link.";
+
             }
         }
         container destination {
@@ -220,14 +221,13 @@ module network-topology  {
         list topology {
             description "
                 This is the model of an abstract topology.
-                A topology contins nodes and links.
+                A topology contains nodes and links.
                 Each topology MUST be identified by
                 unique topology-id for reason that a network could contain many
                 topologies.
             ";
             key "topology-id";
             leaf topology-id {
-
                 type topology-id;
                 description "
                     It is presumed that a datastore will contain many topologies. To
@@ -235,6 +235,19 @@ module network-topology  {
                     topology identifiers.
                 ";
             }
+            leaf server-provided {
+                type boolean;
+                config false;
+                description "
+                    Indicates whether the topology is configurable by clients,
+                    or whether it is provided by the server.  This leaf is
+
+                    populated by the server implementing the model.
+                    It is set to false for topologies that are created by a client;
+                    it is set to true otherwise.  If it is set to true, any
+                    attempt to edit the topology MUST be rejected.
+                ";
+            }
             container topology-types {
                 description
                     "This container is used to identify the type, or types
@@ -276,8 +289,8 @@ module network-topology  {
                     // This constraint is meant to ensure that a referenced node is in fact
                     // a node in an underlay topology.
                 list termination-point {
-
                     description
+
                         "A termination point can terminate a link.
                         Depending on the type of topology, a termination point could,
                         for example, refer to a port or an interface.";

diff --git a/topology/api/src/main/yang/ospf-topology.yang b/topology/api/src/main/yang/ospf-topology.yang
index eaacf6416ea510086340d3ff1cab81b2633c23f3..576cd8262b9c44f2b40831ce191536e6331a78b3 100644 (file)
--- a/topology/api/src/main/yang/ospf-topology.yang
+++ b/topology/api/src/main/yang/ospf-topology.yang
@@ -1,8 +1,8 @@
 module ospf-topology {
     yang-version 1;
-    namespace "urn:ietf:params:xml:ns:yang:ospf-topology";
-
+    namespace "urn:TBD:params:xml:ns:yang:ospf-topology";
     // replace with IANA namespace when assigned
+
     prefix "ospf";
 
     import network-topology {
@@ -10,7 +10,7 @@ module ospf-topology {
     }
 
     import l3-unicast-igp-topology {
-        prefix "igp";
+        prefix "l3t";
     }
     import ietf-inet-types {
         prefix "inet";
@@ -23,7 +23,7 @@ module ospf-topology {
     contact "TBD";
     description "OSPF Topology model";
 
-    revision "2013-07-12" {
+    revision "2013-10-21" {
         description "Initial revision";
         reference "TBD";
     }
@@ -39,32 +39,31 @@ module ospf-topology {
         }
     }
 
-    augment "/nt:network-topology/nt:topology/nt:topology-types/igp:l3-unicast-igp-topology" {
+    augment "/nt:network-topology/nt:topology/nt:topology-types/l3t:l3-unicast-igp-topology" {
         uses ospf-topology-type;
     }
 
-    augment "/nt:network-topology/nt:topology/igp:igp-topology-attributes" {
-        when "../topology-types/ospf";
+    augment "/nt:network-topology/nt:topology/l3t:igp-topology-attributes" {
+        when "../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
         container ospf-topology-attributes {
             leaf area-id {
                 type area-id;
             }
         }
-
     }
 
-    augment "/nt:network-topology/nt:topology/nt:node/igp:igp-node-attributes" {
-        when "../../../topology-types/ospf";
+    augment "/nt:network-topology/nt:topology/nt:node/l3t:igp-node-attributes" {
+        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
         uses ospf-node-attributes;
     }
 
-    augment "/nt:network-topology/nt:topology/nt:link/igp:igp-link-attributes" {
-        when "../../../topology-types/ospf";
+    augment "/nt:network-topology/nt:topology/nt:link/l3t:igp-link-attributes" {
+        when "../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
         uses ospf-link-attributes;
     }
 
-    augment "/nt:network-topology/nt:topology/nt:node/igp:igp-node-attributes/igp:prefix" {
-        when "../../../../topology-types/ospf";
+    augment "/nt:network-topology/nt:topology/nt:node/l3t:igp-node-attributes/l3t:prefix" {
+        when "../../../nt:topology-types/l3t:l3-unicast-igp-topology/ospf";
         uses ospf-prefix-attributes;
     }
 
@@ -99,9 +98,9 @@ module ospf-topology {
                 type uint32;
             }
             leaf-list multi-topology-id {
-
                 description "List of Multi-Topology Identifier up-to 128 (0-127). RFC 4915";
                 max-elements "128";
+
                 type uint8 {
                     range "0..127";
                 }
@@ -148,27 +147,27 @@ module ospf-topology {
         }
     } // ospf-link-attributes
 
-
     grouping ospf-prefix-attributes {
         container ospf-prefix-attributes {
+
             leaf forwarding-address {
-                when "../../igp:l3-unicast-igp-topology/igp:ospf/igp:router-type/igp:asbr";
+                when "../../l3t:l3-unicast-igp-topology/l3t:ospf/l3t:router-type/l3t:asbr";
                 type inet:ipv4-address;
             }
         }
     }
 
-    augment "/igp:igp-node-event" {
+    augment "/l3t:igp-node-event" {
         uses ospf-topology-type;
         uses ospf:ospf-node-attributes;
     }
 
-    augment "/igp:igp-link-event" {
+    augment "/l3t:igp-link-event" {
         uses ospf-topology-type;
         uses ospf:ospf-link-attributes;
     }
 
-    augment "/igp:igp-prefix-event" {
+    augment "/l3t:igp-prefix-event" {
         uses ospf-topology-type;
         uses ospf:ospf-prefix-attributes;
     }

diff --git a/topology/api/src/main/yang/ted.yang b/topology/api/src/main/yang/ted.yang
index c3e54c6b227153a9e7800fb02fc3b096e27e6342..fc91e9eae99514a8d5599972c6fb779ce53f89fe 100644 (file)
--- a/topology/api/src/main/yang/ted.yang
+++ b/topology/api/src/main/yang/ted.yang
@@ -11,11 +11,11 @@ module ted {
   organization "TBD";
   contact
     "TBD";
-
   description
     "Helper module to hold TED attributes for OSPF/ISIS";
 
-  revision 2013-07-12 {
+  revision 2013-10-21 {
+
     description
       "Initial revision";
   }
@@ -60,11 +60,11 @@ module ted {
       enum "LSC" {
         description
           "Lambda-Switch Capable (LSC)";
-
         value 150;
       }
       enum "FSC" {
         description
+
           "Fiber-Switch Capable (FSC)";
         value 200;
       }
@@ -109,11 +109,11 @@ module ted {
   }
 
   grouping ted-node-attributes {
-
     description
       "Identifier to uniquely identify a node in TED";
     reference "RFC 5305, RFC 6119: IPv6 Traffic Engineering in IS-IS/OSPF";
     leaf te-router-id-ipv4 {
+
       description
         "Globally unique IPv4 Traffic Engineering Router ID.";
       type inet:ipv4-address;
@@ -158,11 +158,11 @@ module ted {
     }
   }
 
-
   grouping ted-link-attributes {
     description
       "TED Attributes associated with the link.";
     reference "RFC 3630, RFC 3784: IS-IS / OSPF Traffic Engineering (TE)";
+
     leaf color {
       description
         "Administrative group or color of the link";
@@ -207,7 +207,6 @@ module ted {
     }
     container srlg {
       description
-
         "Shared Risk Link Group Attributes";
       uses srlg-attributes;
     }
@@ -256,12 +255,12 @@ module ted {
         description
           "Interface has packet-switching capabilities";
         leaf minimum-lsp-bandwidth {
-
           description
             "Minimum LSP Bandwidth. Units in bytes per second";
           type decimal64 {
             fraction-digits 2;
           }
+
         }
         leaf interface-mtu {
           description

diff --git a/topology/segment-routing/src/main/yang/network-topology-sr.yang b/topology/segment-routing/src/main/yang/network-topology-sr.yang
index 347ede30876c4465d744093e8838d3acbcf07155..14dded54903cd7857bf0ab37d2c27167ace4f68d 100644 (file)
--- a/topology/segment-routing/src/main/yang/network-topology-sr.yang
+++ b/topology/segment-routing/src/main/yang/network-topology-sr.yang
@@ -3,7 +3,7 @@ module network-topology-sr {
        namespace "urn:opendaylight:params:xml:ns:yang:topology:sr";
        prefix "sr";
 
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
 
        organization "Cisco Systems, Inc.";
        contact "Robert Varga <rovarga@cisco.com>";

diff --git a/topology/segment-routing/src/main/yang/topology-tunnel-sr.yang b/topology/segment-routing/src/main/yang/topology-tunnel-sr.yang
index eb128cb8c3208a75d63db24ce8841b62e9615198..c9e8764a82a2d4c64b313959b6e7a89a7e28432c 100644 (file)
--- a/topology/segment-routing/src/main/yang/topology-tunnel-sr.yang
+++ b/topology/segment-routing/src/main/yang/topology-tunnel-sr.yang
@@ -4,7 +4,7 @@ module topology-tunnel-sr {
        prefix "tun-sr";
 
        import network-topology-sr { prefix sr; revision-date 2013-08-19; }
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
        import topology-tunnel { prefix tt; revision-date 2013-08-19; }
        import topology-tunnel-p2p { prefix p2p; revision-date 2013-08-19; }
 

diff --git a/topology/tunnel-api/src/main/yang/topology-tunnel-p2p.yang b/topology/tunnel-api/src/main/yang/topology-tunnel-p2p.yang
index 0206eaa79b79abfacd097b88b914813541437342..d35cf7e5499b55f8167b49adf7b90622ffde15dc 100644 (file)
--- a/topology/tunnel-api/src/main/yang/topology-tunnel-p2p.yang
+++ b/topology/tunnel-api/src/main/yang/topology-tunnel-p2p.yang
@@ -3,7 +3,7 @@ module topology-tunnel-p2p {
        namespace "urn:opendaylight:params:xml:ns:yang:topology:tunnel:p2p";
        prefix "p2p";
 
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
        import topology-tunnel { prefix tt; revision-date 2013-08-19; }
 
        organization "Cisco Systems, Inc.";

diff --git a/topology/tunnel-api/src/main/yang/topology-tunnel.yang b/topology/tunnel-api/src/main/yang/topology-tunnel.yang
index e8917f912d6874db1ac851925aed5b85d5f518fe..063afcd0ad75b514ee43e6f8cb3e8e7f9944fbf3 100644 (file)
--- a/topology/tunnel-api/src/main/yang/topology-tunnel.yang
+++ b/topology/tunnel-api/src/main/yang/topology-tunnel.yang
@@ -4,7 +4,7 @@ module topology-tunnel {
        prefix "tt";
 
        import ietf-inet-types { prefix inet; revision-date 2010-09-24; }
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
 
        organization "Cisco Systems, Inc.";
        contact "Robert Varga <rovarga@cisco.com>";

diff --git a/topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang b/topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang
index 1df0b394f5108249d26dd7c0b6b46d003a2fb172..8176c0d0ec043f74366b1c8d1d83ec01e7f32924 100644 (file)
--- a/topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang
+++ b/topology/tunnel-pcep/src/main/yang/topology-tunnel-pcep.yang
@@ -4,7 +4,7 @@ module topology-tunnel-pcep {
        prefix "pceptun";
 
        import ieee754 { prefix ieee754; revision-date 2013-08-19; }
-       import network-topology { prefix nt; revision-date 2013-07-12; }
+       import network-topology { prefix nt; revision-date 2013-10-21; }
        import pcep-types { prefix pcep; revision-date 2013-10-05; }
        import rsvp { prefix rsvp; revision-date 2013-08-20; }
        import topology-tunnel { prefix tt; revision-date 2013-08-19; }