Fix for Bug 511 (model + integration-test)

Removed \r characters from yang-ext.yang and from integration-test project.

Signed-off-by: Martin Vitez <mvitez@cisco.com>

diff --git a/integration-test/regression-test-model/src/main/yang/test-bug466-augmentation.yang b/integration-test/regression-test-model/src/main/yang/test-bug466-augmentation.yang
index 103dc029c5fc8fa6f2b018c9082da0409e65c521..91a49261d15775a0740697651ceca07379f5be3f 100644 (file)
--- a/integration-test/regression-test-model/src/main/yang/test-bug466-augmentation.yang
+++ b/integration-test/regression-test-model/src/main/yang/test-bug466-augmentation.yang
@@ -1,52 +1,52 @@
-module test-bug466-augmentation {\r
-    yang-version 1;\r
-    namespace "urn:opendaylight:yang:test:regression:bug466:augmentation:empty";\r
-    prefix "bug466-aug-empty";\r
-    \r
-    import test-bug466-base { prefix base; revision-date "2014-02-26";}\r
-    import yang-ext { prefix ext; revision-date "2013-07-09";}\r
-\r
-    contact "Anton Tkacik <ttkacik@cisco.com>";\r
-\r
-    description \r
-            "Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
-\r
-            This program and the accompanying materials are made available under the\r
-            terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
-            and is available at http://www.eclipse.org/legal/epl-v10.html";\r
-\r
-\r
-    revision "2014-02-26" {\r
-        description "";\r
-    }\r
-\r
-    augment "/base:bug-466" {\r
-        description "Empty augmentation without conditions.";\r
-    }\r
-\r
-    augment "/base:bug-466" {\r
-        description "Empty augmentation with extensions.";\r
-        ext:context-instance "base:bug-466-identity";\r
-    }\r
-\r
-    augment "/base:bug-466" {\r
-        description "augmentation with data.";\r
-        container data {\r
-        \r
-        }\r
-    }\r
-\r
-    augment "/base:bug-466" {\r
-        when "./base:condition='renamed-augment'";\r
-        ext:augment-identifier "renamed-augmentation-with-condition";\r
-        \r
-    }\r
-\r
-    augment "/base:bug-466" {\r
-        ext:augment-identifier "renamed-augmentation-with-child";\r
-        container child {\r
-        \r
-        }\r
-    }\r
-\r
-}\r
+module test-bug466-augmentation {
+    yang-version 1;
+    namespace "urn:opendaylight:yang:test:regression:bug466:augmentation:empty";
+    prefix "bug466-aug-empty";
+    
+    import test-bug466-base { prefix base; revision-date "2014-02-26";}
+    import yang-ext { prefix ext; revision-date "2013-07-09";}
+
+    contact "Anton Tkacik <ttkacik@cisco.com>";
+
+    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 "2014-02-26" {
+        description "";
+    }
+
+    augment "/base:bug-466" {
+        description "Empty augmentation without conditions.";
+    }
+
+    augment "/base:bug-466" {
+        description "Empty augmentation with extensions.";
+        ext:context-instance "base:bug-466-identity";
+    }
+
+    augment "/base:bug-466" {
+        description "augmentation with data.";
+        container data {
+        
+        }
+    }
+
+    augment "/base:bug-466" {
+        when "./base:condition='renamed-augment'";
+        ext:augment-identifier "renamed-augmentation-with-condition";
+        
+    }
+
+    augment "/base:bug-466" {
+        ext:augment-identifier "renamed-augmentation-with-child";
+        container child {
+        
+        }
+    }
+
+}

diff --git a/integration-test/regression-test-model/src/main/yang/test-bug466-base.yang b/integration-test/regression-test-model/src/main/yang/test-bug466-base.yang
index 657d406c445418ecbaa677518848b61f102610ad..ba85c17b5a00596a89a2fbdf0e6126dafea13513 100644 (file)
--- a/integration-test/regression-test-model/src/main/yang/test-bug466-base.yang
+++ b/integration-test/regression-test-model/src/main/yang/test-bug466-base.yang
@@ -1,32 +1,32 @@
-module test-bug466-base {\r
-    yang-version 1;\r
-    namespace "urn:opendaylight:yang:test:regression:bug466:base";\r
-    prefix "bug466-base";\r
-    \r
-    contact "Anton Tkacik <ttkacik@cisco.com>";\r
-\r
-    description \r
-            "Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.\r
-\r
-            This program and the accompanying materials are made available under the\r
-            terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
-            and is available at http://www.eclipse.org/legal/epl-v10.html";\r
-\r
-    revision "2014-02-26" {\r
-        description "";\r
-    }\r
-    \r
-    identity bug-466-identity {\r
-        description "Testing identity.";\r
-    }\r
-\r
-    container bug-466 {\r
-        description "\r
-            Empty Container which could be used by augmentation tests.\r
-            This container is used for regression tests of Bug 466.\r
-            ";\r
-        leaf condition {\r
-            type string;\r
-        }\r
-    }\r
-}\r
+module test-bug466-base {
+    yang-version 1;
+    namespace "urn:opendaylight:yang:test:regression:bug466:base";
+    prefix "bug466-base";
+    
+    contact "Anton Tkacik <ttkacik@cisco.com>";
+
+    description 
+            "Copyright (c) 2014 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 "2014-02-26" {
+        description "";
+    }
+    
+    identity bug-466-identity {
+        description "Testing identity.";
+    }
+
+    container bug-466 {
+        description "
+            Empty Container which could be used by augmentation tests.
+            This container is used for regression tests of Bug 466.
+            ";
+        leaf condition {
+            type string;
+        }
+    }
+}

diff --git a/model/yang-ext/src/main/yang/yang-ext.yang b/model/yang-ext/src/main/yang/yang-ext.yang
index 498b46f63e036baf4e72508d62b1d593fc0fe9d5..0fbe94ddc4c472aa33fe13fd01857a060345f288 100644 (file)
--- a/model/yang-ext/src/main/yang/yang-ext.yang
+++ b/model/yang-ext/src/main/yang/yang-ext.yang
@@ -1,79 +1,79 @@
-module yang-ext {\r
-    yang-version 1;\r
-    namespace "urn:opendaylight:yang:extension:yang-ext";\r
-    prefix "ext";\r
-    \r
-    contact "Anton Tkacik <ttkacik@cisco.com>";\r
-\r
-    description \r
-            "Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.\r
-\r
-            This program and the accompanying materials are made available under the\r
-            terms of the Eclipse Public License v1.0 which accompanies this distribution,\r
-            and is available at http://www.eclipse.org/legal/epl-v10.html";\r
-\r
-    revision "2013-07-09" {\r
-        description "";\r
-    }\r
-\r
-    // Augmentation name\r
-\r
-    extension "augment-identifier" {\r
-        description \r
-           "YANG language extension which assigns an identifier to \r
-            augmentation. Augment identifier is used to identify\r
-            specific augment statement by name. \r
-\r
-            The identifier syntax is defined formally defined by the rule\r
-            'identifier' in Section 12 of RFC 6020.\r
-\r
-            All augment identifiers defined in a namespace MUST be unique.\r
-            The namespace of augment identifiers is shared by module and\r
-            its submodules.";\r
-\r
-            /*\r
-                Discussion:\r
-                This extension allows for ease of development / debug\r
-                of YANG modules and it is suitable for code generation,\r
-                where each augment statement is nicely identified by\r
-                unique name instead of combination of augment target\r
-                and when condition. \r
-            */\r
-        argument "identifier";\r
-    }\r
-\r
-\r
-    // Context-aware RPCs\r
-\r
-    grouping rpc-context-ref {\r
-        description \r
-           "A reference to RPC context.";\r
-        leaf context-instance {\r
-            type instance-identifier;\r
-            description "Pointer to the context. ";\r
-        }\r
-    }\r
-\r
-    extension "rpc-context-instance" {\r
-        description\r
-           "YANG language extension which defines enclosing (parent) \r
-            schema node as referencable context for RPCs.\r
-\r
-            The argument is identity which is used to identify RPC context\r
-            type.";\r
-\r
-        argument "context-type";\r
-    }\r
-\r
-    extension "context-reference" {\r
-        argument "context-type";\r
-    }\r
-\r
-    extension "context-instance" {\r
-        argument "context-type";\r
-    }\r
-    \r
-    extension "instance-target" {\r
-       argument "path";\r
-    }\r
-}\r
+module yang-ext {
+    yang-version 1;
+    namespace "urn:opendaylight:yang:extension:yang-ext";
+    prefix "ext";
+    
+    contact "Anton Tkacik <ttkacik@cisco.com>";
+
+    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-07-09" {
+        description "";
+    }
+
+    // Augmentation name
+
+    extension "augment-identifier" {
+        description 
+           "YANG language extension which assigns an identifier to 
+            augmentation. Augment identifier is used to identify
+            specific augment statement by name. 
+
+            The identifier syntax is defined formally defined by the rule
+            'identifier' in Section 12 of RFC 6020.
+
+            All augment identifiers defined in a namespace MUST be unique.
+            The namespace of augment identifiers is shared by module and
+            its submodules.";
+
+            /*
+                Discussion:
+                This extension allows for ease of development / debug
+                of YANG modules and it is suitable for code generation,
+                where each augment statement is nicely identified by
+                unique name instead of combination of augment target
+                and when condition. 
+            */
+        argument "identifier";
+    }
+
+
+    // Context-aware RPCs
+
+    grouping rpc-context-ref {
+        description 
+           "A reference to RPC context.";
+        leaf context-instance {
+            type instance-identifier;
+            description "Pointer to the context. ";
+        }
+    }
+
+    extension "rpc-context-instance" {
+        description
+           "YANG language extension which defines enclosing (parent) 
+            schema node as referencable context for RPCs.
+
+            The argument is identity which is used to identify RPC context
+            type.";
+
+        argument "context-type";
+    }
+
+    extension "context-reference" {
+        argument "context-type";
+    }
+
+    extension "context-instance" {
+        argument "context-type";
+    }
+    
+    extension "instance-target" {
+       argument "path";
+    }
+}