Fixed organization and contact reference in yang test files. 27/227/1
authorlsedlak <lsedlak@cisco.com>
Tue, 23 Apr 2013 09:46:08 +0000 (11:46 +0200)
committerlsedlak <lsedlak@cisco.com>
Tue, 23 Apr 2013 14:37:46 +0000 (16:37 +0200)
Signed-off-by: Lukas Sedlak <lsedlak@cisco.com>
18 files changed:
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/abstract-topology.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/demo-topology.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/list-composite-key.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-container-demo.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang
opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-list-demo.yang
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/abstract-topology.yang
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/demo-topology.yang
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-container-demo.yang
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang
opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-list-demo.yang
opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/demo-topology.yang
opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/test-topology.yang
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/abstract-topology.yang
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile1.yang
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile2.yang
opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/test-model.yang

index 88bfb81c4a56235ddf6f713e5e989a301445ed65..863b223ea601624daedc955d550a01f49c2a7a10 100644 (file)
@@ -1,96 +1,96 @@
-module abstract-topology {\r
-    yang-version 1;\r
-    namespace "urn:model:abstract:topology";\r
-    prefix "tp";\r
-\r
-    import ietf-inet-types { \r
-        prefix "inet"; \r
-        revision-date 2010-09-24;\r
-    }\r
-\r
-    organization "Cisco";\r
-    contact "WILL-BE-DEFINED-LATER";\r
-\r
-    description\r
-        "This module contains the definitions of elements that creates network \r
-    topology i.e. definition of network nodes and links. This module is not designed to be used solely for network representation. This module SHOULD be used as base module in defining the network topology.";\r
-\r
-    revision "2013-02-08" {\r
-        reference "~~~ WILL BE DEFINED LATER";\r
-    }\r
-    \r
-    revision "2013-01-01" {\r
-        reference "~~~ WILL BE DEFINED LATER";\r
-    }\r
-    \r
-    typedef node-id-ref {\r
-        type leafref {\r
-            path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";\r
-        }\r
-        description "This type is used for leafs that reference network node instance.";\r
-    }\r
-\r
-    typedef link-id-ref {\r
-        type leafref {\r
-            path "/tp:topology/tp:network-links/tp:network-link/tp:link-id";\r
-        }\r
-        description "This type is used for leafs that reference network link instance.";\r
-    }\r
-\r
-    container topology {\r
-        description "This is the model of abstract topology which contains only Network Nodes and Network Links. Each topology MUST be identified by unique topology-id for reason that the store could contain many topologies.";\r
-\r
-        leaf topology-id {\r
-            type inet:uri;\r
-            description "It is presumed that datastore will contain many topologies. To distinguish between topologies it is vital to have\r
-            UNIQUE topology identifier.";\r
-        }\r
-\r
-        container network-nodes {\r
-            list network-node {\r
-                key "node-id";\r
-\r
-                leaf node-id {\r
-                    type inet:uri;\r
-                    description "The Topology identifier of network-node.";\r
-                }\r
-\r
-                container attributes {\r
-                    description "Aditional attributes that can Network Node contains.";\r
-                }\r
-                description "The list of network nodes defined for topology.";\r
-            }\r
-        }\r
-        \r
-        container network-links {\r
-            list network-link {\r
-                key "link-id";\r
-\r
-                leaf link-id {\r
-                    type inet:uri;\r
-                    description "";\r
-                }\r
-\r
-                container source-node {\r
-                    leaf id {\r
-                        type node-id-ref;\r
-                        description "Source node identifier.";\r
-                    }\r
-                }\r
-\r
-                container destination-node {\r
-                    leaf id {\r
-                        type node-id-ref;\r
-                        description "Destination node identifier.";\r
-                    }\r
-                }\r
-\r
-                container attributes {\r
-                    description "Aditional attributes that can Network Link contains.";\r
-                }\r
-                description "The Network Link which is defined by Local (Source) and Remote (Destination) Network Nodes. Every link MUST be defined either by identifier and\r
-                his local and remote Network Nodes (In real applications it is common that many links are originated from one node and end up in same remote node). To ensure that we would always know to distinguish between links, every link SHOULD have identifier.";\r
-            }\r
-        }\r
-    }\r
+module abstract-topology {
+    yang-version 1;
+    namespace "urn:model:abstract:topology";
+    prefix "tp";
+
+    import ietf-inet-types { 
+        prefix "inet"; 
+        revision-date 2010-09-24;
+    }
+
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
+
+    description
+        "This module contains the definitions of elements that creates network 
+    topology i.e. definition of network nodes and links. This module is not designed to be used solely for network representation. This module SHOULD be used as base module in defining the network topology.";
+
+    revision "2013-02-08" {
+        reference "~~~ WILL BE DEFINED LATER";
+    }
+    
+    revision "2013-01-01" {
+        reference "~~~ WILL BE DEFINED LATER";
+    }
+    
+    typedef node-id-ref {
+        type leafref {
+            path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";
+        }
+        description "This type is used for leafs that reference network node instance.";
+    }
+
+    typedef link-id-ref {
+        type leafref {
+            path "/tp:topology/tp:network-links/tp:network-link/tp:link-id";
+        }
+        description "This type is used for leafs that reference network link instance.";
+    }
+
+    container topology {
+        description "This is the model of abstract topology which contains only Network Nodes and Network Links. Each topology MUST be identified by unique topology-id for reason that the store could contain many topologies.";
+
+        leaf topology-id {
+            type inet:uri;
+            description "It is presumed that datastore will contain many topologies. To distinguish between topologies it is vital to have
+            UNIQUE topology identifier.";
+        }
+
+        container network-nodes {
+            list network-node {
+                key "node-id";
+
+                leaf node-id {
+                    type inet:uri;
+                    description "The Topology identifier of network-node.";
+                }
+
+                container attributes {
+                    description "Aditional attributes that can Network Node contains.";
+                }
+                description "The list of network nodes defined for topology.";
+            }
+        }
+        
+        container network-links {
+            list network-link {
+                key "link-id";
+
+                leaf link-id {
+                    type inet:uri;
+                    description "";
+                }
+
+                container source-node {
+                    leaf id {
+                        type node-id-ref;
+                        description "Source node identifier.";
+                    }
+                }
+
+                container destination-node {
+                    leaf id {
+                        type node-id-ref;
+                        description "Destination node identifier.";
+                    }
+                }
+
+                container attributes {
+                    description "Aditional attributes that can Network Link contains.";
+                }
+                description "The Network Link which is defined by Local (Source) and Remote (Destination) Network Nodes. Every link MUST be defined either by identifier and
+                his local and remote Network Nodes (In real applications it is common that many links are originated from one node and end up in same remote node). To ensure that we would always know to distinguish between links, every link SHOULD have identifier.";
+            }
+        }
+    }
 }
\ No newline at end of file
index ba46b6f247bf6938fb1ee96db4c1bdda544fbda2..95de94375f7baab566df282f58cf4db930cd761f 100644 (file)
@@ -3,9 +3,8 @@ module demo-topology {
     namespace "";
     prefix "tp";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
                This module contains the definitions of elements that creates network 
index 7ed1f9950383076e01dd7eda51e468ba2e7d1798..2d6fc2628760b496fe276f274df5161a779d53b6 100644 (file)
@@ -13,8 +13,8 @@ module abstract-topology {
         revision-date 2012-11-15;
     }
 
-    organization "Cisco";
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description
         "This module contains the definitions of elements that creates network 
index 333c8bfb60a78e2e49d66060bbd013f80597f20a..07e1dc7e49889fadfb70831e8b27c4351ff97310 100644 (file)
@@ -3,9 +3,8 @@ module list-composite-key {
     namespace "urn:composite.key";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 560c3ec861d182e545194ba6fef6616118f18a61..3962274739280d88a93d9eeb74aa47070b0579a9 100644 (file)
@@ -3,9 +3,8 @@ module simple-container-demo {
     namespace "urn:simple.container.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 78017bb3d7f857b43daecbdead018cb2a36db992..c0e77ef645a6767b4f8d0330e04ec67881cdd810 100644 (file)
@@ -3,9 +3,8 @@ module simple-leaf-list-demo {
     namespace "urn:simple.leaf-list.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 059bc080ad72b33ce2bd094f47b481d9cd8295f6..69f7f5cd30fd297d2d6224d802ecb34c70d32c1f 100644 (file)
@@ -3,9 +3,8 @@ module simple-list-demo {
     namespace "urn:simple.container.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index b0dff3c505820d02085bc3b01409d7676601dc50..7e78f3be478bbbd2c19a93e8fc30ce1c5d7ed74e 100644 (file)
@@ -7,9 +7,8 @@ module abstract-topology {
        import ietf-inet-types { prefix "inet"; }
     import abstract-prefixes { prefix "abs-pref"; }
     
-       organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+       organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
                This module contains the definitions of elements that creates network 
index ba46b6f247bf6938fb1ee96db4c1bdda544fbda2..95de94375f7baab566df282f58cf4db930cd761f 100644 (file)
@@ -3,9 +3,8 @@ module demo-topology {
     namespace "";
     prefix "tp";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
                This module contains the definitions of elements that creates network 
index 560c3ec861d182e545194ba6fef6616118f18a61..3962274739280d88a93d9eeb74aa47070b0579a9 100644 (file)
@@ -3,9 +3,8 @@ module simple-container-demo {
     namespace "urn:simple.container.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 78017bb3d7f857b43daecbdead018cb2a36db992..c0e77ef645a6767b4f8d0330e04ec67881cdd810 100644 (file)
@@ -3,9 +3,8 @@ module simple-leaf-list-demo {
     namespace "urn:simple.leaf-list.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 059bc080ad72b33ce2bd094f47b481d9cd8295f6..69f7f5cd30fd297d2d6224d802ecb34c70d32c1f 100644 (file)
@@ -3,9 +3,8 @@ module simple-list-demo {
     namespace "urn:simple.container.demo";
     prefix "scd";
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 23552bb2ef53b5c85f9ea1dfd1e1dc1676c137e1..303edc295d770d1cfe898a42507292821bb5d791 100644 (file)
@@ -6,9 +6,8 @@ module demo-topology {
     import controller-network {prefix "cn";}
        import mount  {prefix "mnt";}
 
-    organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
         This module contains the definitions of elements that creates network 
index 76582c7cdab6e8b5f33d9d085575b75ca1f4e1fa..797ab2ced24d6d799f4c81a90da677ee27ab7a68 100644 (file)
@@ -7,9 +7,8 @@ module abstract-topology {
        import ietf-inet-types { prefix "inet"; }
     import abstract-prefixes { prefix "abs-pref"; }
     
-       organization "Cisco";
-
-    contact "WILL-BE-DEFINED-LATER";
+       organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description "
                This module contains the definitions of elements that creates network 
index 46aac7878946762d9464a0d92c08f23a13a505bd..dc7d0a9832fd4cbadfabf4883c9371d97bec9e13 100644 (file)
@@ -8,8 +8,8 @@ module abstract-topology {
         revision-date 2010-09-24;
     }
 
-    organization "Cisco";
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
     description
         "This module contains the definitions of elements that creates network 
index f38e3488cff82b387fd937e6ab25a7687820ce8e..3fc8e2152e3d3f56baf79a6105115c09ea613427 100644 (file)
@@ -8,8 +8,8 @@ module types1 {
          revision-date 2013-02-27;
      }
     
-    organization "opendaylight";
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
     
     revision "2013-02-27" {
         reference " WILL BE DEFINED LATER";
index 15685f75a1b1c55ac50f608a66f055df7f522fbd..0126671b359d1c9d432ad940d34a43c407485b29 100644 (file)
@@ -8,8 +8,9 @@ module types2 {
          revision-date 2013-02-27;
      }
 
-    organization "opendaylight";
-    contact "WILL-BE-DEFINED-LATER";
+    organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
+    
     description "This is types-data test description";
 
     revision "2013-02-27" {
index a2c485d84f41e041d8d496d1a560b7e44cba4806..81273202893e8b1ccc393fe76a1d49de23e5770f 100644 (file)
@@ -7,9 +7,8 @@ module test-model {
        import iana-if-type {prefix "if-type";}
        import mount {prefix "mnt";} 
 
-       organization "Cisco";
-
-       contact "WILL-BE-DEFINED-LATER";
+       organization "OPEN DAYLIGHT";
+    contact "http://www.opendaylight.org/";
 
        description "module description";
        reference "module reference";