From: Michal Rehak <mirehak@cisco.com>
Date: Tue, 22 Apr 2014 13:41:28 +0000 (+0200)
Subject: improve -of13 switching in distributions/base (BUG 802)
X-Git-Tag: release/lithium-sr2~165
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=5114dc3e74dc6c0d051a4454f7a1de926f98ef8e

improve -of13 switching in distributions/base (BUG 802)

- if of13 is not involved, remove openflowplugin config
- if of13 is involved, create symbolic link to openflowplugin config

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

diff --git a/distributions/base/src/assemble/bin.xml b/distributions/base/src/assemble/bin.xml
index eb621150..215b5bcf 100644
--- a/distributions/base/src/assemble/bin.xml
+++ b/distributions/base/src/assemble/bin.xml
@@ -48,8 +48,8 @@
       </excludes>
     </fileSet>
     <fileSet>
-      <directory>${project.build.directory}/provided-configs</directory>
-      <outputDirectory>/opendaylight/configuration</outputDirectory>
+      <directory>${project.build.directory}/provided-configs/initial</directory>
+      <outputDirectory>/opendaylight/configuration/initial.available</outputDirectory>
       <excludes>
         <exclude>**/META-INF/**</exclude>
       </excludes>
diff --git a/distributions/base/src/assemble/resources/run.sh b/distributions/base/src/assemble/resources/run.sh
index ba8d9c5b..4f8d8159 100755
--- a/distributions/base/src/assemble/resources/run.sh
+++ b/distributions/base/src/assemble/resources/run.sh
@@ -25,10 +25,16 @@ while true ; do
     esac
 done
 
+# clean available optional configurations (links)
+find configuration/initial -type l -exec rm {} \;
+
 # OF Filter selection
 OF_FILTER="org.opendaylight.(openflowplugin|openflowjava)"
-if [ $OF13 -ne 0 ]; then
+if (( $OF13 != 0 )); then
     OF_FILTER="org.opendaylight.controller.(thirdparty.org.openflow|protocol_plugins.openflow)"
+    while read ofConfig; do
+        ln -s ../initial.available/$(basename ${ofConfig}) configuration/initial/
+    done < <(find configuration/initial.available -name '*openflowplugin.xml')
 fi
 
 # Make sure we suck out our additional args so as to not confuse