removing legacy listener on port 6633

REQUIREMENT: remove org.opendaylight.controller:protocol_plugins.openflow from
org.opendaylight.controller:distribution.opendaylight artifact

Change-Id: Ifc101ca567eb6ae3f7f40655c2171d0870c0ab6d
Signed-off-by: Michal Rehak <mirehak@cisco.com>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/core/internal/Controller.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/core/internal/Controller.java
index 6ede781fc75203fc07759d0aac6fb01d7c6aff31..cccff3683cf3f827bda812b99260f0859e910af4 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/core/internal/Controller.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/core/internal/Controller.java
@@ -132,20 +132,20 @@ public class Controller implements IController, CommandProvider, IPluginInConnec
      *
      */
     public void start() {
-        logger.debug("Starting!");
+        logger.debug("Starting! - omitting whole startup");
         /*
          * start a thread to handle event coming from the switch
          */
-        switchEventThread = new Thread(new EventHandler(), "SwitchEvent Thread");
-        switchEventThread.start();
-
-        // spawn a thread to start to listen on the open flow port
-        controllerIO = new ControllerIO(this);
-        try {
-            controllerIO.start();
-        } catch (IOException ex) {
-            logger.error("Caught exception while starting:", ex);
-        }
+//        switchEventThread = new Thread(new EventHandler(), "SwitchEvent Thread");
+//        switchEventThread.start();
+//
+//        // spawn a thread to start to listen on the open flow port
+//        controllerIO = new ControllerIO(this);
+//        try {
+//            controllerIO.start();
+//        } catch (IOException ex) {
+//            logger.error("Caught exception while starting:", ex);
+//        }
     }
 
     /**

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConfigurationFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConfigurationFactory.java
index 9d5fad43b24ceae9b775b4488bfc4161a94209d0..b2f8d312b390a742a21504ac743bd39f8af56ecd 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConfigurationFactory.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConfigurationFactory.java
@@ -61,5 +61,45 @@ public abstract class ConnectionConfigurationFactory {
             }
         };
     }
+    
+    /**
+     * @return default connection configuration
+     */
+    public static ConnectionConfiguration getLegacy() {
+        return new ConnectionConfiguration() {
+
+            @Override
+            public InetAddress getAddress() {
+                // all interfaces
+                return null;
+            }
+
+            @Override
+            public int getPort() {
+                return LEGACY_OF_PORT;
+            }
+
+            @Override
+            public FEATURE_SUPPORT getTlsSupport() {
+                return FEATURE_SUPPORT.NOT_SUPPORTED;
+            }
+
+            @Override
+            public Object getTransferProtocol() {
+                // TODO:: TCP/UDP ...
+                return null;
+            }
+
+            @Override
+            public long getSwitchIdleTimeout() {
+                return 5000;
+            }
+
+            @Override
+            public Object getSslContext() {
+                return null;
+            }
+        };
+    }
 
 }

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
index dadd6dab2042db20c0eb611505825009ed118f0e..ea3cc66f6152ee955f3dc0a99ef991be49de7bc3 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java
@@ -143,7 +143,8 @@ public class MDController implements IMDController {
     private static Collection<ConnectionConfiguration> getConnectionConfiguration() {
         // TODO:: get config from state manager
         ConnectionConfiguration configuration = ConnectionConfigurationFactory.getDefault();
-        return Lists.newArrayList(configuration);
+        ConnectionConfiguration configurationLegacy = ConnectionConfigurationFactory.getLegacy();
+        return Lists.newArrayList(configuration, configurationLegacy);
     }
 
     /**