Remove sal.connectionservice

Patch Set 4: Add ConnectionConstants.
Patch Set 5: Add pom files.

Change-Id: Ifde85d6a76fbec683f7cb7563802ca8e61c30e9c
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/integrationtest/pom.xml b/commons/integrationtest/pom.xml
index ba4a7854969ec5bd8f70652f906d0b3a8e613e0e..59c920d6a5685dc3ca6dd821db8361df8cb406b0 100644 (file)
--- a/commons/integrationtest/pom.xml
+++ b/commons/integrationtest/pom.xml
@@ -537,16 +537,6 @@
       <artifactId>sal</artifactId>
       <version>${sal.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.connection</artifactId>
-      <version>${sal.connection.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.connection.implementation</artifactId>
-      <version>${sal.connection.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal.implementation</artifactId>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 6054db38ee96310f56c0a0a11a8b9a5c9955cb49..11077c398a4407e3ce0d1d940a57e42f50d21861 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -56,7 +56,6 @@
     <networkconfig.neutron.version>0.5.0-SNAPSHOT</networkconfig.neutron.version>
     <clustering.services.version>0.6.0-SNAPSHOT</clustering.services.version>
     <sal.version>0.9.0-SNAPSHOT</sal.version>
-    <sal.connection.version>0.2.0-SNAPSHOT</sal.connection.version>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
     <openflowplugin.version>0.1.0-SNAPSHOT</openflowplugin.version>
@@ -134,11 +133,6 @@
         <artifactId>sal-common-api</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>sal.connection</artifactId>
-        <version>${sal.connection.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>containermanager</artifactId>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
index 6da1be63537f1b64c39d1f8aea2bedafb7dd200f..233210fa63d6c55b4a7d382680e6db6722b15fc1 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/ConfigurationBundles.java
@@ -48,8 +48,6 @@ public class ConfigurationBundles {
                 mavenBundle("org.opendaylight.controller", "containermanager").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "containermanager.it.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "sal").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller", "sal.connection").versionAsInProject(),
-                mavenBundle("org.opendaylight.controller", "sal.connection.implementation").versionAsInProject(),
                 mavenBundle("org.opendaylight.controller", "sal.implementation").versionAsInProject(),
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
                 mavenBundle("org.slf4j", "slf4j-api").versionAsInProject()

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java
index b8afbd3516a451ced9687ef845ac5e61f4753191..df3000bd972e416a9bfb02c0a0edb16ce1b7d285 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/OvsdbIntegrationTestBase.java
@@ -29,12 +29,12 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
-import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.OvsdbClient;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
 import org.opendaylight.ovsdb.lib.OvsdbConnectionListener;
+import org.opendaylight.ovsdb.plugin.api.ConnectionConstants;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
 
 import org.junit.Rule;

diff --git a/plugin/pom.xml b/plugin/pom.xml
index af60ddfd44aa56eddd60de560aed095c277d2948..0ccdf2f91d498507529ac6bbaefb4816a881873b 100755 (executable)
--- a/plugin/pom.xml
+++ b/plugin/pom.xml
@@ -47,10 +47,6 @@
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>sal.connection</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>library</artifactId>
@@ -96,7 +92,6 @@
               org.opendaylight.controller.sal.inventory,
               org.opendaylight.controller.sal.match,
               org.opendaylight.controller.sal.utils,
-              org.opendaylight.controller.sal.connection,
               org.opendaylight.ovsdb.lib.error,
               org.opendaylight.ovsdb.lib.notation,
               org.opendaylight.ovsdb.lib.operations,

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/ConnectionConstants.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/ConnectionConstants.java
new file mode 100644 (file)
index 0000000..139dd29
--- /dev/null
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/ConnectionConstants.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
+package org.opendaylight.ovsdb.plugin.api;
+
+/**
+ * ConnectionConstants
+ * Expand this enum as and when needed to support other connection parameters that
+ * might be needed for certain protocol plugins.
+ */
+public enum ConnectionConstants {
+    ADDRESS("address"),
+    PORT("port"),
+    PROTOCOL("protocol"),
+    USERNAME("username"),
+    PASSWORD("password");
+
+    private ConnectionConstants(String name) {
+        this.name = name;
+    }
+
+    private String name;
+
+    public String toString() {
+        return name;
+    }
+}

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java
index 4ad98e5766e7765b234f7f014551c2d1cdb44b2f..d86c0dad146b4d49551a241cf1b2eef3aac23122 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/api/OvsdbConnectionService.java
@@ -12,7 +12,6 @@ package org.opendaylight.ovsdb.plugin.api;
 import java.util.List;
 import java.util.Map;
 
-import org.opendaylight.controller.sal.connection.ConnectionConstants;
 import org.opendaylight.controller.sal.core.Node;
 
 public interface OvsdbConnectionService {

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java
index 31c64406f0c395d5373bc797ace3337197513064..1ed88d732068567e591b9692e9aa767e331a6f01 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/impl/ConnectionServiceImpl.java
@@ -23,8 +23,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
-import org.opendaylight.controller.sal.connection.ConnectionConstants;
-import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.Property;
 import org.opendaylight.controller.sal.utils.Status;
@@ -42,6 +40,7 @@ import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
 import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
 import org.opendaylight.ovsdb.lib.schema.TableSchema;
 import org.opendaylight.ovsdb.plugin.api.Connection;
+import org.opendaylight.ovsdb.plugin.api.ConnectionConstants;
 import org.opendaylight.ovsdb.plugin.internal.IPAddressProperty;
 import org.opendaylight.ovsdb.plugin.internal.L4PortProperty;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
@@ -57,8 +56,7 @@ import com.google.common.collect.Lists;
  * Represents the openflow plugin component in charge of programming the flows
  * the flow programming and relay them to functional modules above SAL.
  */
-public class ConnectionServiceImpl implements IPluginInConnectionService,
-                                              OvsdbConnectionService,
+public class ConnectionServiceImpl implements OvsdbConnectionService,
                                               OvsdbConnectionListener {
     protected static final Logger logger = LoggerFactory.getLogger(ConnectionServiceImpl.class);
 
@@ -111,6 +109,7 @@ public class ConnectionServiceImpl implements IPluginInConnectionService,
         /* Then get connection clients */
         Collection<OvsdbClient> connections = connectionLib.getConnections();
         for (OvsdbClient client : connections) {
+            logger.info("CONNECT start connected clients client = {}", client);
             this.connected(client);
         }
     }
@@ -126,7 +125,6 @@ public class ConnectionServiceImpl implements IPluginInConnectionService,
         }
     }
 
-    @Override
     public Status disconnect(Node node) {
         String identifier = (String) node.getID();
         Connection connection = ovsdbConnections.get(identifier);
@@ -140,7 +138,6 @@ public class ConnectionServiceImpl implements IPluginInConnectionService,
         }
     }
 
-    @Override
     public Node connect(String identifier, Map<ConnectionConstants, String> params) {
         InetAddress address;
         Integer port;
@@ -193,14 +190,6 @@ public class ConnectionServiceImpl implements IPluginInConnectionService,
         return nodes;
     }
 
-    @Override
-    public void notifyClusterViewChanged() {
-    }
-
-    @Override
-    public void notifyNodeDisconnectFromMaster(Node arg0) {
-    }
-
     private Node handleNewConnection(String identifier, OvsdbClient client) throws InterruptedException, ExecutionException {
         Connection connection = new Connection(identifier, client);
         Node node = connection.getNode();

diff --git a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
index 04db192b30b17eb1540c911877ceb39e72c54fbe..ab85910ae2fd07c25f2d74851b81244f585a3800 100644 (file)
--- a/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/internal/Activator.java
@@ -13,7 +13,6 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 
 import org.apache.felix.dm.Component;
-import org.opendaylight.controller.sal.connection.IPluginInConnectionService;
 import org.opendaylight.controller.sal.core.ComponentActivatorAbstractBase;
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;
@@ -99,8 +98,7 @@ public class Activator extends ComponentActivatorAbstractBase {
             // by SAL
             props.put(GlobalConstants.PROTOCOLPLUGINTYPE.toString(), "OVS");
             c.setInterface(
-                    new String[] {IPluginInConnectionService.class.getName(),
-                                  OvsdbConnectionService.class.getName(),
+                    new String[] {OvsdbConnectionService.class.getName(),
                                   OvsdbConnectionListener.class.getName()}, props);
             c.add(createServiceDependency()
                     .setService(OvsdbInventoryService.class)

diff --git a/pom.xml b/pom.xml
index 202cddd4487d9c5eb52c146ea62a228b92b55dcc..8833db4a6fc265519ff0f92f447aa2d050192a74 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
     <module>features/ovsdb</module>
     <module>features/ovs-sfc</module>
     <!-- OVSDB Distribution -->
-    <!-- <module>distribution/opendaylight</module> -->
     <module>distribution/opendaylight-karaf</module>
   </modules>