Revert "Move the Openflow connections blueprint to OpenflowJava project"

This reverts commit f44ebeb5ca3e25ff4c863f374ed8b9b33466e991.

Change-Id: Ib95293482546888bbe678bf60c29c14fe4f972b3
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>

diff --git a/features/pom.xml b/features/pom.xml
index 64b1196dab8fb3ef8dce9c6e62d87c33a40ac64d..d2b9b2fda55db75d13d727f72669c2ccb592340a 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -174,6 +174,21 @@
             <type>cfg</type>
             <classifier>config</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowplugin</groupId>
+            <artifactId>openflowplugin-blueprint-config</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>legacyConfig</classifier>
+        </dependency>
+
         <dependency>
             <groupId>org.opendaylight.dlux</groupId>
             <artifactId>features-dlux</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 4a17a37b372b8e030a10c7d85778b4b7ba630a64..2c8fc6642f5cc2f3f8f61c7769067b5ed646172c 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -50,6 +50,8 @@
         <bundle>mvn:org.opendaylight.controller/liblldp/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}</bundle>
         <configfile finalname="etc/org.opendaylight.openflowplugin.cfg">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/cfg/config</configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/default-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/datastore/initial/config/legacy-openflow-connection-config.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-blueprint-config/{{VERSION}}/xml/legacyConfig</configfile>
         <configfile finalname="etc/opendaylight/karaf/42-openflowplugin-Li.xml">mvn:org.opendaylight.openflowplugin/openflowplugin-controller-config/{{VERSION}}/xml/config-Li</configfile>
     </feature>
 

diff --git a/openflowplugin-blueprint-config/pom.xml b/openflowplugin-blueprint-config/pom.xml
index f4d7167a7f9f45ea0270126317f5a28e8eaf7eef..172a504251c3647dca42404e4e7a6995fac06561 100644 (file)
--- a/openflowplugin-blueprint-config/pom.xml
+++ b/openflowplugin-blueprint-config/pom.xml
@@ -43,6 +43,16 @@
                                <type>cfg</type>
                                <classifier>config</classifier>
                            </artifact>
+                           <artifact>
+                               <file>${project.build.directory}/classes/initial/default-openflow-connection-config.xml</file>
+                               <type>xml</type>
+                               <classifier>config</classifier>
+                           </artifact>
+                           <artifact>
+                               <file>${project.build.directory}/classes/initial/legacy-openflow-connection-config.xml</file>
+                               <type>xml</type>
+                               <classifier>legacyConfig</classifier>
+                           </artifact>
                        </artifacts>
                    </configuration>
                </execution>

diff --git a/openflowplugin-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml b/openflowplugin-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
new file mode 100644 (file)
index 0000000..48f8bf5
--- /dev/null
+++ b/openflowplugin-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
@@ -0,0 +1,17 @@
+<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>
+  <transport-protocol>TCP</transport-protocol>
+  <tls>
+     <keystore>configuration/ssl/ctl.jks</keystore>
+     <keystore-type>JKS</keystore-type>
+     <keystore-path-type>PATH</keystore-path-type>
+     <keystore-password>opendaylight</keystore-password>
+     <truststore>configuration/ssl/truststore.jks</truststore>
+     <truststore-type>JKS</truststore-type>
+     <truststore-path-type>PATH</truststore-path-type>
+     <truststore-password>opendaylight</truststore-password>
+     <certificate-password>opendaylight</certificate-password>
+     <cipher-suites></cipher-suites>
+  </tls>
+</switch-connection-config>
\ No newline at end of file

diff --git a/openflowplugin-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml b/openflowplugin-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
new file mode 100644 (file)
index 0000000..7772ecc
--- /dev/null
+++ b/openflowplugin-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
@@ -0,0 +1,17 @@
+<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>
+  <transport-protocol>TCP</transport-protocol>
+  <tls>
+     <keystore>configuration/ssl/ctl.jks</keystore>
+     <keystore-type>JKS</keystore-type>
+     <keystore-path-type>PATH</keystore-path-type>
+     <keystore-password>opendaylight</keystore-password>
+     <truststore>configuration/ssl/truststore.jks</truststore>
+     <truststore-type>JKS</truststore-type>
+     <truststore-path-type>PATH</truststore-path-type>
+     <truststore-password>opendaylight</truststore-password>
+     <certificate-password>opendaylight</certificate-password>
+     <cipher-suites></cipher-suites>
+  </tls>
+</switch-connection-config>
\ No newline at end of file

diff --git a/openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml b/openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
index d6f0c360d94e6273df7fca7810f9f9ea03cc6f93..bd72c349c703fd9cb8d86699d3f5239ee4d35890 100644 (file)
--- a/openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
+++ b/openflowplugin-blueprint-config/src/main/resources/org/opendaylight/blueprint/openflowplugin.xml
@@ -11,11 +11,34 @@
   <reference id="entityOwnershipService" interface="org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService"/>
   <reference id="clusterSingletonServiceProvider" interface="org.opendaylight.mdsal.singleton.common.api.ClusterSingletonServiceProvider"/>
 
-  <reference id="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
-   odl:type="openflow-switch-connection-provider-default-impl"/>
+  <reference id="switchConnProviderFactory"
+          interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
 
-  <reference id="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
-   odl:type="openflow-switch-connection-provider-legacy-impl"/>
+  <!-- Create OF switch connection provider on port 6633 -->
+  <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">
+  </odl:clustered-app-config>
+
+  <bean id="defaultSwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
+    <argument ref="defaultSwitchConnConfig"/>
+  </bean>
+
+  <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 -->
+  <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">
+  </odl:clustered-app-config>
+
+  <bean id="legacySwitchConnProvider" factory-ref="switchConnProviderFactory" factory-method="newInstance">
+    <argument ref="legacySwitchConnConfig"/>
+  </bean>
+
+  <service ref="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+          odl:type="openflow-switch-connection-provider-legacy-impl"/>
 
   <!-- Create OpenflowPluginProvider instance -->