From: Michal Polkorab <michal.polkorab@pantheon.sk>
Date: Wed, 19 Oct 2016 13:04:51 +0000 (+0200)
Subject: Revert "Revert "Move the Openflow connections blueprint to OpenflowJava project""
X-Git-Tag: release/carbon~133
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0a691e587c2af9095b9cc4629cc955f76a7093cc;p=openflowplugin.git

Revert "Revert "Move the Openflow connections blueprint to OpenflowJava project""

This reverts commit e84b8d9e2c0e38a950db4295a61b24dd77538e01.

Change-Id: I1c79ddcb0041d4599e82fa5f6ed227d530dfab97
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
---

diff --git a/features-he/pom.xml b/features-he/pom.xml
index 06fa13b97d..7cbe817735 100644
--- a/features-he/pom.xml
+++ b/features-he/pom.xml
@@ -188,6 +188,25 @@
             <artifactId>openflowplugin-blueprint-config-he</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.version}</version>
+            <type>xml</type>
+            <classifier>config</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.version}</version>
+            <type>xml</type>
+            <classifier>legacyConfig</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin.applications</groupId>
             <artifactId>table-miss-enforcer</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index d2b9b2fda5..258d360cea 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -175,20 +175,24 @@
             <classifier>config</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-blueprint-config</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.version}</version>
             <type>xml</type>
             <classifier>config</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>openflowplugin-blueprint-config</artifactId>
-            <version>${project.version}</version>
+            <groupId>org.opendaylight.openflowjava</groupId>
+            <artifactId>openflowjava-blueprint-config</artifactId>
+            <version>${openflowjava.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 2c8fc6642f..4a17a37b37 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -50,8 +50,6 @@
         <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-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml b/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml
index 6ef2961be6..7d3801e256 100644
--- a/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml
+++ b/openflowplugin-blueprint-config-he/src/main/resources/org/opendaylight/blueprint/openflowplugin-helium.xml
@@ -31,48 +31,11 @@
     <argument ref="entityOwnershipService"/>
   </bean>
 
-  <reference id="switchConnProviderFactory"
-          interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
+  <reference id="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+             odl:type="openflow-switch-connection-provider-default-impl"/>
 
-  <!-- Create OF switch connection provider on port 6633 -->
-  <odl:clustered-app-config id="defaultSwitchConnConfig"
-      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:default-config><![CDATA[
-      <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>
-      </switch-connection-config>
-    ]]></odl:default-config>
-  </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"
-      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:default-config><![CDATA[
-      <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>
-      </switch-connection-config>
-    ]]></odl:default-config>
-  </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"/>
+  <reference id="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+             odl:type="openflow-switch-connection-provider-legacy-impl"/>
 
   <!-- Create OpenflowPluginProvider instance -->
 
diff --git a/openflowplugin-blueprint-config/pom.xml b/openflowplugin-blueprint-config/pom.xml
index 172a504251..f4d7167a7f 100644
--- a/openflowplugin-blueprint-config/pom.xml
+++ b/openflowplugin-blueprint-config/pom.xml
@@ -43,16 +43,6 @@
                                <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
deleted file mode 100644
index 48f8bf5580..0000000000
--- a/openflowplugin-blueprint-config/src/main/resources/initial/default-openflow-connection-config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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
deleted file mode 100644
index 7772ecc86d..0000000000
--- a/openflowplugin-blueprint-config/src/main/resources/initial/legacy-openflow-connection-config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<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 bd72c349c7..d6f0c360d9 100644
--- 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,34 +11,11 @@
   <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="switchConnProviderFactory"
-          interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProviderFactory"/>
+  <reference id="defaultSwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+   odl:type="openflow-switch-connection-provider-default-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"/>
+  <reference id="legacySwitchConnProvider" interface="org.opendaylight.openflowjava.protocol.spi.connection.SwitchConnectionProvider"
+   odl:type="openflow-switch-connection-provider-legacy-impl"/>
 
   <!-- Create OpenflowPluginProvider instance -->