BUG: 6582 copying DHCP service config file to etc/..config

Change-Id: Icaf6e9e9f18f70b74d98dcfbbbc6ba2b5f0531ad
Signed-off-by: epgoraj <p.govinda.rajulu@ericsson.com>

diff --git a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml b/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
index 00e6c1875b86893bbb75c6b46248caa5f0dbe578..ee95de7eb7f0af159d4082a13918b00de5423b33 100644 (file)
--- a/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
+++ b/vpnservice/dhcpservice/dhcpservice-impl/pom.xml
@@ -86,6 +86,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
    </dependencies>
 
+
+  <build>
+    <plugins>
+      <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-dhcpservice-config.xml</file>
+                  <type>xml</type>
+                  <classifier>config</classifier>
+                </artifact>
+              </artifacts>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
   <!--
       Maven Site Configuration
 

diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/netvirt-dhcpservice.xml b/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml
similarity index 100%
rename from vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/netvirt-dhcpservice.xml
rename to vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/initial/netvirt-dhcpservice-config.xml

diff --git a/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice-impl.xml b/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice-impl.xml
index dbebba7bd7754d807d7c2caddf4bbd1985a3c7bc..33aada361bda0b367701418b1a262dba97ce5ea2 100644 (file)
--- a/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice-impl.xml
+++ b/vpnservice/dhcpservice/dhcpservice-impl/src/main/resources/org/opendaylight/blueprint/dhcpservice-impl.xml
@@ -26,7 +26,7 @@
     interface="org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.PacketProcessingService" />
 
   <odl:clustered-app-config id="dhcpServiceConfig"
-    binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dhcpservice.config.rev150710.DhcpserviceConfig" default-config-file-name="netvirt-dhcpservice.xml">
+    binding-class="org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.dhcpservice.config.rev150710.DhcpserviceConfig" default-config-file-name="netvirt-dhcpservice-config.xml">
   </odl:clustered-app-config>
 
   <bean id="dhcpManager" class="org.opendaylight.netvirt.dhcpservice.DhcpManager"

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

diff --git a/vpnservice/features/src/main/features/features.xml b/vpnservice/features/src/main/features/features.xml
index 21eb78e0263b7a110423922c8aa7476f42980e6e..235b7e57698b2a2a277d72ab565e0b169e81af65 100644 (file)
--- a/vpnservice/features/src/main/features/features.xml
+++ b/vpnservice/features/src/main/features/features.xml
@@ -77,6 +77,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
     <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>
   </feature>
 
   <feature name='odl-netvirt-openstack' version='${project.version}' description='OpenDaylight :: NetVirt :: OpenStack'>