From 8cf76973848254c17175f6fb5093ed069ea2805e Mon Sep 17 00:00:00 2001
From: Andrej Leitner <andrej.leitner@pantheon.tech>
Date: Thu, 1 Dec 2016 09:28:46 +0100
Subject: [PATCH] Fix default/legacy openflow ports

Change-Id: I9718d09c389689ec5fc0a45a4a116aabab15410e
Signed-off-by: Andrej Leitner <andrej.leitner@pantheon.tech>
---
 .../resources/initial/default-openflow-connection-config.xml  | 2 +-
 .../resources/initial/legacy-openflow-connection-config.xml   | 2 +-
 .../resources/org/opendaylight/blueprint/openflowjava.xml     | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/openflowjava-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml b/openflowjava-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
index 48f8bf55..08b8a52e 100644
--- a/openflowjava-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
+++ b/openflowjava-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
@@ -1,6 +1,6 @@
 <switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
   <instance-name>openflow-switch-connection-provider-default-impl</instance-name>
-  <port>6633</port>
+  <port>6653</port>
   <transport-protocol>TCP</transport-protocol>
   <tls>
      <keystore>configuration/ssl/ctl.jks</keystore>
diff --git a/openflowjava-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml b/openflowjava-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
index 7772ecc8..13860139 100644
--- a/openflowjava-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
+++ b/openflowjava-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
@@ -1,6 +1,6 @@
 <switch-connection-config xmlns="urn:opendaylight:params:xml:ns:yang:openflow:switch:connection:config">
   <instance-name>openflow-switch-connection-provider-legacy-impl</instance-name>
-  <port>6653</port>
+  <port>6633</port>
   <transport-protocol>TCP</transport-protocol>
   <tls>
      <keystore>configuration/ssl/ctl.jks</keystore>
diff --git a/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml b/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml
index 2cd5a070..e1d3c000 100644
--- a/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml
+++ b/openflowjava-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowjava.xml
@@ -5,7 +5,7 @@
   <reference id="switchConnectionProviderFactory" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"
           odl:type="default"/>
 
-  <!-- Create OF switch connection provider on port 6633 -->
+  <!-- Create OF switch connection provider on port 6653 (default) -->
   <odl:clustered-app-config id="defaultSwitchConnConfig" default-config-file-name="default-openflow-connection-config.xml"
       binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
       list-key-value="openflow-switch-connection-provider-default-impl">
@@ -18,7 +18,7 @@
   <service ref="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
           odl:type="openflow-switch-connection-provider-default-impl"/>
 
-  <!-- Create OF switch connection provider on port 6653 -->
+  <!-- Create OF switch connection provider on port 6633 (legacy) -->
   <odl:clustered-app-config id="legacySwitchConnConfig" default-config-file-name="legacy-openflow-connection-config.xml"
       binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow._switch.connection.config.rev160506.SwitchConnectionConfig"
       list-key-value="openflow-switch-connection-provider-legacy-impl">
-- 
2.36.6