Merge "run.sh: fix -status command exit codes"

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 06c1d8df7e9c15b3c1ee57527753bf7424ef6ed5..98a0bd196bb39c3be87e089dfe3178d1f8fbf57b 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -73,8 +73,7 @@
     <bundle.plugin.version>2.3.7</bundle.plugin.version>
     <junit.version>4.8.1</junit.version>
     <bgpcep.version>0.3.0-SNAPSHOT</bgpcep.version>
-    <yangtools.version>0.5.9-SNAPSHOT</yangtools.version>
-    <yangtools.binding.version>0.6.0-SNAPSHOT</yangtools.binding.version>
+    <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>
     <!--versions for bits of the controller -->
     <controller.version>0.4.1-SNAPSHOT</controller.version>
     <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
@@ -732,7 +731,7 @@
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-binding</artifactId>
-       <version>${yangtools.binding.version}</version>
+       <version>${yangtools.version}</version>
       </dependency>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
@@ -744,6 +743,11 @@
        <artifactId>yang-data-api</artifactId>
        <version>${yangtools.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yang-data-impl</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>
       <dependency>
        <groupId>org.opendaylight.yangtools</groupId>
        <artifactId>yang-data-util</artifactId>
@@ -759,6 +763,11 @@
         <artifactId>switchmanager</artifactId>
         <version>${switchmanager.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>concepts</artifactId>
+        <version>${yangtools.version}</version>
+      </dependency>
 
       <!-- equinox http service bridge -->
       <dependency>

diff --git a/opendaylight/config/config-manager/pom.xml b/opendaylight/config/config-manager/pom.xml
index 7f3b88c0692f318ab6c681f00884c6c60b381e67..b5e73dd4d1dd275b0805513da6816992e56feddc 100644 (file)
--- a/opendaylight/config/config-manager/pom.xml
+++ b/opendaylight/config/config-manager/pom.xml
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
-            <version>${opendaylight.yangtools.version}</version>
+            <version>${yangtools.version}</version>
         </dependency>
     </dependencies>
 

diff --git a/opendaylight/config/pom.xml b/opendaylight/config/pom.xml
index 2ee792628b639ccc3f6b02874bffed9cc1e6a788..ad89a3237757f869b7705c466b1421ba6d93e48e 100644 (file)
--- a/opendaylight/config/pom.xml
+++ b/opendaylight/config/pom.xml
@@ -68,9 +68,6 @@
         <osgi.version>5.0.0</osgi.version>
         <jacoco.version>0.6.2.201302030002</jacoco.version>
         <slf4j.version>1.7.2</slf4j.version>
-        <opendaylight.yang.version>0.5.9-SNAPSHOT</opendaylight.yang.version>
-        <opendaylight.binding.version>0.6.0-SNAPSHOT</opendaylight.binding.version>
-        <opendaylight.yangtools.version>0.1.1-SNAPSHOT</opendaylight.yangtools.version>
         <salGeneratorPath>${project.build.directory}/generated-sources/sal</salGeneratorPath>
     </properties>
 
@@ -163,22 +160,22 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-spi</artifactId>
-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-util</artifactId>
-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-parser-impl</artifactId>
-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-generator-impl</artifactId>
-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -199,12 +196,12 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>binding-type-provider</artifactId>
-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin-spi</artifactId>
-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
@@ -222,17 +219,17 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
-                <version>${opendaylight.binding.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>concepts</artifactId>
-                <version>${opendaylight.yangtools.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -284,7 +281,7 @@
                 <plugin>
                     <groupId>org.opendaylight.yangtools</groupId>
                     <artifactId>yang-maven-plugin</artifactId>
-                    <version>${opendaylight.yang.version}</version>
+                    <version>${yangtools.version}</version>
                     <executions>
                         <execution>
                             <id>sal</id>
@@ -315,7 +312,7 @@
                         <dependency>
                             <groupId>org.opendaylight.yangtools</groupId>
                             <artifactId>maven-sal-api-gen-plugin</artifactId>
-                            <version>${opendaylight.binding.version}</version>
+                            <version>${yangtools.version}</version>
                             <type>jar</type>
                         </dependency>
                     </dependencies>

diff --git a/opendaylight/config/yang-test/pom.xml b/opendaylight/config/yang-test/pom.xml
index 235e466089b14a8a194b2f15067487721dd4e982..19e22731161bc3616dee90552510c30eb6ec0f56 100644 (file)
--- a/opendaylight/config/yang-test/pom.xml
+++ b/opendaylight/config/yang-test/pom.xml
@@ -65,7 +65,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${opendaylight.yang.version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <id>config</id>
@@ -122,7 +122,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index 7aa25320e374bab1df86fe843fe0ff8773f31fc6..17d484a88cbd0c8fa38550073aef33ce80f85481 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -175,7 +175,7 @@
         <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>concepts</artifactId>
-          <version>0.1.1-SNAPSHOT</version>
+          <version>${yangtools.version}</version>
         </dependency>
 
         <dependency>
@@ -418,27 +418,27 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-spi</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-api</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-impl</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-generator-util</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>binding-model-api</artifactId>
-          <version>${yangtools.binding.version}</version>
+          <version>${yangtools.version}</version>
          </dependency>
          <dependency>
            <groupId>commons-lang</groupId>
@@ -482,7 +482,6 @@
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-data-impl</artifactId>
-          <version>0.5.9-SNAPSHOT</version>
          </dependency>
          <dependency>
           <groupId>org.opendaylight.yangtools</groupId>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
index 20f59892c39800107c51848b20f643817cec67c9..40bd9f9aeaa4605267e58750d3929bb8b45865c1 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/initial/01-md-sal.xml
@@ -144,9 +144,7 @@
         <capability>urn:opendaylight:params:xml:ns:yang:controller:threadpool:impl?module=threadpool-impl&amp;revision=2013-04-05</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl?module=opendaylight-sal-dom-broker-impl&amp;revision=2013-10-28</capability>
         <capability>urn:opendaylight:yang:extension:yang-ext?module=yang-ext&amp;revision=2013-07-09</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:iana?module=iana&amp;revision=2013-08-16</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:common?module=opendaylight-md-sal-common&amp;revision=2013-10-28</capability>
-        <capability>urn:opendaylight:params:xml:ns:yang:ieee754?module=ieee754&amp;revision=2013-08-19</capability>
         <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:cluster:store?module=odl-sal-dom-clustered-store-cfg&amp;revision=2013-10-28</capability>
     </required-capabilities>
 </snapshot>

diff --git a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
index 62775c1eecf46115d6b741e93b36b2bbe835efe7..869a298d0fb18d7cd92acf8f8783104bf2544cfc 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/implementation/pom.xml
@@ -35,7 +35,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
index 129e6ff5fcf449122e578bcd8d0c1218a58a7a91..b4f71764d3e0804d6e12f22e737ae203ba0a8ddb 100644 (file)
--- a/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
+++ b/opendaylight/md-sal/clustered-data-store/integrationtest/pom.xml
@@ -195,7 +195,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>concepts</artifactId>
-            <version>0.1.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
@@ -258,6 +257,18 @@
             <artifactId>yang-store-impl</artifactId>
             <version>${config.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-model-util</artifactId>
+            <version>${yangtools.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>logback-config</artifactId>

diff --git a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend
index 4378e7dffece701592936ce85dba77884c6ce8d8..a3be5dd970f775141ad5483ec7ebeb8260641ad9 100644 (file)
--- a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend
+++ b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/NodeMapping.xtend
@@ -234,21 +234,21 @@ public class NodeMapping {
 
     public static def toAdBandwidth(PortFeatures pf) {
         var Bandwidth bw = null
-        if (pf.is_10mbHd || pf.is_10mbFd) {
+        if (pf.isTenMbHd || pf.isTenMbFd) {
             bw = new Bandwidth(Bandwidth.BW10Mbps)
-        } else if (pf.is_100mbHd || pf.is_100mbFd) {
+        } else if (pf.isHundredMbHd || pf.isHundredMbFd) {
             bw = new Bandwidth(Bandwidth.BW100Mbps)
-        } else if (pf.is_1gbHd || pf.is_1gbFd) {
+        } else if (pf.isOneGbHd || pf.isOneGbFd) {
             bw = new Bandwidth(Bandwidth.BW1Gbps)
-        } else if (pf.is_1gbFd) {
+        } else if (pf.isOneGbFd) {
             bw = new Bandwidth(Bandwidth.BW10Gbps)
-        } else if (pf.is_10gbFd) {
+        } else if (pf.isTenGbFd) {
             bw = new Bandwidth(Bandwidth.BW10Gbps)
-        } else if (pf.is_40gbFd) {
+        } else if (pf.isFortyGbFd) {
             bw = new Bandwidth(Bandwidth.BW40Gbps)
-        } else if (pf.is_100gbFd) {
+        } else if (pf.isHundredGbFd) {
             bw = new Bandwidth(Bandwidth.BW100Gbps)
-        } else if (pf.is_1tbFd) {
+        } else if (pf.isOneTbFd) {
             bw = new Bandwidth(Bandwidth.BW1Tbps)
         }
         return bw;

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
index a0beb2a84c936f51b83c20bd469b235563857949..02bdd1a1fa8a8510ebad0b27be5a2aa29e1bdd9e 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-flow-types.yang
@@ -2,7 +2,6 @@ module opendaylight-flow-types {
     namespace "urn:opendaylight:flow:types";
     prefix flow;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}    
     import opendaylight-match-types {prefix match; revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action;}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
similarity index 98%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
index 4442fbb3358001297434fee652faad30bb5712c4..ca64ae3d3c3fad798a9965d5e8c373a2fafed5b2 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/group-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-group-types.yang
@@ -2,7 +2,6 @@ module opendaylight-group-types {
     namespace "urn:opendaylight:group:types";
     prefix group;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
     import opendaylight-action-types {prefix action;}
 
@@ -244,4 +243,4 @@ module opendaylight-group-types {
         }
     }
     
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/match-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-match-types.yang

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
index d84b2f08511f466848886cb75aa4f418341d5563..1686cad3de0aacc365bcc195acc16314180cbb51 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/meter-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-meter-types.yang
@@ -2,7 +2,6 @@ module opendaylight-meter-types {
     namespace "urn:opendaylight:meter:types";
     prefix meter;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
 
 
@@ -73,21 +72,21 @@ module opendaylight-meter-types {
     grouping band-type {
         choice band-type {
             case drop {
-                leaf rate {
+                leaf drop-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf drop-burst-size {
                     type uint32;
                 }
             }
 
             case dscp-remark {
-                leaf rate {
+                leaf dscp-remark-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf dscp-remark-burst-size {
                     type uint32;
                 }
                 
@@ -97,11 +96,11 @@ module opendaylight-meter-types {
             }
             
             case experimenter {
-                leaf rate {
+                leaf experimenter-rate {
                     type uint32;
                 }
                 
-                leaf burst-size {
+                leaf experimenter-burst-size {
                     type uint32;
                 }
                 
@@ -151,11 +150,11 @@ module opendaylight-meter-types {
                     }
                 }
             
-                leaf rate {
+                leaf band-rate {
                     type uint32;
                 }
         
-                leaf burst-size {
+                leaf band-burst-size {
                     type uint32;
                 }
                 uses band-type;
@@ -262,4 +261,4 @@ module opendaylight-meter-types {
        uses meter-features;
     }
     
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang
similarity index 92%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang
index 2554fffadb7a047d0e8bb525688a20ba1423ba13..f1cbd8dc29e7b2a5d0b29cef831c9c0068752a7d 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/port-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-port-types.yang
@@ -2,7 +2,6 @@ module opendaylight-port-types {
     namespace "urn:opendaylight:flow:types:port";
     prefix port-types;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     import opendaylight-queue-types {prefix queue-types; revision-date "2013-09-25";}
     
@@ -41,16 +40,16 @@ module opendaylight-port-types {
     
     typedef port-features {
         type bits {
-            bit 10mb-hd;
-            bit 10mb-fd;
-            bit 100mb-hd;
-            bit 100mb-fd;
-            bit 1gb-hd;
-            bit 1gb-fd;
-            bit 10gb-fd;
-            bit 40gb-fd;
-            bit 100gb-fd;
-            bit 1tb-fd;
+            bit ten-mb-hd;
+            bit ten-mb-fd;
+            bit hundred-mb-hd;
+            bit hundred-mb-fd;
+            bit one-gb-hd;
+            bit one-gb-fd;
+            bit ten-gb-fd;
+            bit forty-gb-fd;
+            bit hundred-gb-fd;
+            bit one-tb-fd;
             bit other;
             bit copper;
             bit fiber;
@@ -171,4 +170,4 @@ module opendaylight-port-types {
             }            
         }    
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
index 06f832e114dab818e3e888bbdbcf0113485b2983..cdcf0ecf1408aea3dc5189ae40da3f88ffa9a07f 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/queue-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-queue-types.yang
@@ -2,7 +2,6 @@ module opendaylight-queue-types {
     namespace "urn:opendaylight:flow:types:queue";
     prefix queue-types;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     
     revision "2013-09-25" {
@@ -75,6 +74,5 @@ module opendaylight-queue-types {
             description "Port to be queried.";  
         }
         
-        }
- }
-}
\ No newline at end of file
+    }
+}

diff --git a/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
similarity index 92%
rename from opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
rename to opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
index 5e747e47221ae7557f98b9a22ec9a5caf9fbccc9..118db1af06fdbd809ec1f21217bbfe1a84c27cbe 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-base/src/main/yang/table-types.yang
+++ b/opendaylight/md-sal/model/model-flow-base/src/main/yang/opendaylight-table-types.yang
@@ -2,8 +2,6 @@ module opendaylight-table-types {
     namespace "urn:opendaylight:table:types";
     prefix table;
 
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     import opendaylight-flow-types {prefix flow;revision-date "2013-10-26";}
     import opendaylight-action-types {prefix action;}
 
@@ -227,7 +225,7 @@ module opendaylight-table-types {
             }
             
             case next-table-miss {   
-                container tables {
+                container tables-miss {
                     leaf-list table-ids {
                         type uint8;
                     }
@@ -259,27 +257,39 @@ module opendaylight-table-types {
             }
             
             case match {
-                uses set-field-match; 
+                       container match-setfield {
+                           uses set-field-match; 
+                       }
             }
             
             case wildcards {   
-                uses set-field-match;
+                       container wildcard-setfield {
+                    uses set-field-match;
+                }
             }
             
             case write-setfield {   
-                uses set-field-match;
+                       container write-setfield {
+                    uses set-field-match;
+                }
             }
             
             case write-setfield-miss {   
-                uses set-field-match;
+                container write-setfield-miss {
+                    uses set-field-match;
+                }
             }
             
             case apply-setfield {   
-                uses set-field-match; 
+                container apply-setfield {
+                    uses set-field-match; 
+                }
             }
             
             case apply-setfield-miss {   
-                uses set-field-match; 
+                container apply-setfield-miss {
+                    uses set-field-match; 
+                }
             }
         }
     } 
@@ -326,7 +336,6 @@ module opendaylight-table-types {
                      uses table-feature-prop-type;
                 }
             }
-
         }
     }    
 }

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang
similarity index 85%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang
index 1c57142997f05279780d5931a058b4f5ed96f896..b8579bcf9c19de8588c31ee61786fc2ad5fc3971 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/flow-management.yang
@@ -2,7 +2,6 @@ module flow-management {
     namespace "urn:opendaylight:flow:config";
     prefix flow-cfg;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-flow-types {prefix flow;}
 
@@ -25,7 +24,7 @@ module flow-management {
             leaf id {
                 type uint32;
             }
-            uses flow:flow-entry;
+            uses flow-entry;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang
similarity index 91%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang
index 2fc051087d38c099af6e0189a86ef1b0711aecf2..814c7e4767c823b23f33875956807363801102c5 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/group-management.yang
@@ -2,7 +2,6 @@ module group-management {
     namespace "urn:opendaylight:group:config";
     prefix group-cfg;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}  
     import opendaylight-group-types {prefix group;}
 
@@ -28,4 +27,4 @@ module group-management {
             uses group-entry;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang
similarity index 91%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang
index 35d4550ebf7a472cdd0b054f9f73cc181d9cb8fa..6d86c50314eb56eb62b023186befea625a37b6a8 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/meter-management.yang
@@ -2,7 +2,6 @@ module meter-management {
     namespace "urn:opendaylight:meter:config";
     prefix meter-cfg;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}  
     import opendaylight-meter-types {prefix meter;}
 
@@ -28,4 +27,4 @@ module meter-management {
             uses meter-entry;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang
similarity index 91%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang
index 50762b87ce821411583acffa86418e656539c99c..77483de14820781c3e3b0b3ade9e187ec945feb3 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/port-management.yang
@@ -2,7 +2,6 @@ module port-management {
     namespace "urn:opendaylight:port:config";
     prefix port-cfg;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}    
     import opendaylight-port-types {prefix port;}
 
@@ -28,4 +27,4 @@ module port-management {
             uses port-entry;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang
similarity index 92%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang
index b362e3f08037b8dba13db5f7f3d61da487779d85..c8a7fbbaa308080d2b5b899eafe4c5716a766564 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/queue-management.yang
@@ -2,7 +2,6 @@ module queue-management {
     namespace "urn:opendaylight:queue:config";
     prefix queue-cfg;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}      
      
     import opendaylight-queue-types {prefix queue; revision-date "2013-09-25";}
@@ -31,4 +30,4 @@ module queue-management {
             uses queue-entry;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang
similarity index 99%
rename from opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang
rename to opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang
index 512fb6528bbc6320ec1b6de699fa4c7c9e08b896..06edb04a0aa73fe3a97bbb175ea57d8f686b104d 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-config.yang
+++ b/opendaylight/md-sal/model/model-flow-management/src/main/yang/table-management.yang
@@ -29,4 +29,4 @@ module table-management {
             uses table-entry;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-errors.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-error.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-errors.yang

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
index 0f5cc71e8bc7052b1743d7e13d85ea3914e08bfd..65362a179094b98104c8345a0ec7dd28fced2296 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-node-inventory.yang
@@ -4,7 +4,6 @@ module flow-node-inventory {
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     import opendaylight-port-types {prefix port;revision-date "2013-09-25";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-table-types {prefix table;revision-date "2013-10-26";}
@@ -150,6 +149,7 @@ module flow-node-inventory {
         
         container supported-match-types {
             list match-type {
+               key "match";
                 uses feature;
                 leaf match {
                     type string; // FIXME: Add identity
@@ -160,6 +160,7 @@ module flow-node-inventory {
         
         container supported-instructions {
             list instruction-type {
+               key "instruction";
                 uses feature;
                 leaf instruction {
                     type string; // FIXME: Add identity
@@ -169,6 +170,7 @@ module flow-node-inventory {
 
         container supported-actions {
             list action-type {
+               key "action";
                 uses feature;
 
                 leaf action {
@@ -227,4 +229,4 @@ module flow-node-inventory {
         uses flow-node-connector;
     }
 
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang
similarity index 92%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang
index 6ad6b6dbc5532239ba9eba2d2a61f2fd6e3761fe..05c413d7bb14d1f9b823e44d41e01a8fff5da441 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-notification.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-topology-discovery.yang
@@ -2,7 +2,6 @@ module flow-topology-discovery {
     namespace "urn:opendaylight:flow:topology:discovery";
     prefix flow-node-topo;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     
     revision "2013-08-19" {
@@ -40,4 +39,4 @@ module flow-topology-discovery {
     
     }
 
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-flow.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-flow.yang
index 5c68a137c3d71f8c23da9cd8da3f64d6552e2b56..091bd43e1973ac8f2ec6aaea93717fe386e25af4 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/flow-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-flow.yang
@@ -4,7 +4,6 @@ module sal-flow {
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     import opendaylight-flow-types {prefix types;revision-date "2013-10-26";}
     import flow-capable-transaction {prefix tr;}
     import flow-errors {prefix error;}
@@ -129,4 +128,4 @@ module sal-flow {
         uses error:experimenter-error-message;
         uses tr:transaction-aware;
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang
index 7eeb0ac0f3767eb0d40e211d0b9c88d188cb8517..7543bf412b8c72295d5c1aaa8bcf2814c1aaa79c 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/group-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-group.yang
@@ -2,9 +2,7 @@ module sal-group {
     namespace "urn:opendaylight:group:service";
     prefix group;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
-    import ietf-inet-types {prefix inet;revision-date 2010-09-24;}
     import opendaylight-group-types {prefix group-type;revision-date 2013-10-18;}
     import flow-capable-transaction {prefix tr;}
 
@@ -94,4 +92,4 @@ module sal-group {
         uses node-group;
         uses tr:transaction-aware;
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang
index ecdef41951aa63482b11c122c51f08d602cb8f26..50f65df8e5a2be77c88147b80962c16717ee3ca2 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/meter-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-meter.yang
@@ -2,7 +2,6 @@ module sal-meter {
     namespace "urn:opendaylight:meter:service";
     prefix meter;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-meter-types {prefix meter-type;revision-date "2013-09-18";}
     import flow-capable-transaction {prefix tr;}
@@ -96,4 +95,4 @@ module sal-meter {
         uses node-meter;
         uses tr:transaction-aware;
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-port.yang
similarity index 99%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-port.yang
index 6795e6fd67a8090e525546deb18658f6dc5930d3..cf6d232db330aca58f33cc81661f042dcc690266 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/port-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-port.yang
@@ -53,4 +53,4 @@ module sal-port {
     notification port-removed {
         uses node-port;       
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang
similarity index 91%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang
index bf79cbf6354e9ee413e6c3173adac0a5b27207ed..4fa9fb0e579881c19173f1f3b3779b08c6389e23 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/queue-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-queue.yang
@@ -2,7 +2,6 @@ module sal-queue {
     namespace "urn:opendaylight:queue:service";
     prefix queue;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv; revision-date "2013-08-19";}
     import opendaylight-queue-types {prefix queue-type; revision-date "2013-09-25";}
 
@@ -26,4 +25,4 @@ module sal-queue {
     notification queue-get-config-reply {
         uses node-queue;
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang
similarity index 94%
rename from opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang
rename to opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang
index 02a63cb2b214e98c2c603d71173a2ba35a3f3bd8..66990d473f84e21af3fcb1af3c46993bd1e1eb9b 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-service/src/main/yang/table-service.yang
+++ b/opendaylight/md-sal/model/model-flow-service/src/main/yang/sal-table.yang
@@ -2,7 +2,6 @@ module sal-table {
     namespace "urn:opendaylight:table:service";
     prefix table;
 
-    import yang-ext {prefix ext; revision-date "2013-07-09";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-table-types {prefix table-type;revision-date "2013-10-26";}
     import flow-capable-transaction {prefix tr;}
@@ -40,4 +39,4 @@ module sal-table {
         }
         uses table-type:table-features;
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
index 2b1d99302629fa842ee04ed2ddb208392851e9aa..94e2c0a42831f98b4dc14887e0bd356d2db15221 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-statistics.yang
@@ -3,14 +3,12 @@ module opendaylight-flow-statistics {
     prefix flowstat;
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-flow-types {prefix flow-types;revision-date "2013-10-26";}
     import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";}
     import opendaylight-table-types {prefix table-types;revision-date "2013-10-26";}
     import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import flow-capable-transaction {prefix tr;}
-    import sal-flow {prefix flow;}
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
     
 

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang
similarity index 96%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang
index b8233545c5f2b0990662f91d2b1a346a87b1d0e0..ab84f50f31922ff9d27d4184978d05e8af2ce980 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/flow-table-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-flow-table-statistics.yang
@@ -4,7 +4,6 @@ module opendaylight-flow-table-statistics {
 
        import flow-capable-transaction {prefix tr;}
     import yang-ext {prefix ext; revision-date "2013-07-09";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import opendaylight-table-types {prefix table-types;revision-date "2013-10-26";}

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang
similarity index 98%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang
index 834e0a78358fa9cc55a5b419abc04f2e4fdeba87..2f5c5bbe0a7a0c05fd7d913b71417fab860c4011 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/group-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-group-statistics.yang
@@ -35,7 +35,7 @@ module opendaylight-group-statistics {
         }
        }
     
-    augment "/inv:nodes/inv:node/group-types:group" {
+    augment "/inv:nodes/inv:node/fni:group" {
         ext:augment-identifier "node-group-desc-stats";
         uses group-desc;
     }

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang
similarity index 100%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/meter-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-meter-statistics.yang

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang
similarity index 96%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang
index 787a4e6aa0ef2fe3b26931877aa56a608450eda8..22f0aca5e780107b3f42795ea5252f65e266df57 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/port-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-port-statistics.yang
@@ -4,7 +4,6 @@ module opendaylight-port-statistics {
 
        import flow-capable-transaction {prefix tr;}
     import yang-ext {prefix ext; revision-date "2013-07-09";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import opendaylight-statistics-types {prefix stat-types;revision-date "2013-09-25";}
 

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang
index 7665ef75c703ff187ffbe9af579a7f41080aeff9..9c48cfdbe874ae7fb1c128cf703bd2a94e2fbad2 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/queue-statistics.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-queue-statistics.yang
@@ -4,7 +4,6 @@ module opendaylight-queue-statistics {
 
        import flow-capable-transaction {prefix tr;}
     import yang-ext {prefix ext; revision-date "2013-07-09";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}   
     import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     import flow-node-inventory {prefix flow-node;revision-date "2013-08-19";}
     import opendaylight-queue-types {prefix queue-types;revision-date "2013-09-25";}

diff --git a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
rename to opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang
index 7bde486e91da8c4228086a9a6e1e08f8637b8707..c4cccc11023f33fd77ba0b27abf15e4d195b155d 100644 (file)
--- a/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/statistics-types.yang
+++ b/opendaylight/md-sal/model/model-flow-statistics/src/main/yang/opendaylight-statistics-types.yang
@@ -3,7 +3,6 @@ module opendaylight-statistics-types {
     prefix stat-types;
 
     import ietf-yang-types {prefix yang;}
-    import opendaylight-inventory {prefix inv;revision-date "2013-08-19";}
     
     revision "2013-09-25" {
         description "Initial revision of flow service";
@@ -119,4 +118,4 @@ module opendaylight-statistics-types {
                uses duration;          
     }
     
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang
index aaaedc1dc570f9ef6d12ede48fa692e2c2150acf..1ccdfe87419a40a652880922067af579887fa7de 100644 (file)
--- a/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang
+++ b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory-config.yang
@@ -3,8 +3,6 @@ module opendaylight-inventory-config {
     prefix inv-config;
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
-    import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
     import opendaylight-inventory {prefix inv; revision-date "2013-08-19";}
 
 
@@ -20,4 +18,4 @@ module opendaylight-inventory-config {
             uses inv:node;
         }
     }    
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang
similarity index 97%
rename from opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang
rename to opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang
index 77c92f91ce4358883513079f209c0d5098d9b2aa..396206e28ed30f1a03c8b28f72fec645911fa86f 100644 (file)
--- a/opendaylight/md-sal/model/model-inventory/src/main/yang/node-inventory.yang
+++ b/opendaylight/md-sal/model/model-inventory/src/main/yang/opendaylight-inventory.yang
@@ -4,7 +4,6 @@ module opendaylight-inventory {
 
     import yang-ext {prefix ext; revision-date "2013-07-09";}
     import ietf-inet-types {prefix inet; revision-date "2010-09-24";}
-    import ietf-yang-types {prefix yang; revision-date "2010-09-24";}
 
 
     revision "2013-08-19" {
@@ -119,4 +118,4 @@ module opendaylight-inventory {
             type node-connector-ref;
         }
     }
-}
\ No newline at end of file
+}

diff --git a/opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang
similarity index 92%
rename from opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang
rename to opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang
index 21cf8fc8a82361e935c766445089c41e35227a12..99e5effdf6cc8bbc22ff3c6a3231f0b12c6e38da 100644 (file)
--- a/opendaylight/md-sal/model/model-topology/src/main/yang/topology-view.yang
+++ b/opendaylight/md-sal/model/model-topology/src/main/yang/opendaylight-topology-view.yang
@@ -5,9 +5,7 @@ module opendaylight-topology-view  {
     prefix "nt";
 
     import yang-ext { prefix "ext"; }
-    import ietf-inet-types { prefix "inet"; }
     import network-topology {prefix "topo"; revision-date "2013-10-21"; }
-    import opendaylight-topology {prefix "odl";}
 
     organization "TBD";
 

diff --git a/opendaylight/md-sal/model/pom.xml b/opendaylight/md-sal/model/pom.xml
index 571e9d8df2a66f2ea7e48b7aebc03c7e4a338320..f7c137fb32c6ee994dbb2cba5781f5d11c2caa28 100644 (file)
--- a/opendaylight/md-sal/model/pom.xml
+++ b/opendaylight/md-sal/model/pom.xml
@@ -47,7 +47,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/pom.xml b/opendaylight/md-sal/pom.xml
index efc84237b5ba202b0806bfa2e34db3a94e0d7a20..3c4c8e3bb5230cfbf5232c525fd2d21ac1e56eae 100644 (file)
--- a/opendaylight/md-sal/pom.xml
+++ b/opendaylight/md-sal/pom.xml
@@ -89,6 +89,7 @@
     </profiles>
 
     <properties>
+        <yangtools.version>0.6.0-SNAPSHOT</yangtools.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
         <!-- Java Versions -->
@@ -101,8 +102,6 @@
 
         <!-- Dependency Versions -->
         <slf4j.version>1.7.2</slf4j.version>
-        <yang.version>0.5.9-SNAPSHOT</yang.version>
-        <yang.binding.version>0.6.0-SNAPSHOT</yang.binding.version>
         <yang.codegen.version>0.6.0-SNAPSHOT</yang.codegen.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
@@ -213,32 +212,37 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-binding</artifactId>
-                <version>${yang.binding.version}</version>
+                <version>${yangtools.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-model-util</artifactId>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-common</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-api</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-impl</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-model-api</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-data-util</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
             </dependency>
             <!-- SAL Dependencies -->
             <dependency>
@@ -310,6 +314,16 @@
                 <version>${powermock.version}</version>
                 <scope>test</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>binding-generator-impl</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yang-parser-impl</artifactId>
+                <version>0.6.0-SNAPSHOT</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <build>

diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 29357c04328a056c107af1671b35228970060979..87a07369bd4ada1e0302ab46899dd2adb10cbb49 100644 (file)
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -196,12 +196,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>binding-generator-impl</artifactId>
-            <version>0.6.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -237,12 +235,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-model-util</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

diff --git a/opendaylight/md-sal/sal-binding-config/pom.xml b/opendaylight/md-sal/sal-binding-config/pom.xml
index a913faa15bd9396e04cdbd97eb22d3864d4272b2..be031a74100e7cf18a7ff4cbe412332ed87e2920 100644 (file)
--- a/opendaylight/md-sal/sal-binding-config/pom.xml
+++ b/opendaylight/md-sal/sal-binding-config/pom.xml
@@ -24,7 +24,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 4ed629b77ddf8519032d106c39e8cbc40d057aba..ac273cd885c0277ffda838ef312b6ee3eee9c304 100644 (file)
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 10e7946a7b5d3038d87d52beb0c3efda8b5975dc..949d59c49adbc984261cd24cfd1ec9681c468571 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -55,12 +55,10 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
         </dependency>
     </dependencies>
 
@@ -69,7 +67,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -124,6 +122,9 @@
                             org.opendaylight.controller.sal.dom.broker.*,
                             org.opendaylight.controller.config.yang.md.sal.dom.impl
                         </Private-Package>
+                        <Import-Package>
+                            *
+                        </Import-Package>
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/opendaylight/md-sal/sal-netconf-connector/pom.xml b/opendaylight/md-sal/sal-netconf-connector/pom.xml
index 770056f825f8c9f626a5e848b1c4759ff9c02e23..61a84b636b3ae2c396010e297f3ec65ee154a1da 100644 (file)
--- a/opendaylight/md-sal/sal-netconf-connector/pom.xml
+++ b/opendaylight/md-sal/sal-netconf-connector/pom.xml
@@ -43,7 +43,6 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
@@ -200,11 +199,18 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Import-Package>
+                            *
+                        </Import-Package>
+                    </instructions>
+                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
index d5648a0625d87fd698aafbd132e45400aaf7186d..ee9bc8922b08d6d0d045b0883d3e6a824601c489 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -146,7 +146,7 @@
                         <Export-Package>
                             org.opendaylight.controller.config.yang.md.sal.remote.rpc,
                             org.opendaylight.controller.sal.connector.remoterpc,
-                            org.opendaylight.controller.sal.connector.remoterpc.*
+                            org.opendaylight.controller.sal.connector.remoterpc.*,
                         </Export-Package>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                     </instructions>
@@ -157,7 +157,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>0.5.9-SNAPSHOT</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
index fa7b73be0e96a7b43e4c1a5952ec8d0b72e9fa77..dd216c0881f1d09e0e6377830c5c9493abfd080b 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/consumer-service/pom.xml
@@ -73,7 +73,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
+            <version>${yangtools.version}</version>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
index 8ee61c3a3f6a72561f45f7cde92ee8bea9567f4a..d748d69c83f2bc5532e7385a0d16baff3509bc54 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml
@@ -204,11 +204,11 @@
             <artifactId>yang-data-api</artifactId>
         </dependency>
         <!--dependency> <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> 
-            <version>0.5.9-SNAPSHOT</version> </dependency -->
+            <version>${yangtools.version}</version> </dependency -->
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-parser-impl</artifactId>
-            <version>0.5.9-SNAPSHOT</version>
+            <version>${yangtools.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>

diff --git a/opendaylight/md-sal/sal-rest-connector/pom.xml b/opendaylight/md-sal/sal-rest-connector/pom.xml
index 0bd86a3eadb6007d441eb6859d3a61593af8a451..2d24e6671118048d8f0ac6e72065b89d9974003c 100644 (file)
--- a/opendaylight/md-sal/sal-rest-connector/pom.xml
+++ b/opendaylight/md-sal/sal-rest-connector/pom.xml
@@ -40,12 +40,10 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-impl</artifactId>
-      <version>${yang.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-model-util</artifactId>
-      <version>${yang.version}</version>
     </dependency>
     <dependency>
       <groupId>com.google.code.gson</groupId>
@@ -73,7 +71,6 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-parser-impl</artifactId>
-      <version>${yang.version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -102,7 +99,7 @@
               org.opendaylight.controller.sal.restconf.impl,
               org.eclipse.xtend2.lib,
               org.eclipse.xtend.lib,
-              org.eclipse.xtext.xbase.*
+              org.eclipse.xtext.xbase.*,
             </Private-Package>
             <Import-Package>
             *,

diff --git a/opendaylight/md-sal/samples/toaster/pom.xml b/opendaylight/md-sal/samples/toaster/pom.xml
index f93bb339b902c48f0fa9025ec0b61f12a3290321..2c97063cc60aa29aa888858708343c55d2be4813 100644 (file)
--- a/opendaylight/md-sal/samples/toaster/pom.xml
+++ b/opendaylight/md-sal/samples/toaster/pom.xml
@@ -19,7 +19,7 @@
             <plugin>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yang-maven-plugin</artifactId>
-                <version>${yang.version}</version>
+                <version>${yangtools.version}</version>
                 <executions>
                     <execution>
                         <goals>

diff --git a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
index 62ba04687e67eb368f47e61f07d64d4ee3de0618..f3188e1d0e83dbfd7870fd20b4e67d77d01b2219 100644 (file)
--- a/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
+++ b/opendaylight/md-sal/statistics-manager/src/main/java/org/opendaylight/controller/md/statistics/manager/StatisticsUpdateCommiter.java
@@ -7,6 +7,10 @@
  */
 package org.opendaylight.controller.md.statistics.manager;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.ConcurrentMap;
+
 import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
@@ -84,10 +88,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.statistics.rev131111.nodes.node.meter.MeterStatisticsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.config.stats.reply.MeterConfigStats;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.statistics.reply.MeterStats;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.VlanMatch;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._3.match.Ipv4Match;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.layer._4.match.TcpMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericQueueStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.statistics.types.rev130925.GenericStatistics;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.port.statistics.rev131214.FlowCapableNodeConnectorStatisticsData;
@@ -107,10 +107,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdenti
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.ConcurrentMap;
-
 /**
  * Class implement statistics manager related listener interface and augment all the 
  * received statistics data to data stores.
@@ -810,6 +806,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
      * @param storedFlow
      * @return
      */
+    
     public boolean matchEquals(Match statsFlow, Match storedFlow) {
         if (statsFlow == storedFlow) {
             return true;
@@ -819,12 +816,9 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         }
         if (storedFlow.getEthernetMatch() == null) {
             if (statsFlow.getEthernetMatch() != null) {
-                if(!statsFlow.getEthernetMatch().getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00") ||
-                        !statsFlow.getEthernetMatch().getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){
-                    return false;
-                }
+                return false;
             }
-        } else if(!EthernetMatchEquals(statsFlow.getEthernetMatch(),storedFlow.getEthernetMatch())) {
+        } else if(!storedFlow.getEthernetMatch().equals(statsFlow.getEthernetMatch())) {
             return false;
         }
         if (storedFlow.getIcmpv4Match()== null) {
@@ -850,12 +844,7 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         }
         if (storedFlow.getInPort()== null) {
             if (statsFlow.getInPort() != null) {
-                String[] portArr = statsFlow.getInPort().getValue().split(":");
-                if(portArr.length >= 3){
-                    if(Integer.parseInt(portArr[2]) != 0){
-                        return false;
-                    }
-                }
+                return false;
             }
         } else if(!storedFlow.getInPort().equals(statsFlow.getInPort())) {
             return false;
@@ -869,22 +858,14 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         }
         if (storedFlow.getLayer3Match()== null) {
             if (statsFlow.getLayer3Match() != null) {
-                Ipv4Match ipv4Match = (Ipv4Match)statsFlow.getLayer3Match();
-                if(!ipv4Match.getIpv4Source().getValue().equals("0.0.0.0/0") ||
-                        !ipv4Match.getIpv4Destination().getValue().equals("0.0.0.0/0")){
                     return false;
-                }
             }
         } else if(!storedFlow.getLayer3Match().equals(statsFlow.getLayer3Match())) {
             return false;
         }
         if (storedFlow.getLayer4Match()== null) {
             if (statsFlow.getLayer4Match() != null) {
-                TcpMatch tcpMatch = (TcpMatch)statsFlow.getLayer4Match();
-                if(!tcpMatch.getTcpDestinationPort().getValue().equals(0) ||
-                    !tcpMatch.getTcpSourcePort().getValue().equals(0)){
-                        return false;
-                }
+                return false;
             }
         } else if(!storedFlow.getLayer4Match().equals(statsFlow.getLayer4Match())) {
             return false;
@@ -912,49 +893,11 @@ public class StatisticsUpdateCommiter implements OpendaylightGroupStatisticsList
         }
         if (storedFlow.getVlanMatch()== null) {
             if (statsFlow.getVlanMatch() != null) {
-                VlanMatch vlanMatch = statsFlow.getVlanMatch();
-                if(!vlanMatch.getVlanId().getVlanId().getValue().equals(0) ||
-                        !vlanMatch.getVlanPcp().getValue().equals((short)0)){
-                    return false;
-                }
+                return false;
             }
         } else if(!storedFlow.getVlanMatch().equals(statsFlow.getVlanMatch())) {
             return false;
         }
         return true;
     }
-
-    public boolean EthernetMatchEquals(EthernetMatch statsEtherMatch, EthernetMatch storedEtherMatch) {
-        if (statsEtherMatch == storedEtherMatch) {
-            return true;
-        }
-        if (storedEtherMatch.getEthernetDestination()== null) {
-            if (statsEtherMatch.getEthernetDestination() != null) {
-                if(!statsEtherMatch.getEthernetDestination().getAddress().getValue().equals("00:00:00:00:00:00")){
-                    return false;
-                }
-            }
-        } else if(!storedEtherMatch.getEthernetDestination().equals(statsEtherMatch.getEthernetDestination())) {
-            return false;
-        }
-        if (storedEtherMatch.getEthernetSource() == null) {
-            if (statsEtherMatch.getEthernetSource() != null) {
-                if(!statsEtherMatch.getEthernetSource().getAddress().getValue().equals("00:00:00:00:00:00")){
-                    return false;
-                }
-            }
-        } else if(!storedEtherMatch.getEthernetSource().equals(statsEtherMatch.getEthernetSource())) {
-            return false;
-        }
-        if (storedEtherMatch.getEthernetType() == null) {
-            if (statsEtherMatch.getEthernetType() != null) {
-                if(!statsEtherMatch.getEthernetType().getType().getValue().equals(0)){
-                    return false;
-                }
-            }
-        } else if(!storedEtherMatch.getEthernetType().equals(statsEtherMatch.getEthernetType())) {
-            return false;
-        }
-        return true;
-    }
 }

diff --git a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
index aebaaebc1a5c556196da10a09bcd369c048af8bc..986b6eccc5f2a805ff39bdf146c6b896aeb0ef47 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring-extension/pom.xml
@@ -56,7 +56,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
index f564c8cd872df213badfdff381674ed7502424bf..471830e48442cec92377fd9f1c6b48fb34637463 100644 (file)
--- a/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
+++ b/opendaylight/netconf/ietf-netconf-monitoring/pom.xml
@@ -65,7 +65,7 @@
                     <dependency>
                         <groupId>org.opendaylight.yangtools</groupId>
                         <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${yangtools.binding.version}</version>
+                        <version>${yangtools.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>