BUG 7489: Add startup config file for elanmanager-config

This implements issue 2 mentioned in BUG 7489 by adding a new
configuration file in which user can specify default values for
elan-config at startup.

Note: Update-Strategy is set to None which means any runtime changes to
config will not be reflect till next restart

Path: etc/opendaylight/datastore/initial/config/
Config file name: netvirt-elanmanager-config.xml

Change-Id: I7e3c34166ffd3d8c72f860e1ea34a2c3cc79c309
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>

diff --git a/vpnservice/elanmanager/elanmanager-impl/pom.xml b/vpnservice/elanmanager/elanmanager-impl/pom.xml
index ad4f92212130789471e4ec35271d47549f6cccc0..6d527448a1337873e151acbceac7ab750beafd59 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/pom.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/pom.xml
@@ -158,6 +158,28 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
           <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-artifacts</id>
+            <goals>
+              <goal>attach-artifact</goal>
+            </goals>
+            <phase>package</phase>
+            <configuration>
+              <artifacts>
+                <artifact>
+                  <file>${project.build.directory}/classes/initial/netvirt-elanmanager-config.xml</file>
+                  <type>xml</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml
new file mode 100644 (file)
index 0000000..5821878
--- /dev/null
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/initial/netvirt-elanmanager-config.xml
@@ -0,0 +1,4 @@
+<elanmanager-config xmlns="urn:opendaylight:netvirt:elan:config">
+  <int-bridge-gen-mac>true</int-bridge-gen-mac>
+  <temp-smac-learn-timeout>10</temp-smac-learn-timeout>
+</elanmanager-config>

diff --git a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
index 6712bc6a0f537db7d7f760eaa5abefdccf146e99..4105009c49de2e4e004f34e4bc1e3e27cdf1026d 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/src/main/resources/org/opendaylight/blueprint/elanmanager.xml
@@ -24,6 +24,12 @@
   <odl:rpc-service id="idManagerService"
     interface="org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService" />
 
+  <odl:clustered-app-config id="elanConfig"
+                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig"
+                            default-config-file-name="netvirt-elanmanager-config.xml"
+                            update-strategy="none">
+  </odl:clustered-app-config>
+
   <bean id="elanBridgeManager" class="org.opendaylight.netvirt.elan.internal.ElanBridgeManager">
     <argument ref="dataBroker" />
   </bean>
@@ -194,10 +200,6 @@
     <argument ref="haEventHandler" />
   </bean>
 
-  <odl:clustered-app-config id="elanConfig"
-                            binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.config.rev150710.ElanConfig">
-  </odl:clustered-app-config>
-
   <bean id="ElanOvsdbNodeListener"
         class="org.opendaylight.netvirt.elan.internal.ElanOvsdbNodeListener"
         init-method="init" destroy-method="close">

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index 752f4e5e61fd04945309d81477c18159ffc2f496..f745b6bb28e5b469cc84be5976a458f2f447538f 100644 (file)
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -156,6 +156,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>elanmanager-impl</artifactId>
       <version>${elanmgr.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>elanmanager-impl</artifactId>
+      <version>${elanmgr.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>elanmanager-api</artifactId>

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index 71c730c1cd55e06bd159547a5863390087d06614..1d6962c42e15ab16f95c1be7f48c5afdf1396aec 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -80,6 +80,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>wrap:mvn:org.apache.thrift/libthrift/0.9.1$overwrite=merge&amp;Bundle-Version=0.9.1&amp;Export-Package=*;-noimport:=true;version="0.9.1"</bundle>
     <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml">mvn:org.opendaylight.netvirt/aclservice-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-dhcpservice-config.xml">mvn:org.opendaylight.netvirt/dhcpservice-impl/{{VERSION}}/xml/config</configfile>
+    <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-elanmanager-config.xml">mvn:org.opendaylight.netvirt/elanmanager-impl/{{VERSION}}/xml/config</configfile>
     <configfile finalname="etc/opendaylight/datastore/initial/config/netvirt-neutronvpn-config.xml">mvn:org.opendaylight.netvirt/neutronvpn-impl/{{VERSION}}/xml/config</configfile>
   </feature>