Merge "To SAL conversion test."
authorGiovanni Meo <gmeo@cisco.com>
Thu, 26 Sep 2013 08:27:30 +0000 (08:27 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 26 Sep 2013 08:27:30 +0000 (08:27 +0000)
85 files changed:
opendaylight/appauth/pom.xml
opendaylight/archetypes/odl-model-project/pom.xml
opendaylight/archetypes/odl-model-project/src/main/resources/archetype-resources/pom.xml
opendaylight/arphandler/pom.xml
opendaylight/clustering/services/pom.xml
opendaylight/clustering/services_implementation/pom.xml
opendaylight/clustering/services_implementation/src/main/java/org/infinispan/interceptors/distribution/BaseDistributionInterceptor.java
opendaylight/clustering/stub/pom.xml
opendaylight/clustering/test/pom.xml
opendaylight/commons/concepts/pom.xml
opendaylight/commons/opendaylight/pom.xml
opendaylight/configuration/api/pom.xml
opendaylight/configuration/implementation/pom.xml
opendaylight/connectionmanager/api/pom.xml
opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/IConnectionManager.java
opendaylight/connectionmanager/implementation/pom.xml
opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/internal/ConnectionManager.java
opendaylight/connectionmanager/implementation/src/main/java/org/opendaylight/controller/connectionmanager/scheme/AbstractScheme.java
opendaylight/containermanager/api/pom.xml
opendaylight/containermanager/implementation/pom.xml
opendaylight/containermanager/it.implementation/pom.xml
opendaylight/forwarding/staticrouting/pom.xml
opendaylight/forwardingrulesmanager/api/pom.xml
opendaylight/forwardingrulesmanager/implementation/pom.xml
opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/FlowEntryDistributionOrderFutureTask.java
opendaylight/forwardingrulesmanager/implementation/src/main/java/org/opendaylight/controller/forwardingrulesmanager/internal/ForwardingRulesManager.java
opendaylight/hosttracker/api/pom.xml
opendaylight/hosttracker/implementation/pom.xml
opendaylight/hosttracker_new/api/pom.xml
opendaylight/hosttracker_new/implementation/pom.xml
opendaylight/logging/bridge/pom.xml
opendaylight/md-sal/model/model-flow-service/pom.xml
opendaylight/md-sal/model/pom.xml
opendaylight/md-sal/pom.xml
opendaylight/md-sal/sal-binding-broker/pom.xml
opendaylight/md-sal/sal-compability/pom.xml
opendaylight/networkconfiguration/neutron/implementation/pom.xml
opendaylight/networkconfiguration/neutron/pom.xml
opendaylight/northbound/bundlescanner/api/pom.xml
opendaylight/northbound/bundlescanner/implementation/pom.xml
opendaylight/northbound/commons/pom.xml
opendaylight/northbound/containermanager/pom.xml
opendaylight/northbound/flowprogrammer/pom.xml
opendaylight/northbound/hosttracker/pom.xml
opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
opendaylight/northbound/networkconfiguration/neutron/pom.xml
opendaylight/northbound/networkconfiguration/neutron/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java
opendaylight/northbound/staticrouting/pom.xml
opendaylight/northbound/statistics/pom.xml
opendaylight/northbound/subnets/pom.xml
opendaylight/northbound/switchmanager/pom.xml
opendaylight/northbound/topology/pom.xml
opendaylight/northboundtest/unit_test_suite/pom.xml
opendaylight/protocol_plugins/openflow/pom.xml
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/InventoryServiceShim.java
opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/vendorextension/v6extension/V6StatsReply.java
opendaylight/protocol_plugins/stub/pom.xml
opendaylight/routing/dijkstra_implementation/pom.xml
opendaylight/sal/api/pom.xml
opendaylight/sal/connection/api/pom.xml
opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/ConnectionLocality.java [moved from opendaylight/connectionmanager/api/src/main/java/org/opendaylight/controller/connectionmanager/ConnectionLocality.java with 93% similarity]
opendaylight/sal/connection/api/src/main/java/org/opendaylight/controller/sal/connection/IPluginOutConnectionService.java
opendaylight/sal/connection/implementation/pom.xml
opendaylight/sal/connection/implementation/src/main/java/org/opendaylight/controller/sal/connection/implementation/internal/ConnectionService.java
opendaylight/sal/implementation/pom.xml
opendaylight/sal/networkconfiguration/api/pom.xml
opendaylight/sal/networkconfiguration/implementation/pom.xml
opendaylight/samples/loadbalancer/pom.xml
opendaylight/samples/northbound/loadbalancer/pom.xml
opendaylight/samples/simpleforwarding/pom.xml
opendaylight/security/pom.xml
opendaylight/statisticsmanager/api/pom.xml
opendaylight/statisticsmanager/implementation/pom.xml
opendaylight/switchmanager/api/pom.xml
opendaylight/switchmanager/implementation/pom.xml
opendaylight/topologymanager/implementation/pom.xml
opendaylight/usermanager/api/pom.xml
opendaylight/usermanager/implementation/pom.xml
opendaylight/web/brandfragment/pom.xml
opendaylight/web/devices/pom.xml
opendaylight/web/flows/pom.xml
opendaylight/web/root/pom.xml
opendaylight/web/topology/pom.xml
opendaylight/web/troubleshoot/pom.xml
third-party/org.apache.catalina.filters.CorsFilter/pom.xml

index 71aa49f..4f9cf4c 100644 (file)
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
index eb81614..9d05405 100644 (file)
@@ -8,6 +8,11 @@
   <packaging>maven-archetype</packaging>\r
 \r
   <name>odl-model-project</name>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
 \r
   <build>\r
     <extensions>\r
index b60dee7..e592e6d 100644 (file)
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
     <yang.version>0.5.8-SNAPSHOT</yang.version>\r
-    <maven.bundle.version>2.4.0</maven.bundle.version>\r
+    <bundle.plugin.version>2.3.7</bundle.plugin.version>\r
   </properties>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
 \r
   <build>\r
     <plugins>\r
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>${maven.bundle.version}</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index c58ddd2..e3beb80 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index d251d45..59df46b 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index fddaa6c..9606bdc 100644 (file)
@@ -38,7 +38,7 @@
     <plugin>
       <groupId>org.apache.felix</groupId>
       <artifactId>maven-bundle-plugin</artifactId>
-      <version>2.3.6</version>
+      <version>${bundle.plugin.version}</version>
       <extensions>true</extensions>
       <configuration>
         <instructions>
index e105637..6c6715d 100644 (file)
@@ -134,9 +134,9 @@ public abstract class BaseDistributionInterceptor extends ClusteringInterceptor
                 rpcManager.invokeRemotely(recipientGenerator.generateRecipients(), command,
                         rpcManager.getDefaultRpcOptions(isSync));
             } else {
-                log.errorf("Didn't invoke RPC because primaryOwner (%s) didn't match this node (%s)", primaryOwner,
+                log.tracef("Didn't invoke RPC because primaryOwner (%s) didn't match this node (%s)", primaryOwner,
                            rpcManager.getAddress());
-                log.errorf("Hashcode is (%s) for Key (%s) .. it could be inconsistent in the cluster!",
+                log.tracef("Hashcode is (%s) for Key (%s)",
                            command.getKey().hashCode(), command.getKey());
             }
          return returnValue;
index b3c4985..3cc7d7b 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 0b09f41..340a6c7 100644 (file)
@@ -22,7 +22,7 @@
     <plugin>
       <groupId>org.apache.felix</groupId>
       <artifactId>maven-bundle-plugin</artifactId>
-      <version>2.3.6</version>
+      <version>${bundle.plugin.version}</version>
       <extensions>true</extensions>
       <configuration>
         <instructions>
index ab351db..2255527 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index 042bc54..abda95a 100644 (file)
@@ -58,6 +58,7 @@
     <commons.lang.version>3.1</commons.lang.version>
     <jacoco.version>0.5.3.201107060350</jacoco.version>
     <enforcer.version>1.3.1</enforcer.version>
+    <bundle.plugin.version>2.3.7</bundle.plugin.version>
   </properties>
 
   <pluginRepositories>
index bef02e4..68fae64 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index c656ce1..66473e2 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 4cc14b3..7029f49 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 788af16..106d14d 100644 (file)
@@ -14,6 +14,7 @@ import java.util.Map;
 import java.util.Set;
 
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.Status;
 
index 5df2b0b..5571d94 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 2d5f80f..1beb7fe 100644 (file)
@@ -35,12 +35,12 @@ import org.eclipse.osgi.framework.console.CommandProvider;
 import org.opendaylight.controller.clustering.services.ICacheUpdateAware;
 import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.clustering.services.ICoordinatorChangeAware;
-import org.opendaylight.controller.connectionmanager.ConnectionLocality;
 import org.opendaylight.controller.connectionmanager.ConnectionMgmtScheme;
 import org.opendaylight.controller.connectionmanager.IConnectionManager;
 import org.opendaylight.controller.connectionmanager.scheme.AbstractScheme;
 import org.opendaylight.controller.connectionmanager.scheme.SchemeFactory;
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.sal.connection.IConnectionListener;
 import org.opendaylight.controller.sal.connection.IConnectionService;
 import org.opendaylight.controller.sal.core.Node;
index 062fd1e..d7b1968 100644 (file)
@@ -14,8 +14,8 @@ import org.opendaylight.controller.clustering.services.CacheConfigException;
 import org.opendaylight.controller.clustering.services.CacheExistException;
 import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
 import org.opendaylight.controller.clustering.services.IClusterServices;
-import org.opendaylight.controller.connectionmanager.ConnectionLocality;
 import org.opendaylight.controller.connectionmanager.ConnectionMgmtScheme;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
index 2b207aa..891c44d 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 5af8e22..7900ce8 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index ba71dbf..805f2a7 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 4589148..2304e6b 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 73ba8b9..253906e 100644 (file)
@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index d146eea..e7faf73 100644 (file)
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
@@ -62,6 +62,7 @@
               org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.utils,
               org.opendaylight.controller.sal.packet,
+              org.opendaylight.controller.sal.connection,
               org.opendaylight.controller.forwardingrulesmanager,
               org.opendaylight.controller.connectionmanager,
               javax.xml.bind.annotation,
       <artifactId>sal</artifactId>
       <version>0.5.0-SNAPSHOT</version>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal.connection</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>forwardingrulesmanager</artifactId>
index a51409f..0c105ba 100644 (file)
@@ -87,7 +87,8 @@ final class FlowEntryDistributionOrderFutureTask implements Future<Status> {
             // Return the known status
             return retStatus;
         } else {
-            logger.error("Timing out, the workStatus for order {} has not come back in time!", this.order);
+            logger.error("Timing out, the workStatus for order {} has not come back in time!, it's hashcode is {}",
+                    this.order, this.order.hashCode());
             return new Status(StatusCode.TIMEOUT);
         }
     }
index 9c2afe4..3c936de 100644 (file)
@@ -39,7 +39,7 @@ import org.opendaylight.controller.clustering.services.ICacheUpdateAware;
 import org.opendaylight.controller.clustering.services.IClusterContainerServices;
 import org.opendaylight.controller.clustering.services.IClusterServices;
 import org.opendaylight.controller.configuration.IConfigurationContainerAware;
-import org.opendaylight.controller.connectionmanager.ConnectionLocality;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.connectionmanager.IConnectionManager;
 import org.opendaylight.controller.forwardingrulesmanager.FlowConfig;
 import org.opendaylight.controller.forwardingrulesmanager.FlowEntry;
index 49a3ff5..322792d 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index e93559b..3e7a1df 100644 (file)
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 72b671c..f93b804 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index dfc2955..85f3ca8 100644 (file)
@@ -41,7 +41,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index a6c4a7c..664415e 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 18b338b..583a7ac 100644 (file)
@@ -6,6 +6,11 @@
         <groupId>org.opendaylight.controller.model</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>model-flow-service</artifactId>
@@ -28,4 +33,4 @@
         </dependency>
     </dependencies>
     <packaging>bundle</packaging>
-</project>
\ No newline at end of file
+</project>
index 2874122..f7d9241 100644 (file)
@@ -21,7 +21,7 @@
     <properties>
         <yang.version>0.5.7-SNAPSHOT</yang.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.bundle.version>2.4.0</maven.bundle.version>
+        <bundle.plugin.version>2.3.7</bundle.plugin.version>
     </properties>
 
     <modules>
@@ -37,7 +37,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>${maven.bundle.version}</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
index bf1b95d..33ec999 100644 (file)
@@ -34,7 +34,7 @@
                <slf4j.version>1.7.2</slf4j.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
                <yang.version>0.5.8-SNAPSHOT</yang.version>
-               <maven.bundle.version>2.4.0</maven.bundle.version>
+               <bundle.plugin.version>2.3.7</bundle.plugin.version>
         <releaseplugin.version>2.3.2</releaseplugin.version>
         <guava.version>14.0.1</guava.version>
         <osgi.core.version>5.0.0</osgi.core.version>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${maven.bundle.version}</version>
+                               <version>${bundle.plugin.version}</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <instructions>
index 8e06c9d..29ba03b 100644 (file)
@@ -19,6 +19,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
index 40301a3..edb3b19 100644 (file)
@@ -7,6 +7,11 @@
                <version>1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sal-compability</artifactId>
+    <scm>
+      <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+      <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+      <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:MD-SAL</url>
+    </scm>
 
        <dependencies>
                <dependency>
index 5aa3c32..2e8637a 100644 (file)
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
         <enunciate.version>1.26.2</enunciate.version>\r
     </properties>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
 \r
     <distributionManagement>\r
         <!-- OpenDayLight Released artifact -->\r
index a905ebf..7f925ba 100644 (file)
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
         <enunciate.version>1.26.2</enunciate.version>\r
     </properties>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
     <distributionManagement>\r
         <!-- OpenDayLight Released artifact -->\r
         <repository>\r
index 2c96ec2..685de7d 100644 (file)
@@ -22,7 +22,7 @@
        <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index ceea28e..78812d4 100644 (file)
@@ -22,7 +22,7 @@
        <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index ff40ba0..dda6a0f 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 75341a6..74e4ed8 100644 (file)
@@ -7,6 +7,11 @@
     <version>1.4.0-SNAPSHOT</version>
     <relativePath>../../commons/opendaylight</relativePath>
   </parent>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>containermanager.northbound</artifactId>
@@ -23,7 +28,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index addf857..bfd2eb6 100644 (file)
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index e0315fb..53af293 100644 (file)
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index c1eb56a..e845daa 100644 (file)
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 6a143d9..30426be 100644 (file)
         <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>\r
         <enunciate.version>1.26.2</enunciate.version>\r
     </properties>\r
+  <scm>\r
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>\r
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>\r
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>\r
+  </scm>\r
 \r
     <distributionManagement>\r
         <!-- OpenDayLight Released artifact -->\r
@@ -79,7 +84,7 @@
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <artifactId>containermanager</artifactId>\r
-            <version>0.4.0-SNAPSHOT</version>\r
+            <version>0.5.0-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.opendaylight.controller</groupId>\r
             <version>2.5.0</version>\r
         </dependency>\r
     </dependencies>\r
-</project>
\ No newline at end of file
+</project>\r
index 2505da6..b77536b 100644 (file)
@@ -103,11 +103,11 @@ public class NeutronNetworksNorthbound {
             Boolean bShared = null;\r
             Boolean bRouterExternal = null;\r
             if (queryAdminStateUp != null)\r
-                bAdminStateUp = new Boolean(queryAdminStateUp);\r
+                bAdminStateUp = Boolean.valueOf(queryAdminStateUp);\r
             if (queryShared != null)\r
-                bShared = new Boolean(queryShared);\r
+                bShared = Boolean.valueOf(queryShared);\r
             if (queryRouterExternal != null)\r
-                bRouterExternal = new Boolean(queryRouterExternal);\r
+                bRouterExternal = Boolean.valueOf(queryRouterExternal);\r
             if ((queryID == null || queryID.equals(oSN.getID())) &&\r
                     (queryName == null || queryName.equals(oSN.getNetworkName())) &&\r
                     (bAdminStateUp == null || bAdminStateUp.booleanValue() == oSN.isAdminStateUp()) &&\r
index 1028ca5..73d85b2 100644 (file)
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 74f64c2..b2fd422 100644 (file)
@@ -33,7 +33,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index ba58e06..693f7eb 100644 (file)
@@ -48,7 +48,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 401cc94..8ca712f 100644 (file)
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index d379164..d15e4e0 100644 (file)
@@ -34,7 +34,7 @@
       <plugin>
           <groupId>org.apache.felix</groupId>
           <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.3.6</version>
+          <version>${bundle.plugin.version}</version>
           <extensions>true</extensions>
           <configuration>
           <instructions>
index ce22ddf..a9990ab 100644 (file)
@@ -24,7 +24,7 @@
                         <plugin>
                                 <groupId>org.apache.felix</groupId>
                                 <artifactId>maven-bundle-plugin</artifactId>
-                                <version>2.3.6</version>
+                                <version>${bundle.plugin.version}</version>
                                 <extensions>true</extensions>
                                 <configuration>
                                         <instructions>
index c93d4b6..a7f4db8 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 6401ec5..a920adf 100644 (file)
@@ -26,6 +26,7 @@ import org.opendaylight.controller.protocol_plugin.openflow.core.IController;
 import org.opendaylight.controller.protocol_plugin.openflow.core.IMessageListener;
 import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitch;
 import org.opendaylight.controller.protocol_plugin.openflow.core.ISwitchStateListener;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.sal.connection.IPluginOutConnectionService;
 import org.opendaylight.controller.sal.core.Actions;
 import org.opendaylight.controller.sal.core.Buffers;
@@ -259,7 +260,11 @@ public class InventoryServiceShim implements IContainerListener,
         }
 
         // Add this node
-        addNode(sw);
+        if (connectionOutService.getLocalityStatus(node) != ConnectionLocality.NOT_CONNECTED) {
+            addNode(sw);
+        } else {
+            logger.debug("Skipping node addition due to Connectivity Status : {}", connectionOutService.getLocalityStatus(node).name());
+        }
     }
 
     @Override
index bd3c2a2..f8c3d59 100644 (file)
@@ -303,12 +303,6 @@ public class V6StatsReply extends OFVendorStatistics {
             this.actions = this.actionFactory.parseActions(data, action_len);
     }
 
-    @Override
-    public void writeTo(ByteBuffer data) {
-        super.writeTo(data);//TBD. This Fn needs work. Should never get called though.
-
-    }
-
     @Override
     public int hashCode() {
         final int prime = 31;
index 7f55659..b17d63d 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 37d3e2f..77330fd 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 32da9f3..9b7e3dd 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index c3f40aa..00fda77 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index 456acf0..16e2154 100644 (file)
@@ -22,4 +22,6 @@ public interface IPluginOutConnectionService {
      * @return true if node is local to this controller. false otherwise.
      */
     public boolean isLocal(Node node);
+
+    public ConnectionLocality getLocalityStatus(Node node);
 }
\ No newline at end of file
index 44f793a..f2817eb 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index e2132fb..1c7e2c0 100644 (file)
@@ -16,6 +16,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import org.opendaylight.controller.sal.connection.ConnectionConstants;
+import org.opendaylight.controller.sal.connection.ConnectionLocality;
 import org.opendaylight.controller.sal.connection.IConnectionListener;
 import org.opendaylight.controller.sal.connection.IConnectionService;
 import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
@@ -104,6 +105,12 @@ public class ConnectionService implements IPluginOutConnectionService, IConnecti
         return connectionListener.isLocal(node);
     }
 
+    @Override
+    public ConnectionLocality getLocalityStatus(Node node) {
+        if (this.connectionListener == null) return ConnectionLocality.NOT_CONNECTED;
+        return connectionListener.getLocalityStatus(node);
+    }
+
     @Override
     public Node connect (String type, String connectionIdentifier, Map<ConnectionConstants, String> params) {
         IPluginInConnectionService s = pluginService.get(type);
index dddc3c3..b44e855 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index 1f6f9cd..d114338 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index 48e0ff6..190c74c 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>\r
         <groupId>org.apache.felix</groupId>\r
         <artifactId>maven-bundle-plugin</artifactId>\r
-        <version>2.3.6</version>\r
+        <version>${bundle.plugin.version}</version>\r
         <extensions>true</extensions>\r
         <configuration>\r
           <instructions>\r
index 81a078a..c4d8686 100644 (file)
@@ -24,7 +24,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index e001dc8..c24ba8a 100644 (file)
@@ -34,7 +34,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 552ff88..87036cd 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 3c2cb8e..9c5b89b 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index bddcc2a..b972f5d 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index d7dea84..4d47312 100644 (file)
@@ -39,7 +39,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 14a056d..3c2be90 100644 (file)
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index ee126f3..68dae26 100644 (file)
@@ -40,7 +40,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 399f878..ebf9dbc 100755 (executable)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index eb4bea5..fbf374f 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 25e558e..49a4e77 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 5a1968d..541dbca 100644 (file)
@@ -25,7 +25,7 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.3.6</version>
+                <version>${bundle.plugin.version}</version>
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
index ac52095..c0555d9 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 0f1f0cf..8dd5777 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 641f32f..05a8f5b 100644 (file)
@@ -23,7 +23,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index c4c66e4..7ad2df3 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 2be78c4..6b87e74 100644 (file)
@@ -22,7 +22,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
-        <version>2.3.6</version>
+        <version>${bundle.plugin.version}</version>
         <extensions>true</extensions>
         <configuration>
           <instructions>
index 0789d50..569921c 100644 (file)
@@ -7,6 +7,11 @@
     <version>1.1.0-SNAPSHOT</version>
     <relativePath>../commons/thirdparty</relativePath>
   </parent>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.controller.thirdparty</groupId>
   <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>