Cleanup yang model whitespace

We have a ton of trailing whitespace, clean it up.

Change-Id: Ib7f5ae567b83f5b5172386fc496728e8c48131c2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network-rpcs.yang b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network-rpcs.yang
index b6fd3be80d6d579ae6e5fc2aa09c4f0d9f03afe1..fd51039a667ce41219b816c293fb7adbfe553e33 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network-rpcs.yang
+++ b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network-rpcs.yang
@@ -9,13 +9,13 @@ module controller-network-rpcs {
        yang-version 1;
        namespace "urn:opendaylight:controller:network:rpcs";
        prefix "topos";
        yang-version 1;
        namespace "urn:opendaylight:controller:network:rpcs";
        prefix "topos";

-       
+

        import ietf-inet-types { prefix "inet"; }
        import ietf-inet-types { prefix "inet"; }

-       
+

        revision 2013-05-20 {
           description "Initial demo";
        }
        revision 2013-05-20 {
           description "Initial demo";
        }

-       
+

        rpc activate-software-image {
          input {
              leaf image-name {
        rpc activate-software-image {
          input {
              leaf image-name {


@@ -28,7 +28,7 @@ module controller-network-rpcs {
              }
          }
      }
              }
          }
      }

-     
+

      rpc rock-the-house {
          input {
              leaf zip-code {
      rpc rock-the-house {
          input {
              leaf zip-code {

diff --git a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network.yang b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network.yang
index 372e87831c8a93f53dcb9a9575922a15734b5e51..b7499d4d9ef7cd352522349926dfff0cb71fed57 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network.yang
+++ b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-network.yang
@@ -9,16 +9,16 @@ module controller-network {
        yang-version 1;
        namespace "urn:opendaylight:controller:network";
        prefix "topos";
        yang-version 1;
        namespace "urn:opendaylight:controller:network";
        prefix "topos";

-       
+

        import ietf-inet-types { prefix "inet"; }
        import ietf-inet-types { prefix "inet"; }

-       
+

        revision 2013-05-20 {
           description "Initial demo";
        }
        revision 2013-05-20 {
           description "Initial demo";
        }

-       

 
 

-       
-       
+
+
+

        typedef topology-id {
                type string;
        }
        typedef topology-id {
                type string;
        }


@@ -63,7 +63,7 @@ module controller-network {
                description "This type is used for leafs that reference a link instance.";
                // currently not used
        }
                description "This type is used for leafs that reference a link instance.";
                // currently not used
        }

-       
+

        typedef network-element-ref {
                type leafref {
                        path "/network/network-elements/network-element/element-id";
        typedef network-element-ref {
                type leafref {
                        path "/network/network-elements/network-element/element-id";


@@ -74,7 +74,7 @@ module controller-network {
        typedef element-id {
                type string;
        }
        typedef element-id {
                type string;
        }

-       
+

        container network {
                container topologies {
                        list topology {
        container network {
                container topologies {
                        list topology {


@@ -86,7 +86,7 @@ module controller-network {
                                ";
                                key "topology-id";
                                leaf topology-id {
                                ";
                                key "topology-id";
                                leaf topology-id {

-                                       type topology-id; 
+                                       type topology-id;

                                        description "
                                                It is presumed that datastore will contain many topologies. To
                                                distinguish between topologies it is vital to have UNIQUE
                                        description "
                                                It is presumed that datastore will contain many topologies. To
                                                distinguish between topologies it is vital to have UNIQUE


@@ -97,7 +97,7 @@ module controller-network {
                                container types {
                                        description "
                                                The container for definition of topology types.
                                container types {
                                        description "
                                                The container for definition of topology types.

-                                               The augmenting modules should add empty optional leaf 
+                                               The augmenting modules should add empty optional leaf

                                                to this container to signalize topology type.
                                        ";
                                }
                                                to this container to signalize topology type.
                                        ";
                                }


@@ -115,7 +115,7 @@ module controller-network {
                                                leaf supporting-ne {
                                                        type network-element-ref;
                                                }
                                                leaf supporting-ne {
                                                        type network-element-ref;
                                                }

-                                               
+

                                                container termination-points {
                                                        list termination-point {
                                                                key "tp-id";
                                                container termination-points {
                                                        list termination-point {
                                                                key "tp-id";


@@ -126,7 +126,7 @@ module controller-network {
                                                }
                                        }
                                }
                                                }
                                        }
                                }

-               
+

                                container links {
                                        list link {
                                                description "
                                container links {
                                        list link {
                                                description "


@@ -140,11 +140,11 @@ module controller-network {
                                                        identifier.
                                                ";
                                                key "link-id";
                                                        identifier.
                                                ";
                                                key "link-id";

-               
+

                                                leaf link-id {
                                                        type link-id;
                                                }
                                                leaf link-id {
                                                        type link-id;
                                                }

-                                               container source { 
+                                               container source {

                                                        leaf source-node {
                                                                type node-ref;
                                                                description "Source node identifier.";
                                                        leaf source-node {
                                                                type node-ref;
                                                                description "Source node identifier.";


@@ -153,7 +153,7 @@ module controller-network {
                                                                type tp-ref;
                                                        }
                                                }
                                                                type tp-ref;
                                                        }
                                                }

-                                               container destination { 
+                                               container destination {

                                                        leaf dest-node {
                                                                type node-ref;
                                                                description "Destination node identifier.";
                                                        leaf dest-node {
                                                                type node-ref;
                                                                description "Destination node identifier.";


@@ -176,7 +176,7 @@ module controller-network {
                        }
                }
        }
                        }
                }
        }

-       
+

        rpc activate-software-image {
          input {
              leaf image-name {
        rpc activate-software-image {
          input {
              leaf image-name {


@@ -189,7 +189,7 @@ module controller-network {
              }
          }
      }
              }
          }
      }

-     
+

      rpc rock-the-house {
          input {
              leaf zip-code {
      rpc rock-the-house {
          input {
              leaf zip-code {

diff --git a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-openflow.yang b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-openflow.yang
index 0f6f945ec32f047b33b1f0d2e44367e43b0685f0..dd9b30ec24e2651edc50936efa146e455492ac2a 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-openflow.yang
+++ b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/controller-openflow.yang
@@ -10,13 +10,13 @@ module controller-openflow {
     namespace "urn:opendaylight:controller:openflow";
     prefix "of";
     import controller-network {prefix cn;}
     namespace "urn:opendaylight:controller:openflow";
     prefix "of";
     import controller-network {prefix cn;}

-    
-    
+
+

     revision 2013-05-20 {
        description "Initial demo";
     }
 
     revision 2013-05-20 {
        description "Initial demo";
     }
 

-   
+

 
 
 
 
 
 


@@ -53,7 +53,7 @@ module controller-openflow {
             type datapath-id;
         }
     }
             type datapath-id;
         }
     }

-    
+

     augment "/cn:network/cn:network-elements/cn:network-element" {
         leaf datapath-id {
             type datapath-id;
     augment "/cn:network/cn:network-elements/cn:network-element" {
         leaf datapath-id {
             type datapath-id;


@@ -62,7 +62,7 @@ module controller-openflow {
         container ports {
             list port {
                 key "logical-port-id";
         container ports {
             list port {
                 key "logical-port-id";

-                
+

                 leaf logical-port-id {
                     type int32;
                 }
                 leaf logical-port-id {
                     type int32;
                 }

diff --git a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/demo-topology.yang b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/demo-topology.yang
index b4025ba1cf749fae18efcd5530a7c6893da81cba..79045b81ecffa797dd58f1e70f7b1976f35a42d4 100644 (file)
--- a/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/demo-topology.yang
+++ b/binding/maven-sal-api-gen-plugin/src/test/resources/wadl-gen/demo-topology.yang
@@ -14,7 +14,7 @@ module demo-topology {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-               This module contains the definitions of elements that creates network 
+               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.
                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.


@@ -51,19 +51,19 @@ module demo-topology {
                                type string;
                                description "The Topology identifier of network-node.";
                        }
                                type string;
                                description "The Topology identifier of network-node.";
                        }

-                
+

                 list network-interface {
                     key "interface-id";
                 list network-interface {
                     key "interface-id";

-                    
+

                     leaf interface-id {
                         type uint8;
                     }
                     leaf interface-id {
                         type uint8;
                     }

-                    
+

                     leaf interface-address {
                         type string;
                     }
                 }
                     leaf interface-address {
                         type string;
                     }
                 }

-                
+

                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.
                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.


@@ -85,7 +85,7 @@ module demo-topology {
                                }
                }
         }
                                }
                }
         }

-        
+

         container network-links {
                list network-link {
                    description "
         container network-links {
                list network-link {
                    description "

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/abstract-topology.yang b/binding/mdsal-binding-generator-impl/src/test/resources/abstract-topology.yang
index 863b223ea601624daedc955d550a01f49c2a7a10..b2ec4bd7e64019e19a7b6a065ffa1577af87c478 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/abstract-topology.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/abstract-topology.yang
@@ -3,8 +3,8 @@ module abstract-topology {
     namespace "urn:model:abstract:topology";
     prefix "tp";
 
     namespace "urn:model:abstract:topology";
     prefix "tp";
 

-    import ietf-inet-types { 
-        prefix "inet"; 
+    import ietf-inet-types {
+        prefix "inet";

         revision-date 2010-09-24;
     }
 
         revision-date 2010-09-24;
     }
 


@@ -12,17 +12,17 @@ module abstract-topology {
     contact "http://www.opendaylight.org/";
 
     description
     contact "http://www.opendaylight.org/";
 
     description

-        "This module contains the definitions of elements that creates network 
+        "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";
     }
     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";
     }
     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";
     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";


@@ -61,7 +61,7 @@ module abstract-topology {
                 description "The list of network nodes defined for topology.";
             }
         }
                 description "The list of network nodes defined for topology.";
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/abstract-topology@2013-02-08.yang b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/abstract-topology@2013-02-08.yang
index 249e1f60d3a785119d529e49443fcfd0026effbf..e95814653a397ad5b5554f384d75db488aa0b0b2 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/abstract-topology@2013-02-08.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/abstract-topology@2013-02-08.yang
@@ -6,7 +6,7 @@ module abstract-topology {
     revision "2013-02-08" {
         reference "http://www.opendaylight.org/";
     }
     revision "2013-02-08" {
         reference "http://www.opendaylight.org/";
     }

-    
+

     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";
     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";


@@ -22,13 +22,13 @@ module abstract-topology {
     }
 
     container topology {
     }
 
     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 
+        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 string;
         topology-id for reason that the store could contain many topologies.";
 
         leaf topology-id {
             type string;

-            description "It is presumed that datastore will contain many topologies. 
+            description "It is presumed that datastore will contain many topologies.

             To distinguish between topologies it is vital to have
             UNIQUE topology identifier.";
         }
             To distinguish between topologies it is vital to have
             UNIQUE topology identifier.";
         }


@@ -48,7 +48,7 @@ module abstract-topology {
                 description "The list of network nodes defined for topology.";
             }
         }
                 description "The list of network nodes defined for topology.";
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";


@@ -75,11 +75,11 @@ module abstract-topology {
                 container attributes {
                     description "Aditional attributes that can Network Link contains.";
                 }
                 container attributes {
                     description "Aditional attributes that can Network Link contains.";
                 }

-                description "The Network Link which is defined by Local (Source) and Remote (Destination) 
+                description "The Network Link which is defined by Local (Source) and Remote (Destination)

                 Network Nodes. Every link MUST be defined either by identifier and
                 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 
+                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.";
             }
         }
                 SHOULD have identifier.";
             }
         }

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-abstract-topology@2013-05-03.yang b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-abstract-topology@2013-05-03.yang
index 5d5eee706a2f341a2a47f2b82884a578cd99617f..3ab9abbb02f61020ce560176c77535e22ae04df7 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-abstract-topology@2013-05-03.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-abstract-topology@2013-05-03.yang
@@ -48,7 +48,7 @@ module augment-abstract-topology {
                 leaf tunnel-id {
                     type int32;
                 }
                 leaf tunnel-id {
                     type int32;
                 }

-                
+

                 container foo {
                     leaf bar {
                         type string;
                 container foo {
                     leaf bar {
                         type string;

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-network-link-attributes@2013-05-03.yang b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-network-link-attributes@2013-05-03.yang
index 2f0fe0fe978f1ad45035514ff0df40006b32bc1d..083fdd690d9021a7d1f5e3d6aea7a26f7ae1b22e 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-network-link-attributes@2013-05-03.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/augment-test-models/augment-network-link-attributes@2013-05-03.yang
@@ -17,13 +17,13 @@ module augment-network-link-attributes {
 
     augment "/at:topology/at:network-links/at:network-link/at:attributes" {
         leaf longitude {
 
     augment "/at:topology/at:network-links/at:network-link/at:attributes" {
         leaf longitude {

-            type decimal64 {    
+            type decimal64 {

                 fraction-digits 2;
             }
         }
 
         leaf latitude {
                 fraction-digits 2;
             }
         }
 
         leaf latitude {

-            type decimal64 {    
+            type decimal64 {

                 fraction-digits 2;
             }
         }
                 fraction-digits 2;
             }
         }

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union.yang b/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union.yang
index 6f762226336c4029efdbf278d38f49024cf9f0ac..0cab742b5156ac735c0273c1a8ae0997723943ca 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union.yang
@@ -21,10 +21,10 @@ module bit-and-union-in-leaf {
 
     typedef union-typedef2 {
         type union {
 
     typedef union-typedef2 {
         type union {

-            type string; 
+            type string;

             type int16;
         }
             type int16;
         }

-    }    
+    }

 
     container parent-container {
         leaf bit-leaf {
 
     container parent-container {
         leaf bit-leaf {


@@ -51,8 +51,8 @@ module bit-and-union-in-leaf {
                 type uint8;
             }
         }
                 type uint8;
             }
         }

-        
-// nested union in leaf   
+
+// nested union in leaf

         leaf lf {
             type union {
                                type string;
         leaf lf {
             type union {
                                type string;


@@ -63,28 +63,28 @@ module bit-and-union-in-leaf {
                                        type union {
                                                type string;
                                                type uint64;
                                        type union {
                                                type string;
                                                type uint64;

-                                       }       
+                                       }

                                }
                                }

-                       }               
-               }        
+                       }
+               }

     }
     }

-    

 
 
 
 

-// nested union in typedef     
+
+// nested union in typedef

        typedef type-union {
                type union {
                        type string;
                        type union {
                                type uint32;
                                type int8;
        typedef type-union {
                type union {
                        type string;
                        type union {
                                type uint32;
                                type int8;

-                               type string;    
+                               type string;

                                type union {
                                        type string;
                                        type uint64;
                                type union {
                                        type string;
                                        type uint64;

-                               }                               
+                               }

                        }
                        }

-               }       
-               
-       }    
+               }
+
+       }

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang b/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang
index 4146b1308112d4b93f83f81c69ef84e36b3c94d5..491c7149bec27006d0425090fb60f7cd6e092c35 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/bit_and_union_in_leaf.yang
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 module bit-and-union-in-leaf {
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 module bit-and-union-in-leaf {

-    
+

     namespace "urn:bit:union:in:leaf";
     prefix "sbd";
 
     namespace "urn:bit:union:in:leaf";
     prefix "sbd";
 


@@ -14,9 +14,9 @@ module bit-and-union-in-leaf {
     contact "http://www.opendaylight.org/";
 
     revision 2013-06-26 {
     contact "http://www.opendaylight.org/";
 
     revision 2013-06-26 {

-        
+

     }
     }

-    
+

     typedef union-typedef {
         type union {
             type string {
     typedef union-typedef {
         type union {
             type string {


@@ -25,14 +25,14 @@ module bit-and-union-in-leaf {
             type int16;
         }
     }
             type int16;
         }
     }

-    
+

     typedef union-typedef2 {
         type union {
     typedef union-typedef2 {
         type union {

-            type string; 
+            type string;

             type int16;
         }
             type int16;
         }

-    }    
-    
+    }
+

     container parent-container {
         leaf bit-leaf {
             type bits {
     container parent-container {
         leaf bit-leaf {
             type bits {


@@ -41,7 +41,7 @@ module bit-and-union-in-leaf {
                 bit third-bit;
             }
         }
                 bit third-bit;
             }
         }

-        
+

         leaf union-leaf {
             type union {
                 type int32;
         leaf union-leaf {
             type union {
                 type int32;

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang b/binding/mdsal-binding-generator-impl/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang
index 230b329c59698b7349d4fc3ca43e127ca587c5d3..9c7533867d1d13d0dcf0491c455074b05df25f16 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/choice-case-type-test-models/choice-monitoring@2013-07-01.yang
@@ -85,25 +85,25 @@ module choice-monitoring {
                       type tls-fingerprint-type;
                     }
                   }
                       type tls-fingerprint-type;
                     }
                   }

-                  
+

                   case sha224 {
                     leaf sha224 {
                       type tls-fingerprint-type;
                     }
                   }
                   case sha224 {
                     leaf sha224 {
                       type tls-fingerprint-type;
                     }
                   }

-                  
+

                   case sha256 {
                     leaf sha256 {
                       type tls-fingerprint-type;
                     }
                   }
                   case sha256 {
                     leaf sha256 {
                       type tls-fingerprint-type;
                     }
                   }

-                  
+

                   case sha384 {
                     leaf sha384 {
                       type tls-fingerprint-type;
                     }
                   case sha384 {
                     leaf sha384 {
                       type tls-fingerprint-type;
                     }

-                  }                
-                  
+                  }
+

                   case sha512 {
                     leaf sha512 {
                       type tls-fingerprint-type;
                   case sha512 {
                     leaf sha512 {
                       type tls-fingerprint-type;

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-network.yang b/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-network.yang
index 357e6bab0bbc0715bb7fd10a41c38997128d4217..9b9c448c06ad6cfec9d24ba299414c5e78129035 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-network.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-network.yang
@@ -2,16 +2,16 @@ module controller-network {
        yang-version 1;
        namespace "urn:opendaylight:controller:network";
        prefix "topos";
        yang-version 1;
        namespace "urn:opendaylight:controller:network";
        prefix "topos";

-       
+

        import ietf-inet-types { prefix "inet"; }
        import ietf-inet-types { prefix "inet"; }

-       
+

        revision 2013-05-20 {
           description "Initial demo";
        }
        revision 2013-05-20 {
           description "Initial demo";
        }

-       

 
 

-       
-       
+
+
+

        typedef topology-id {
                type string;
        }
        typedef topology-id {
                type string;
        }


@@ -56,7 +56,7 @@ module controller-network {
                description "This type is used for leafs that reference a link instance.";
                // currently not used
        }
                description "This type is used for leafs that reference a link instance.";
                // currently not used
        }

-       
+

        typedef network-element-ref {
                type leafref {
                        path "/network/network-elements/network-element/element-id";
        typedef network-element-ref {
                type leafref {
                        path "/network/network-elements/network-element/element-id";


@@ -67,7 +67,7 @@ module controller-network {
        typedef element-id {
                type string;
        }
        typedef element-id {
                type string;
        }

-       
+

        container network {
                container topologies {
                        list topology {
        container network {
                container topologies {
                        list topology {


@@ -79,7 +79,7 @@ module controller-network {
                                ";
                                key "topology-id";
                                leaf topology-id {
                                ";
                                key "topology-id";
                                leaf topology-id {

-                                       type topology-id; 
+                                       type topology-id;

                                        description "
                                                It is presumed that datastore will contain many topologies. To
                                                distinguish between topologies it is vital to have UNIQUE
                                        description "
                                                It is presumed that datastore will contain many topologies. To
                                                distinguish between topologies it is vital to have UNIQUE


@@ -90,7 +90,7 @@ module controller-network {
                                container types {
                                        description "
                                                The container for definition of topology types.
                                container types {
                                        description "
                                                The container for definition of topology types.

-                                               The augmenting modules should add empty optional leaf 
+                                               The augmenting modules should add empty optional leaf

                                                to this container to signalize topology type.
                                        ";
                                }
                                                to this container to signalize topology type.
                                        ";
                                }


@@ -108,7 +108,7 @@ module controller-network {
                                                leaf supporting-ne {
                                                        type network-element-ref;
                                                }
                                                leaf supporting-ne {
                                                        type network-element-ref;
                                                }

-                                               
+

                                                container termination-points {
                                                        list termination-point {
                                                                key "tp-id";
                                                container termination-points {
                                                        list termination-point {
                                                                key "tp-id";


@@ -119,7 +119,7 @@ module controller-network {
                                                }
                                        }
                                }
                                                }
                                        }
                                }

-               
+

                                container links {
                                        list link {
                                                description "
                                container links {
                                        list link {
                                                description "


@@ -133,11 +133,11 @@ module controller-network {
                                                        identifier.
                                                ";
                                                key "link-id";
                                                        identifier.
                                                ";
                                                key "link-id";

-               
+

                                                leaf link-id {
                                                        type link-id;
                                                }
                                                leaf link-id {
                                                        type link-id;
                                                }

-                                               container source { 
+                                               container source {

                                                        leaf source-node {
                                                                type node-ref;
                                                                description "Source node identifier.";
                                                        leaf source-node {
                                                                type node-ref;
                                                                description "Source node identifier.";


@@ -146,7 +146,7 @@ module controller-network {
                                                                type tp-ref;
                                                        }
                                                }
                                                                type tp-ref;
                                                        }
                                                }

-                                               container destination { 
+                                               container destination {

                                                        leaf dest-node {
                                                                type node-ref;
                                                                description "Destination node identifier.";
                                                        leaf dest-node {
                                                                type node-ref;
                                                                description "Destination node identifier.";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-openflow.yang b/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-openflow.yang
index f2cdd098084cf354c519fe07f08cb1fee1bb8b7b..b92c80971e759578d0bde25c57cb0f690fd5f627 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-openflow.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/controller-models/controller-openflow.yang
@@ -3,13 +3,13 @@ module controller-openflow {
     namespace "urn:opendaylight:controller:openflow";
     prefix "of";
     import controller-network {prefix cn;}
     namespace "urn:opendaylight:controller:openflow";
     prefix "of";
     import controller-network {prefix cn;}

-    
-    
+
+

     revision 2013-05-20 {
        description "Initial demo";
     }
 
     revision 2013-05-20 {
        description "Initial demo";
     }
 

-   
+

 
 
 
 
 
 


@@ -46,7 +46,7 @@ module controller-openflow {
             type datapath-id;
         }
     }
             type datapath-id;
         }
     }

-    
+

     augment "/cn:network/cn:network-elements/cn:network-element" {
         leaf datapath-id {
             type datapath-id;
     augment "/cn:network/cn:network-elements/cn:network-element" {
         leaf datapath-id {
             type datapath-id;


@@ -55,7 +55,7 @@ module controller-openflow {
         container ports {
             list port {
                 key "logical-port-id";
         container ports {
             list port {
                 key "logical-port-id";

-                
+

                 leaf logical-port-id {
                     type int32;
                 }
                 leaf logical-port-id {
                     type int32;
                 }

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/demo-topology.yang b/binding/mdsal-binding-generator-impl/src/test/resources/demo-topology.yang
index 4fef1cddd255fd2311237595ea4211b3f9be42a5..e34349559a4296836ed077b90688a8a791f40877 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/demo-topology.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/demo-topology.yang
@@ -7,7 +7,7 @@ module demo-topology {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-               This module contains the definitions of elements that creates network 
+               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.
                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.


@@ -44,19 +44,19 @@ module demo-topology {
                                type string;
                                description "The Topology identifier of network-node.";
                        }
                                type string;
                                description "The Topology identifier of network-node.";
                        }

-                
+

                 list network-interface {
                     key "interface-id";
                 list network-interface {
                     key "interface-id";

-                    
+

                     leaf interface-id {
                         type uint8;
                     }
                     leaf interface-id {
                         type uint8;
                     }

-                    
+

                     leaf interface-address {
                         type string;
                     }
                 }
                     leaf interface-address {
                         type string;
                     }
                 }

-                
+

                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.
                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.


@@ -78,7 +78,7 @@ module demo-topology {
                                }
                }
         }
                                }
                }
         }

-        
+

         container network-links {
                list network-link {
                    description "
         container network-links {
                list network-link {
                    description "

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/enum-test-models/abstract-topology@2013-02-08.yang b/binding/mdsal-binding-generator-impl/src/test/resources/enum-test-models/abstract-topology@2013-02-08.yang
index 80e23b95891f979cbf22995e0c4e9aa84c1d1969..a11cfb65c4f11aa3f7c2e040aac052c329922868 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/enum-test-models/abstract-topology@2013-02-08.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/enum-test-models/abstract-topology@2013-02-08.yang
@@ -12,17 +12,17 @@ module abstract-topology {
     contact "http://www.opendaylight.org/";
 
     description
     contact "http://www.opendaylight.org/";
 
     description

-        "This module contains the definitions of elements that creates network 
+        "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";
     }
     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";
     }
     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";
     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";


@@ -97,7 +97,7 @@ module abstract-topology {
                 }
             }
         }
                 }
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang b/binding/mdsal-binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang
index 04555c9c29b6f3f2b141809180c8f760a9ada68c..591001e7c2374cb91983c1cdcd82e36469ec9d2a 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/leafref-test-models/abstract-topology@2013-02-08.yang
@@ -17,17 +17,17 @@ module abstract-topology {
     contact "http://www.opendaylight.org/";
 
     description
     contact "http://www.opendaylight.org/";
 
     description

-        "This module contains the definitions of elements that creates network 
+        "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";
     }
     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";
     }
     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";
     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";


@@ -96,7 +96,7 @@ module abstract-topology {
                 }
             }
         }
                 }
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/list-composite-key.yang b/binding/mdsal-binding-generator-impl/src/test/resources/list-composite-key.yang
index 07e1dc7e49889fadfb70831e8b27c4351ff97310..617e76afff7a7c4b9cae280e90a6dc2a1afe01d6 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/list-composite-key.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/list-composite-key.yang
@@ -7,7 +7,7 @@ module list-composite-key {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.


@@ -25,33 +25,33 @@ module list-composite-key {
             leaf key1 {
                 type int8;
             }
             leaf key1 {
                 type int8;
             }

-            
+

             leaf key2 {
                 type string;
             }
             leaf key2 {
                 type string;
             }

-            
+

             list inner-list {
                 key "key1";
             list inner-list {
                 key "key1";

-                
+

                 leaf key1 {
                     type uint16;
                 }
                 leaf key1 {
                     type uint16;
                 }

-                
+

                 leaf foo {
                     type int32;
                 }
             }
                 leaf foo {
                     type int32;
                 }
             }

-            
+

             leaf foo {
                 type int32;
             }
         }
             leaf foo {
                 type int32;
             }
         }

-        
+

         list no-key-list {
             leaf foo {
                 type int32;
             }
         list no-key-list {
             leaf foo {
                 type int32;
             }

-            
+

             leaf bar {
                 type decimal64 {
                     fraction-digits 2;
             leaf bar {
                 type decimal64 {
                     fraction-digits 2;

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/bar.yang b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/bar.yang
index abf384c3ce6e28d3572f3b4b6664a1e78e06bb92..a067ad9939a6c479af1e123a15095e520b27b8a3 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/bar.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/bar.yang
@@ -7,4 +7,4 @@ module bar {
     action something;
   }
 }
     action something;
   }
 }

-  
+

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/foo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/foo.yang
index 02e8bc5f4b19690804386d9f18f292034c3c5c63..1659b4d9b5fda6ee44252b7d7cd854d89974e017 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/foo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal-516/foo.yang
@@ -15,4 +15,4 @@ module foo {
     uses foo-grp;
   }
 }
     uses foo-grp;
   }
 }

-  
+

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal600.yang b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal600.yang
index 3d008e19abd49c8c4541fe76dbc6a2c67b5284db..dc67d9d71db8e3c2553c7dffc5196246d2b56e82 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/mdsal600.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/mdsal600.yang
@@ -28,4 +28,4 @@ module mdsal600 {
     }
   }
 }
     }
   }
 }

- 
+

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/refine.yang b/binding/mdsal-binding-generator-impl/src/test/resources/refine.yang
index 11115f87c9b7815ec541b03922afe61bce46ae24..07a52330d0501f9e0290c02572d529437d5d2a36 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/refine.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/refine.yang
@@ -54,8 +54,8 @@ module module-refine {
             new-subnode-chc "some value from chc";
         }
         refine chc2 {
             new-subnode-chc "some value from chc";
         }
         refine chc2 {

-            mandatory "false"; 
-        }            
+            mandatory "false";
+        }

         refine data {
             mandatory "false";
             must "something-else = 9";
         refine data {
             mandatory "false";
             must "something-else = 9";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/simple-bits-demo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/simple-bits-demo.yang
index 160181bf56e94b931b8ae7882a8b0a0a40b27cd7..da71c8aa308271431d110d9dd508c77daaf7a8af 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/simple-bits-demo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/simple-bits-demo.yang
@@ -1,13 +1,13 @@
 module simple-bits-demo {
 module simple-bits-demo {

-    
+

     namespace "urn:simple:bits:demo";
     prefix "sbd";
 
     organization "OPEN DAYLIGHT";
     namespace "urn:simple:bits:demo";
     prefix "sbd";
 
     organization "OPEN DAYLIGHT";

-    contact "http://www.opendaylight.org/";    
+    contact "http://www.opendaylight.org/";

 
     revision 2013-06-11 {
 
     revision 2013-06-11 {

-        
+

     }
 
     typedef byte-type {
     }
 
     typedef byte-type {


@@ -23,19 +23,19 @@ module simple-bits-demo {
             }
             bit forth-bit {
                 position 40;
             }
             bit forth-bit {
                 position 40;

-            }       
+            }

             bit fifth-bit {
                 position 50;
             bit fifth-bit {
                 position 50;

-            }       
+            }

             bit sixth-bit {
                 position 60;
             bit sixth-bit {
                 position 60;

-            }       
+            }

             bit seventh-bit {
                 position 70;
             bit seventh-bit {
                 position 70;

-            }       
+            }

             bit eight-bit {
                 position 80;
             bit eight-bit {
                 position 80;

-            }       
+            }

         }
     }
 
         }
     }
 


@@ -43,12 +43,12 @@ module simple-bits-demo {
         type uint32;
     }
 
         type uint32;
     }
 

-    
+

     container leaf-parent-container {
         leaf byte-leaf {
             type byte-type;
         }
     container leaf-parent-container {
         leaf byte-leaf {
             type byte-type;
         }

-        
+

     }
 
 }
\ No newline at end of file
     }
 
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/simple-container-demo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/simple-container-demo.yang
index 3962274739280d88a93d9eeb74aa47070b0579a9..f1d1ca39f3449dc616dddd07b8b112ff0c71dae5 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/simple-container-demo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/simple-container-demo.yang
@@ -7,7 +7,7 @@ module simple-container-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang
index c0e77ef645a6767b4f8d0330e04ec67881cdd810..c25f3057c46509196344f8e4e2f96042d39cba26 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/simple-leaf-list-demo.yang
@@ -7,7 +7,7 @@ module simple-leaf-list-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/simple-list-demo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/simple-list-demo.yang
index 69f7f5cd30fd297d2d6224d802ecb34c70d32c1f..f34db4df0ca27fa4e73e29e0e7becb0d457cf25d 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/simple-list-demo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/simple-list-demo.yang
@@ -7,7 +7,7 @@ module simple-list-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.


@@ -25,25 +25,25 @@ module simple-list-demo {
                leaf list-key {
                        type int8;
                }
                leaf list-key {
                        type int8;
                }

-            
+

             container list-child-container {
                 leaf foo {
                     type uint8;
                 }
             }
             container list-child-container {
                 leaf foo {
                     type uint8;
                 }
             }

-            
+

                leaf foo {
                        type int32;
                }
                leaf foo {
                        type int32;
                }

-            
+

             leaf-list simple-leaf-list {
                 type int32;
             }
             leaf-list simple-leaf-list {
                 type int32;
             }

-            
+

                leaf bar {
                        type string;
                        config true;
                leaf bar {
                        type string;
                        config true;

-               }       
+               }

        }
     }
 }
\ No newline at end of file
        }
     }
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/simple-string-demo.yang b/binding/mdsal-binding-generator-impl/src/test/resources/simple-string-demo.yang
index 687d2a11dd62f8ebdd13cd648669989c13d5eef5..f71d733c700dca21573b037c3ef00773b98dfee9 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/simple-string-demo.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/simple-string-demo.yang
@@ -7,7 +7,7 @@ module simple-string-demo {
     contact "http://www.opendaylight.org/";
 
     revision 2013-06-18 {
     contact "http://www.opendaylight.org/";
 
     revision 2013-06-18 {

-        
+

     }
 
 
     }
 
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang b/binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang
index b8558b342615d58f97ce727e1ffb605451960260..eda6b697bc70555187ac8f48ea55a59300db4c24 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/typedef_of_typedef.yang
@@ -1,19 +1,19 @@
 module typedef_typedef {
 module typedef_typedef {

-    
+

     namespace "urn:typedef:typedef";
     prefix "sbd";
 
     import ietf-inet-types {
         prefix "inet";
         revision-date 2010-09-24;
     namespace "urn:typedef:typedef";
     prefix "sbd";
 
     import ietf-inet-types {
         prefix "inet";
         revision-date 2010-09-24;

-    }    
+    }

 
 
     organization "OPEN DAYLIGHT";
     contact "http://www.opendaylight.org/";
 
     revision 2013-07-09 {
 
 
     organization "OPEN DAYLIGHT";
     contact "http://www.opendaylight.org/";
 
     revision 2013-07-09 {

-        
+

     }
 
 
     }
 
 


@@ -31,9 +31,9 @@ module typedef_typedef {
                 position 20;
             }
          }
                 position 20;
             }
          }

-    }    
-    
-    
+    }
+
+

   typedef typedef-enum-fruit {
     type enumeration {
       enum "apple" {
   typedef typedef-enum-fruit {
     type enumeration {
       enum "apple" {


@@ -44,29 +44,29 @@ module typedef_typedef {
         value 2;
       }
     }
         value 2;
       }
     }

-  }    
-    
+  }
+

     typedef simple-typedef1 {
         type uint8;
     }
     typedef simple-typedef1 {
         type uint8;
     }

-    
+

     typedef simple-typedef2 {
         type simple-typedef1;
     }
     typedef simple-typedef2 {
         type simple-typedef1;
     }

-    
+

     typedef simple-typedef3 {
         type simple-typedef2;
     }
     typedef simple-typedef3 {
         type simple-typedef2;
     }

-    
+

     typedef simple-typedef4 {
         type simple-typedef3;
     }
     typedef simple-typedef4 {
         type simple-typedef3;
     }

-    
+

     typedef simple-typedef1-1 {
         type uint16;
     }
 
     typedef simple-typedef1-1 {
         type uint16;
     }
 

-    
+

     typedef union-typedef {
         type union {
             type simple-typedef1;
     typedef union-typedef {
         type union {
             type simple-typedef1;


@@ -75,16 +75,16 @@ module typedef_typedef {
             type typedef-enum-fruit;
         }
     }
             type typedef-enum-fruit;
         }
     }

-    
+

     typedef extended-typedef-union {
         type union-typedef;
     }
     typedef extended-typedef-union {
         type union-typedef;
     }

-    
-    
+
+

     typedef extended-typedef-simple {
         type simple-typedef1;
     }
     typedef extended-typedef-simple {
         type simple-typedef1;
     }

-    
+

     typedef extended-typedef-enum {
         type typedef-enum-fruit;
     }
     typedef extended-typedef-enum {
         type typedef-enum-fruit;
     }

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/union-test-models/abstract-topology.yang b/binding/mdsal-binding-generator-impl/src/test/resources/union-test-models/abstract-topology.yang
index a4b589be8254385048d44e6779399448cee0d659..b63b627d20b7f2f6131f0c53cf61a37f6831b7e2 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/union-test-models/abstract-topology.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/union-test-models/abstract-topology.yang
@@ -3,8 +3,8 @@ module abstract-topology {
     namespace "urn:model:abstract:topology";
     prefix "tp";
 
     namespace "urn:model:abstract:topology";
     prefix "tp";
 

-    import ietf-inet-types { 
-        prefix "inet"; 
+    import ietf-inet-types {
+        prefix "inet";

         revision-date 2010-09-24;
     }
 
         revision-date 2010-09-24;
     }
 


@@ -12,13 +12,13 @@ module abstract-topology {
     contact "http://www.opendaylight.org/";
 
     description
     contact "http://www.opendaylight.org/";
 
     description

-        "This module contains the definitions of elements that creates network 
+        "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";
     }
     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";
     }
     revision "2013-01-01" {
         reference "~~~ WILL BE DEFINED LATER";
     }


@@ -81,7 +81,7 @@ module abstract-topology {
                 description "The list of network nodes defined for topology.";
             }
         }
                 description "The list of network nodes defined for topology.";
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping.yang
index 36913cd40de7832f08072a672dc8a673924523fe..e5cf77e1d7186e47a0469a4e6aa8cdc019c866b9 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping.yang
@@ -10,7 +10,7 @@ module grouping_uses {
     }
 
 
     }
 
 

-  
+

     grouping grouping-modul-test {
         leaf leaf-grouping-modul-test {
             type string;
     grouping grouping-modul-test {
         leaf leaf-grouping-modul-test {
             type string;


@@ -32,7 +32,7 @@ module grouping_uses {
     grouping grouping-case-test {
         leaf leaf-grouping-case-test1 {
             type string;
     grouping grouping-case-test {
         leaf leaf-grouping-case-test1 {
             type string;

-        }     
+        }

     }
 
     grouping grouping-choice-test {
     }
 
     grouping grouping-choice-test {


@@ -49,7 +49,7 @@ module grouping_uses {
             }
         }
     }
             }
         }
     }

- 
+

     grouping grouping-list-test {
         leaf leaf-grouping-list-test {
             type string;
     grouping grouping-list-test {
         leaf leaf-grouping-list-test {
             type string;


@@ -67,7 +67,7 @@ module grouping_uses {
         leaf-list leaflist-grouping-list-test {
             type string;
         }
         leaf-list leaflist-grouping-list-test {
             type string;
         }

-    }     
+    }

 
     grouping grouping-grouping-test {
         leaf leaf-grouping-grouping {
 
     grouping grouping-grouping-test {
         leaf leaf-grouping-grouping {


@@ -85,13 +85,13 @@ module grouping_uses {
             type uint8;
         }
     }
             type uint8;
         }
     }

-    
+

     grouping grouping-rpc-output-test {
         leaf leaf-grouping-rpc-output-test {
             type int8;
         }
     }
     grouping grouping-rpc-output-test {
         leaf leaf-grouping-rpc-output-test {
             type int8;
         }
     }

-     
+

 //grouping in GROUPING
     grouping grouping-atest {
         leaf leaf-grouping-test {
 //grouping in GROUPING
     grouping grouping-atest {
         leaf leaf-grouping-test {


@@ -99,8 +99,8 @@ module grouping_uses {
         }
         uses grouping-grouping-test;
     }
         }
         uses grouping-grouping-test;
     }

-    
-//grouping in MODUL     
+
+//grouping in MODUL

 //     uses grouping-modul-test;
 
 //grouping in RPC
 //     uses grouping-modul-test;
 
 //grouping in RPC


@@ -111,7 +111,7 @@ module grouping_uses {
             output {
                 uses grouping-rpc-output-test;
             }
             output {
                 uses grouping-rpc-output-test;
             }

-        }     
+        }

 
 //grouping in CONTAINER
     container container-test {
 
 //grouping in CONTAINER
     container container-test {


@@ -121,7 +121,7 @@ module grouping_uses {
         uses grouping-container-test;
     }
 
         uses grouping-container-test;
     }
 

-//grouping in CASE     
+//grouping in CASE

     container container-with-choicetest {
         choice choice-test {
             case a {
     container container-with-choicetest {
         choice choice-test {
             case a {


@@ -129,17 +129,17 @@ module grouping_uses {
                     type string;
                 }
             }
                     type string;
                 }
             }

-            case c {                 
-                uses grouping-case-test;                 
+            case c {
+                uses grouping-case-test;

             }
             }

-        }     
-    }  
- 
-//grouping in LIST     
+        }
+    }
+
+//grouping in LIST

     list list-test {
         leaf list-leaf-test {
             type string;
         }
         uses grouping-list-test;
     list list-test {
         leaf list-leaf-test {
             type string;
         }
         uses grouping-list-test;

-    }   
+    }

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-augment.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-augment.yang
index 0b999115be58ff80de81db7e828e961f2a39eb35..c6c22422f53b0c117c593fd83255fbe2387dd59c 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-augment.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-augment.yang
@@ -1,5 +1,5 @@
 module grouping_uses_augment {
 module grouping_uses_augment {

-    
+

     namespace "urn:grouping:uses:augment";
     prefix "sbd";
 
     namespace "urn:grouping:uses:augment";
     prefix "sbd";
 


@@ -14,7 +14,7 @@ module grouping_uses_augment {
             type string;
         }
     }
             type string;
         }
     }

-    
+

 
     container container-augment {
         leaf leaf-container-augment1 {
 
     container container-augment {
         leaf leaf-container-augment1 {


@@ -23,9 +23,9 @@ module grouping_uses_augment {
         leaf leaf-container-augment2 {
             type int64;
         }
         leaf leaf-container-augment2 {
             type int64;
         }

-    }         
-    
+    }
+

     augment "/container-augment" {
     augment "/container-augment" {

-        uses grouping-augment-test;        
+        uses grouping-augment-test;

     }
 }
\ No newline at end of file
     }
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-container.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-container.yang
index 77b8c00a1886f49e9bfb44a3951543d70f0f4bfd..a52672be7103fad45e1cc67fc6cf549d6f40fac7 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-container.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-container.yang
@@ -1,5 +1,5 @@
 module grouping_uses_container {
 module grouping_uses_container {

-    
+

     namespace "urn:grouping:uses:container";
     prefix "sbd";
 
     namespace "urn:grouping:uses:container";
     prefix "sbd";
 


@@ -8,7 +8,7 @@ module grouping_uses_container {
 
     revision 2013-07-18 {
     }
 
     revision 2013-07-18 {
     }

-    
+

     grouping grouping-container-test {
         leaf leaf-grouping-container-test1 {
             type string;
     grouping grouping-container-test {
         leaf leaf-grouping-container-test1 {
             type string;


@@ -17,7 +17,7 @@ module grouping_uses_container {
             type uint8;
         }
     }
             type uint8;
         }
     }

-    
+

 //grouping in CONTAINER
     container container-test {
         leaf container-leaf-test {
 //grouping in CONTAINER
     container container-test {
         leaf container-leaf-test {

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-dependencies.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-dependencies.yang
index ef6efb5a8fe97080460712139c28ee0ad7ff747d..9c36bac2eabdf6d3e9636041cb884810dc7236b8 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-dependencies.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-dependencies.yang
@@ -1,5 +1,5 @@
 module grouping_dependencies {
 module grouping_dependencies {

-    
+

     namespace "urn:grouping:dependencies";
     prefix "sbd";
 
     namespace "urn:grouping:dependencies";
     prefix "sbd";
 


@@ -8,7 +8,7 @@ module grouping_dependencies {
 
     revision 2013-07-18 {
     }
 
     revision 2013-07-18 {
     }

-  
+

     grouping grouping-U {
         leaf leaf-grouping-U {
             type string;
     grouping grouping-U {
         leaf leaf-grouping-U {
             type string;


@@ -37,16 +37,16 @@ module grouping_dependencies {
             type string;
         }
     }
             type string;
         }
     }

-    
+

     grouping grouping-Z {
         leaf leaf-grouping-Z {
             type string;
         }
     }
     grouping grouping-Z {
         leaf leaf-grouping-Z {
             type string;
         }
     }

-    
+

     grouping grouping-ZZ {
         leaf leaf-grouping-ZZ {
             type string;
         }
     grouping grouping-ZZ {
         leaf leaf-grouping-ZZ {
             type string;
         }

-    }    
+    }

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-grouping.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-grouping.yang
index 3c68cd7a43ac6efbb5f90e944ef4e521daafe758..2bebe8edf1edd3b33d7c45d3f82dfc990c747c41 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-grouping.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-grouping.yang
@@ -1,5 +1,5 @@
 module grouping_uses_grouping {
 module grouping_uses_grouping {

-    
+

     namespace "urn:grouping:uses:grouping";
     prefix "sbd";
 
     namespace "urn:grouping:uses:grouping";
     prefix "sbd";
 


@@ -14,7 +14,7 @@ module grouping_uses_grouping {
             type string;
         }
     }
             type string;
         }
     }

-     
+

 
 //grouping in GROUPING
     grouping grouping-test {
 
 //grouping in GROUPING
     grouping grouping-test {


@@ -23,5 +23,5 @@ module grouping_uses_grouping {
         }
         uses grouping-grouping-test;
     }
         }
         uses grouping-grouping-test;
     }

-    
+

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-list.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-list.yang
index 420d3369a49359274425d3d1f16a1e974fdd7821..2dd3229ce6d01e21b1d62c5a4975b1cffc1679bd 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-list.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-list.yang
@@ -1,5 +1,5 @@
 module grouping_uses_list {
 module grouping_uses_list {

-    
+

     namespace "urn:grouping:uses:list";
     prefix "sbd";
 
     namespace "urn:grouping:uses:list";
     prefix "sbd";
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-modul.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-modul.yang
index 4dc6b17daa0db1b69cb2d864406d374cdb0cb572..b4179a5611a8f24c0c4bf13584645969043a18f1 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-modul.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-modul.yang
@@ -17,7 +17,7 @@ module grouping_uses_modul {
             type uint8;
         }
     }
             type uint8;
         }
     }

-    
-//grouping in MODUL     
+
+//grouping in MODUL

     uses grouping-modul-test;
 }
\ No newline at end of file
     uses grouping-modul-test;
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-notification.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-notification.yang
index e3caf2a76127c4caac2de37f30826f077af3f806..e4f8ee1116770a3f76b8808c93683d0246867076 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-notification.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-notification.yang
@@ -1,5 +1,5 @@
 module grouping_uses_notification {
 module grouping_uses_notification {

-    
+

     namespace "urn:grouping:uses:notification";
     prefix "sbd";
 
     namespace "urn:grouping:uses:notification";
     prefix "sbd";
 

diff --git a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-rpc.yang b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-rpc.yang
index 81f3b3c299bd3bc164aafe5835739c8ac9555501..22b159ef253815bbb19a83e7c1208fd4f17376dd 100644 (file)
--- a/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-rpc.yang
+++ b/binding/mdsal-binding-generator-impl/src/test/resources/uses-of-grouping/uses-of-grouping-rpc.yang
@@ -1,5 +1,5 @@
 module grouping_uses_rpc {
 module grouping_uses_rpc {

-    
+

     namespace "urn:grouping:uses:rpc";
     prefix "sbd";
 
     namespace "urn:grouping:uses:rpc";
     prefix "sbd";
 


@@ -9,7 +9,7 @@ module grouping_uses_rpc {
     revision 2013-07-18 {
     }
 
     revision 2013-07-18 {
     }
 

-     
+

 
     grouping grouping-rpc-input-test {
         container container-grouping-rpc-input-test {
 
     grouping grouping-rpc-input-test {
         container container-grouping-rpc-input-test {


@@ -21,7 +21,7 @@ module grouping_uses_rpc {
             type uint8;
         }
     }
             type uint8;
         }
     }

-    
+

     grouping grouping-rpc-output-test {
         leaf leaf-grouping-rpc-output-test {
             type int8;
     grouping grouping-rpc-output-test {
         leaf leaf-grouping-rpc-output-test {
             type int8;

diff --git a/binding/mdsal-binding-generator-util/src/test/resources/module.yang b/binding/mdsal-binding-generator-util/src/test/resources/module.yang
index 928efa6f575fb7991604f1626561f50ec3286d6f..511b6bd90be0a910f284ac102634dfb00c6f3543 100644 (file)
--- a/binding/mdsal-binding-generator-util/src/test/resources/module.yang
+++ b/binding/mdsal-binding-generator-util/src/test/resources/module.yang
@@ -8,15 +8,15 @@ module module-name-test {
 
     revision 2013-09-10 {
     }
 
     revision 2013-09-10 {
     }

-    
+

     typedef tpdf {
        type string;
     }
     typedef tpdf {
        type string;
     }

-    
+

     container cont-outter {
        container cont-inner {
     container cont-outter {
        container cont-inner {

-       }    
+       }

     }
     }

-    
-    
+
+

 }
\ No newline at end of file
 }
\ No newline at end of file

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/abstract-topology.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/abstract-topology.yang
index 29e3603465cfe28a63cbed55c9456af5085e4afd..132977e971807fa17919db5a0b89ad1a3f606f60 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/abstract-topology.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/abstract-topology.yang
@@ -13,12 +13,12 @@ module abstract-topology {
 
        import ietf-inet-types { prefix "inet"; }
     import abstract-prefixes { prefix "abs-pref"; }
 
        import ietf-inet-types { prefix "inet"; }
     import abstract-prefixes { prefix "abs-pref"; }

-    
+

        organization "OPEN DAYLIGHT";
     contact "http://www.opendaylight.org/";
 
     description "
        organization "OPEN DAYLIGHT";
     contact "http://www.opendaylight.org/";
 
     description "

-               This module contains the definitions of elements that creates network 
+               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.
                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.


@@ -31,7 +31,7 @@ module abstract-topology {
     revision "2013-03-08" {
         reference " WILL BE DEFINED LATER";
     }
     revision "2013-03-08" {
         reference " WILL BE DEFINED LATER";
     }

-    
+

     revision "2012-02-08" {
         reference " WILL BE DEFINED LATER";
     }
     revision "2012-02-08" {
         reference " WILL BE DEFINED LATER";
     }


@@ -92,7 +92,7 @@ module abstract-topology {
                                }
                }
         }
                                }
                }
         }

-        
+

         container network-links {
                list network-link {
                    description "
         container network-links {
                list network-link {
                    description "

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/bar.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/bar.yang
index 069fbe1619b75d5be2d0ccd3b01e9bf4118bd00f..6696d231421de9ace9ae4aebe66762c5008dd518 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/bar.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/bar.yang
@@ -9,7 +9,7 @@ module bar {
     yang-version 1;
     namespace "urn:opendaylight.bar";
     prefix "bar";
     yang-version 1;
     namespace "urn:opendaylight.bar";
     prefix "bar";

-       
+

        description "bar - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 
        description "bar - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 


@@ -19,11 +19,11 @@ module bar {
     container network-topology {
                description "network-topology - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
     container network-topology {
                description "network-topology - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";

-               
+

         list topology {
                        description "topology - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
         list topology {
                        description "topology - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";

-                       
+

             key "topology-id";
             leaf topology-id {
                                description "topology-id - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
             key "topology-id";
             leaf topology-id {
                                description "topology-id - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";


@@ -50,11 +50,11 @@ module bar {
             type int8;
         }
     }
             type int8;
         }
     }

-       
+

        leaf inclusion-rulez {
                description "Specified rulez description.";
                reference "RFC 6020 http://technet.com";
        leaf inclusion-rulez {
                description "Specified rulez description.";
                reference "RFC 6020 http://technet.com";

-               
+

                type string;
        }
 
                type string;
        }
 


@@ -64,14 +64,14 @@ module bar {
 
         type enumeration {
             enum include {
 
         type enumeration {
             enum include {

-                description 
-                    "This label will be included normally in the 
+                description
+                    "This label will be included normally in the

                      matching. This seems to be a little bit longer comment. I hear you very weel my darling.
                                         Network topology is the arrangement of the various elements (links, nodes, etc.) of any other builder nodes types.";
             }
             enum exclude {
                      matching. This seems to be a little bit longer comment. I hear you very weel my darling.
                                         Network topology is the arrangement of the various elements (links, nodes, etc.) of any other builder nodes types.";
             }
             enum exclude {

-                description 
-                    "This label will be excluded from the 
+                description
+                    "This label will be excluded from the

                     matching.  This allows removing labels that
                     would have otherwise been included because of
                     inheritence rules.";
                     matching.  This allows removing labels that
                     would have otherwise been included because of
                     inheritence rules.";

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/baz.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/baz.yang
index 4bdc209aa7b6f7afde77d393e203c67c4e740068..917e0629b34c7210dd19c269cd17de299bff6b08 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/baz.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/baz.yang
@@ -19,7 +19,7 @@ module baz {
         prefix "br";
         revision-date 2013-10-08;
     }
         prefix "br";
         revision-date 2013-10-08;
     }

-       
+

        description "Baz - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 
        description "Baz - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 


@@ -39,7 +39,7 @@ module baz {
             leaf multi-topology-id {
                                description "Multi-topology-id - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
             leaf multi-topology-id {
                                description "Multi-topology-id - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";

-                               
+

                 type uint8 {
                     range "0..127";
                 }
                 type uint8 {
                     range "0..127";
                 }

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/foo.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/foo.yang
index 5fa313eaec10986959da870b3f6c948d5c4b9660..ded5fda85acd20499aab4456f702a2f35f80fed8 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/foo.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/compilation/augment-uses-to-augment/foo.yang
@@ -14,7 +14,7 @@ module foo {
         prefix "br";
         revision-date 2013-10-08;
     }
         prefix "br";
         revision-date 2013-10-08;
     }

-       
+

        description "Foo - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 
        description "Foo - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
 


@@ -30,7 +30,7 @@ module foo {
         container igp-link-attributes {
                        description "Igp-link-attributes - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
         container igp-link-attributes {
                        description "Igp-link-attributes - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                        reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";

-               
+

             leaf name {
                                description "Name - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";
             leaf name {
                                description "Name - Network topology is the arrangement of the various elements (links, nodes, etc.) of a computer network.[1][2] Essentially, it is the topological[3] structure of a network, and may be depicted physically or logically. Physical topology is the placement of the various components of a network, including device location and cable installation, while logical topology illustrates how data flows within a network, regardless of its physical design. Distances between nodes, physical interconnections, transmission rates, or signal types may differ between two networks, yet their topologies may be identical.";
                                reference "RFC 6020 - http://tools.ietf.org/html/rfc6020";

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/demo-topology.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/demo-topology.yang
index c2178249bc248c43c0962887eefd31acd5b8bc25..9dddb00fda080274e963097f53c7c1f7783d28e2 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/demo-topology.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/demo-topology.yang
@@ -14,7 +14,7 @@ module demo-topology {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-               This module contains the definitions of elements that creates network 
+               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.
                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.


@@ -51,19 +51,19 @@ module demo-topology {
                                type string;
                                description "The Topology identifier of network-node.";
                        }
                                type string;
                                description "The Topology identifier of network-node.";
                        }

-                
+

                 list network-interface {
                     key "interface-id";
                 list network-interface {
                     key "interface-id";

-                    
+

                     leaf interface-id {
                         type uint8;
                     }
                     leaf interface-id {
                         type uint8;
                     }

-                    
+

                     leaf interface-address {
                         type string;
                     }
                 }
                     leaf interface-address {
                         type string;
                     }
                 }

-                
+

                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.
                    container node-attributes {
                                        description "
                                                Additional attributes that can Network Node contains.


@@ -85,7 +85,7 @@ module demo-topology {
                                }
                }
         }
                                }
                }
         }

-        
+

         container network-links {
                list network-link {
                    description "
         container network-links {
                list network-link {
                    description "

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/list-composite-key.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/list-composite-key.yang
index fd3f66b593be789d4e74be1561d890794ceaa583..c9ff5a65c378624c570a727e1d316891808e6bc4 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/list-composite-key.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/list-composite-key.yang
@@ -14,7 +14,7 @@ module list-composite-key {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.


@@ -32,33 +32,33 @@ module list-composite-key {
             leaf key1 {
                 type int8;
             }
             leaf key1 {
                 type int8;
             }

-            
+

             leaf key2 {
                 type string;
             }
             leaf key2 {
                 type string;
             }

-            
+

             list inner-list {
                 key "key1";
             list inner-list {
                 key "key1";

-                
+

                 leaf key1 {
                     type uint16;
                 }
                 leaf key1 {
                     type uint16;
                 }

-                
+

                 leaf foo {
                     type int32;
                 }
             }
                 leaf foo {
                     type int32;
                 }
             }

-            
+

             leaf foo {
                 type int32;
             }
         }
             leaf foo {
                 type int32;
             }
         }

-        
+

         list no-key-list {
             leaf foo {
                 type int32;
             }
         list no-key-list {
             leaf foo {
                 type int32;
             }

-            
+

             leaf bar {
                 type decimal64 {
                     fraction-digits 2;
             leaf bar {
                 type decimal64 {
                     fraction-digits 2;

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-container-demo.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-container-demo.yang
index 1d854bb2fb2c73acc84c9cc10bfb333fa918e34f..ef592c66bf3b31b4abcc59a020f7bdb7b4907ac1 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-container-demo.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-container-demo.yang
@@ -14,7 +14,7 @@ module simple-container-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang
index f5d83453c5fe876242623e21cf7fdfb4d6aa1e96..7fc336285a324dbeaf2b31ba3f33cd9afd1fb4af 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-leaf-list-demo.yang
@@ -14,7 +14,7 @@ module simple-leaf-list-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-list-demo.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-list-demo.yang
index c8f7f36b8f9baadf5f3b7f1140e61218d8fa213f..93ac156e20b8d00ba164ab9429dc69753aefc37f 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/simple-list-demo.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/simple-list-demo.yang
@@ -14,7 +14,7 @@ module simple-list-demo {
     contact "http://www.opendaylight.org/";
 
     description "
     contact "http://www.opendaylight.org/";
 
     description "

-        This module contains the definitions of elements that creates network 
+        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.
         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.


@@ -32,25 +32,25 @@ module simple-list-demo {
                leaf list-key {
                        type int8;
                }
                leaf list-key {
                        type int8;
                }

-            
+

             container list-child-container {
                 leaf foo {
                     type uint8;
                 }
             }
             container list-child-container {
                 leaf foo {
                     type uint8;
                 }
             }

-            
+

                leaf foo {
                        type int32;
                }
                leaf foo {
                        type int32;
                }

-            
+

             leaf-list simple-leaf-list {
                 type int32;
             }
             leaf-list simple-leaf-list {
                 type int32;
             }

-            
+

                leaf bar {
                        type string;
                        config true;
                leaf bar {
                        type string;
                        config true;

-               }       
+               }

        }
     }
 }
        }
     }
 }

diff --git a/binding/mdsal-binding-java-api-generator/src/test/resources/yang/abstract-topology@2013-02-08.yang b/binding/mdsal-binding-java-api-generator/src/test/resources/yang/abstract-topology@2013-02-08.yang
index af27745902e3b2c3cfee3a34adbb29013e4dcb68..c84581feef4fca5ff98d61e921e2bb74b0e37905 100644 (file)
--- a/binding/mdsal-binding-java-api-generator/src/test/resources/yang/abstract-topology@2013-02-08.yang
+++ b/binding/mdsal-binding-java-api-generator/src/test/resources/yang/abstract-topology@2013-02-08.yang
@@ -24,17 +24,17 @@ module abstract-topology {
     contact "WILL-BE-DEFINED-LATER";
 
     description
     contact "WILL-BE-DEFINED-LATER";
 
     description

-        "This module contains the definitions of elements that creates network 
+        "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";
     }
     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";
     }
     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";
     typedef node-id-ref {
         type leafref {
             path "/tp:topology/tp:network-nodes/tp:network-node/tp:node-id";


@@ -97,7 +97,7 @@ module abstract-topology {
                 }
             }
         }
                 }
             }
         }

-        
+

         container network-links {
             list network-link {
                 key "link-id";
         container network-links {
             list network-link {
                 key "link-id";


@@ -145,16 +145,16 @@ module abstract-topology {
             }
         }
     }
             }
         }
     }

-    
+

     identity crypto-base {
         description "crypto-base description";
     }
     identity crypto-base {
         description "crypto-base description";
     }

-    
+

     identity crypto-alg {
         base crypto-base;
         description "crypto-alg description";
     }
     identity crypto-alg {
         base crypto-base;
         description "crypto-alg description";
     }

-    
+

     grouping target {
         container nodes {
             leaf source {
     grouping target {
         container nodes {
             leaf source {


@@ -168,11 +168,11 @@ module abstract-topology {
             type string;
         }
     }
             type string;
         }
     }

-    
+

     leaf idreftest {
         type identityref {
             base crypto-alg;
         }
     }
     leaf idreftest {
         type identityref {
             base crypto-alg;
         }
     }

-    
+

 }
 }

diff --git a/binding/mdsal-binding-test-model/src/main/yang/bug5446.yang b/binding/mdsal-binding-test-model/src/main/yang/bug5446.yang
index e0f18a64375db5d48dc1068609903bb0ab742772..73d02b917c748ad9b5e76f2eac5d9364a37b7321 100644 (file)
--- a/binding/mdsal-binding-test-model/src/main/yang/bug5446.yang
+++ b/binding/mdsal-binding-test-model/src/main/yang/bug5446.yang
@@ -24,7 +24,7 @@ module bug5446 {
             type ipv6-address-binary;
         }
     }
             type ipv6-address-binary;
         }
     }

-    
+

     container root {
         leaf ip-address {
             type ip-address-binary;
     container root {
         leaf ip-address {
             type ip-address-binary;

diff --git a/binding/mdsal-binding-test-model/src/main/yang/mdsal600.yang b/binding/mdsal-binding-test-model/src/main/yang/mdsal600.yang
index 3d008e19abd49c8c4541fe76dbc6a2c67b5284db..dc67d9d71db8e3c2553c7dffc5196246d2b56e82 100644 (file)
--- a/binding/mdsal-binding-test-model/src/main/yang/mdsal600.yang
+++ b/binding/mdsal-binding-test-model/src/main/yang/mdsal600.yang
@@ -28,4 +28,4 @@ module mdsal600 {
     }
   }
 }
     }
   }
 }

- 
+

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-routed-rpc.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-routed-rpc.yang
index c3a982473c72a9a5e3a0b98a5d97b5756b1b1da6..f509495bb0a232909e4dcf710f275d1d004b358f 100644 (file)
--- a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-routed-rpc.yang
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-routed-rpc.yang
@@ -5,7 +5,7 @@ module opendaylight-test-routed-rpc {
     import yang-ext { prefix ext; }
 
     description
     import yang-ext { prefix ext; }
 
     description

-        "Test model for testing of registering rpc service on binding independent mount point 
+        "Test model for testing of registering rpc service on binding independent mount point

         and retrieving rpc service via binding aware mount point.";
 
     revision "2014-07-01" {
         and retrieving rpc service via binding aware mount point.";
 
     revision "2014-07-01" {


@@ -16,18 +16,18 @@ module opendaylight-test-routed-rpc {
     identity test-context {
         description "Test Context";
     }
     identity test-context {
         description "Test Context";
     }

-    
+

     typedef encapsulated-route {
         type instance-identifier;
     }
     typedef encapsulated-route {
         type instance-identifier;
     }

-    
+

     grouping route-in-grouping {
         leaf route {
             type instance-identifier;
             ext:context-reference test-context;
         }
     }
     grouping route-in-grouping {
         leaf route {
             type instance-identifier;
             ext:context-reference test-context;
         }
     }

-    
+

     grouping encapsulated-route-in-grouping {
         leaf route {
             type encapsulated-route;
     grouping encapsulated-route-in-grouping {
         leaf route {
             type encapsulated-route;

diff --git a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-rpc-service.yang b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-rpc-service.yang
index 3412eb531a52ae9cf91720d322a3ce5bd92a047e..7e5dc702a9172299551dc6077501d48245b651bf 100644 (file)
--- a/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-rpc-service.yang
+++ b/binding/mdsal-binding-test-model/src/main/yang/opendaylight-test-rpc-service.yang
@@ -4,7 +4,7 @@ module opendaylight-test-rpc-service {
     prefix "rpc";
 
     description
     prefix "rpc";
 
     description

-        "Test model for testing of registering rpc service on binding independent mount point 
+        "Test model for testing of registering rpc service on binding independent mount point

         and retrieving rpc service via binding aware mount point.";
 
     revision "2014-07-01" {
         and retrieving rpc service via binding aware mount point.";
 
     revision "2014-07-01" {

diff --git a/dom/mdsal-dom-inmemory-datastore-benchmark/src/main/resources/odl-datastore-test.yang b/dom/mdsal-dom-inmemory-datastore-benchmark/src/main/resources/odl-datastore-test.yang
index 730ca1717394192afc233787df74f3e38faa68af..85421c3914c41a9f1ae44e6948a7cd9101a733a7 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore-benchmark/src/main/resources/odl-datastore-test.yang
+++ b/dom/mdsal-dom-inmemory-datastore-benchmark/src/main/resources/odl-datastore-test.yang
@@ -2,7 +2,7 @@ module odl-datastore-test {
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test";
     prefix "store-test";
     yang-version 1;
     namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:store:test";
     prefix "store-test";

-    
+

     revision "2014-03-13" {
         description "Initial revision.";
     }
     revision "2014-03-13" {
         description "Initial revision.";
     }

diff --git a/model/general-entity/src/main/yang/odl-general-entity.yang b/model/general-entity/src/main/yang/odl-general-entity.yang
index 9a68ebf29b4911d2a23037f8af5b9c54aa135e4d..27e77c7b4992e7e1314538b17a926058886c57ef 100644 (file)
--- a/model/general-entity/src/main/yang/odl-general-entity.yang
+++ b/model/general-entity/src/main/yang/odl-general-entity.yang
@@ -3,7 +3,7 @@ module odl-general-entity {
     prefix "odl-general-entity";
 
     description "Defines a model to describe a general entity whose path can be used as an ID for an entity that isn't otherwise modelled";
     prefix "odl-general-entity";
 
     description "Defines a model to describe a general entity whose path can be used as an ID for an entity that isn't otherwise modelled";

-    
+

     revision 2015-09-30 {
         description "Initial revision";
     }
     revision 2015-09-30 {
         description "Initial revision";
     }

diff --git a/model/l2-types/src/main/yang/opendaylight-l2-types.yang b/model/l2-types/src/main/yang/opendaylight-l2-types.yang
index 73bac435354794a811d2e6dd56853c1ea429341a..62bc7573096cc8a65c003ec3cb3f1522a91313df 100644 (file)
--- a/model/l2-types/src/main/yang/opendaylight-l2-types.yang
+++ b/model/l2-types/src/main/yang/opendaylight-l2-types.yang
@@ -1,44 +1,43 @@
 module opendaylight-l2-types {
 module opendaylight-l2-types {

-       namespace "urn:opendaylight:l2:types";
-       prefix "ethertype";
-
-       description 
-               "Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
-
-               This program and the accompanying materials are made available under the
-               terms of the Eclipse Public License v1.0 which accompanies this distribution,
-               and is available at http://www.eclipse.org/legal/epl-v10.html";
-
-       revision "2013-08-27" {
-               description "Initial revision";
-       }
-
-       typedef vlan-pcp {
-               description 
-                       "IEEE 802.1p priority. It indicates the frame priority level. 
-                        Values are from 0 (best effort) to 7 (highest); 
-                        1 represents the lowest priority.";
-               type uint8 {
-                       range "0..7";
-               }
-       }
-
-       typedef vlan-dei {
-               description 
-                       "Drop Eligible Indicator (DEI): a 1-bit field. (formerly CFI). 
-                        May be used separately or in conjunction with PCP to indicate frames 
-                        eligible to be dropped in the presence of congestion.";
-               type boolean;
-       }
-
-       typedef vlan-id {
-               type uint16 {
-                       range "0..4095";
-               }
-       }
-
-
-       typedef ether-type {
-               type uint32;
-       }
+    namespace "urn:opendaylight:l2:types";
+    prefix "ethertype";
+
+    description
+        "Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+
+         This program and the accompanying materials are made available under the
+         terms of the Eclipse Public License v1.0 which accompanies this distribution,
+         and is available at http://www.eclipse.org/legal/epl-v10.html";
+
+    revision "2013-08-27" {
+        description "Initial revision";
+    }
+
+    typedef vlan-pcp {
+        description
+            "IEEE 802.1p priority. It indicates the frame priority level.
+             Values are from 0 (best effort) to 7 (highest);
+             1 represents the lowest priority.";
+        type uint8 {
+            range "0..7";
+        }
+    }
+
+    typedef vlan-dei {
+        description
+            "Drop Eligible Indicator (DEI): a 1-bit field. (formerly CFI).
+             May be used separately or in conjunction with PCP to indicate frames
+             eligible to be dropped in the presence of congestion.";
+        type boolean;
+    }
+
+    typedef vlan-id {
+        type uint16 {
+            range "0..4095";
+        }
+    }
+
+    typedef ether-type {
+        type uint32;
+    }

 }
 }