From 960ee728b77e39cd95b6c20892f01b4db6258f41 Mon Sep 17 00:00:00 2001 From: lsedlak Date: Tue, 23 Apr 2013 11:46:08 +0200 Subject: [PATCH] Fixed organization and contact reference in yang test files. Signed-off-by: Lukas Sedlak --- .../src/test/resources/abstract-topology.yang | 190 +++++++++--------- .../src/test/resources/demo-topology.yang | 5 +- .../abstract-topology@2013-02-08.yang | 4 +- .../test/resources/list-composite-key.yang | 5 +- .../test/resources/simple-container-demo.yang | 5 +- .../test/resources/simple-leaf-list-demo.yang | 5 +- .../src/test/resources/simple-list-demo.yang | 5 +- .../src/test/resources/abstract-topology.yang | 5 +- .../src/test/resources/demo-topology.yang | 5 +- .../test/resources/simple-container-demo.yang | 5 +- .../test/resources/simple-leaf-list-demo.yang | 5 +- .../src/test/resources/simple-list-demo.yang | 5 +- .../src/main/resources/demo-topology.yang | 5 +- .../src/main/resources/test-topology.yang | 5 +- .../src/test/resources/abstract-topology.yang | 4 +- .../src/test/resources/model/testfile1.yang | 4 +- .../src/test/resources/model/testfile2.yang | 5 +- .../src/test/resources/test-model.yang | 5 +- 18 files changed, 130 insertions(+), 142 deletions(-) diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/abstract-topology.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/abstract-topology.yang index 88bfb81c4a..863b223ea6 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/abstract-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/abstract-topology.yang @@ -1,96 +1,96 @@ -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 "Cisco"; - contact "WILL-BE-DEFINED-LATER"; - - 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."; - } - } - } +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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/demo-topology.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/demo-topology.yang index ba46b6f247..95de94375f 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/demo-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/demo-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang index 7ed1f99503..2d6fc26287 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/list-composite-key.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/list-composite-key.yang index 333c8bfb60..07e1dc7e49 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/list-composite-key.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/list-composite-key.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-container-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-container-demo.yang index 560c3ec861..3962274739 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-container-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-container-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang index 78017bb3d7..c0e77ef645 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-list-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-list-demo.yang index 059bc080ad..69f7f5cd30 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-list-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-generator-impl/src/test/resources/simple-list-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/abstract-topology.yang b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/abstract-topology.yang index b0dff3c505..7e78f3be47 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/abstract-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/abstract-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/demo-topology.yang b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/demo-topology.yang index ba46b6f247..95de94375f 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/demo-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/demo-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-container-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-container-demo.yang index 560c3ec861..3962274739 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-container-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-container-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang index 78017bb3d7..c0e77ef645 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-list-demo.yang b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-list-demo.yang index 059bc080ad..69f7f5cd30 100644 --- a/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-list-demo.yang +++ b/opendaylight/sal/yang-prototype/code-generator/binding-java-api-generator/src/test/resources/simple-list-demo.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/demo-topology.yang b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/demo-topology.yang index 23552bb2ef..303edc295d 100644 --- a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/demo-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/demo-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/test-topology.yang b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/test-topology.yang index 76582c7cda..797ab2ced2 100644 --- a/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/test-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/code-generator-demo/src/main/resources/test-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/abstract-topology.yang b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/abstract-topology.yang index 46aac78789..dc7d0a9832 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/abstract-topology.yang +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/abstract-topology.yang @@ -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 diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile1.yang b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile1.yang index f38e3488cf..3fc8e2152e 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile1.yang +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile1.yang @@ -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"; diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile2.yang b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile2.yang index 15685f75a1..0126671b35 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile2.yang +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/model/testfile2.yang @@ -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" { diff --git a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/test-model.yang b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/test-model.yang index a2c485d84f..8127320289 100644 --- a/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/test-model.yang +++ b/opendaylight/sal/yang-prototype/code-generator/yang-model-parser-impl/src/test/resources/test-model.yang @@ -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"; -- 2.36.6