Merge "Initial commit for DHCPService"

diff --combined features/pom.xml
index 7d93dd38e9bac78e4a84c6f4a3db62fee94cb216,a16ee561a75ea5613c4e1cc6b29406c30ac9a6f7..7ddc5bc08b261d7208511fed358af1f68c21f3f4
--- 1/features/pom.xml
--- 2/features/pom.xml
+++ b/features/pom.xml
@@@ -28,7 -28,6 +28,7 @@@ and is available at http://www.eclipse.
      <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
      <vpnservices.version>0.2.0-SNAPSHOT</vpnservices.version>
      <ovsdb.version>1.2.1-SNAPSHOT</ovsdb.version>
 +    <liblldp.version>0.10.0-SNAPSHOT</liblldp.version>
      <arputil.version>${vpnservices.version}</arputil.version>
      <mdsalutil.version>${vpnservices.version}</mdsalutil.version>
      <vpnmanager.version>${vpnservices.version}</vpnmanager.version>
@@@ -37,7 -36,7 +37,7 @@@
      <fibmanager.version>${vpnservices.version}</fibmanager.version>
      <lockmanager.version>${vpnservices.version}</lockmanager.version>
      <idmanager.version>${vpnservices.version}</idmanager.version>
-       <itm.version>${vpnservices.version}</itm.version>
+     <itm.version>${vpnservices.version}</itm.version>
    </properties>
    <dependencyManagement>
      <dependencies>
@@@ -170,28 -169,6 +170,28 @@@
        <artifactId>interfacemgr-api</artifactId>
        <version>${interfacemgr.version}</version>
      </dependency>
 +    <dependency>
 +        <groupId>org.opendaylight.controller</groupId>
 +        <artifactId>liblldp</artifactId>
 +        <version>${liblldp.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>alivenessmonitor-impl</artifactId>
 +      <version>${vpnservices.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>alivenessmonitor-impl</artifactId>
 +      <version>${vpnservices.version}</version>
 +      <classifier>config</classifier>
 +      <type>xml</type>
 +    </dependency>
 +    <dependency>
 +      <groupId>${project.groupId}</groupId>
 +      <artifactId>alivenessmonitor-api</artifactId>
 +      <version>${vpnservices.version}</version>
 +    </dependency>
      <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>vpnmanager-api</artifactId>
@@@ -219,7 -196,7 +219,7 @@@
        <artifactId>model-bgp</artifactId>
        <version>2013.07.15.8-SNAPSHOT</version>
      </dependency>
-       <dependency>
+     <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>nexthopmgr-impl</artifactId>
        <version>${nexthopmgr.version}</version>
@@@ -236,7 -213,7 +236,7 @@@
        <artifactId>nexthopmgr-api</artifactId>
        <version>${nexthopmgr.version}</version>
      </dependency>
-       <dependency>
+     <dependency>
        <groupId>${project.groupId}</groupId>
        <artifactId>fibmanager-impl</artifactId>
        <version>${fibmanager.version}</version>
@@@ -287,7 -264,7 +287,7 @@@
        <artifactId>idmanager-api</artifactId>
        <version>${idmanager.version}</version>
      </dependency>
-       <dependency>
+     <dependency>
        <groupId>org.opendaylight.vpnservice</groupId>
        <artifactId>itm-impl</artifactId>
        <version>${itm.version}</version>
@@@ -299,6 -276,23 +299,23 @@@
        <classifier>config</classifier>
        <type>xml</type>
      </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>dhcpservice-impl</artifactId>
+       <version>${vpnservices.version}</version>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>dhcpservice-impl</artifactId>
+       <version>${vpnservices.version}</version>
+       <classifier>config</classifier>
+       <type>xml</type>
+     </dependency>
+     <dependency>
+       <groupId>${project.groupId}</groupId>
+       <artifactId>dhcpservice-api</artifactId>
+       <version>${vpnservices.version}</version>
+     </dependency>
      <dependency>
        <groupId>org.apache.thrift</groupId>
        <artifactId>libthrift</artifactId>

diff --combined features/src/main/features/features.xml
index a71d0af4840612e179e2ca4c99ea58d749a2dfaf,6f116b558732772837f1be7140a080bcd802e70f..c9c41ec861798e82bc2c569f997e45e519633457
--- 1/features/src/main/features/features.xml
--- 2/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@@ -20,16 -20,15 +20,17 @@@ and is available at http://www.eclipse.
      <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
      <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
      <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
 +    <bundle>mvn:org.opendaylight.controller/liblldp/${liblldp.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/model-bgp/{{VERSION}}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/lockmanager-api/${lockmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/idmanager-api/${idmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/arputil-api/${arputil.version}</bundle>
 +    <bundle>mvn:org.opendaylight.vpnservice/alivenessmonitor-api/${vpnservices.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/vpnmanager-api/${vpnmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/nexthopmgr-api/${nexthopmgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/fibmanager-api/${fibmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/itm-api/${itm.version}</bundle>
+     <bundle>mvn:org.opendaylight.vpnservice/dhcpservice-api/${vpnservices.version}</bundle>
    </feature>
    <feature name='odl-vpnservice-impl' version='${project.version}' description='OpenDaylight :: vpnservice :: impl '>
      <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
@@@ -43,7 -42,6 +44,7 @@@
      <bundle>mvn:org.opendaylight.vpnservice/bgpmanager-impl/${vpnservices.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/mdsalutil-api/${interfacemgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/arputil-impl/${arputil.version}</bundle>
 +    <bundle>mvn:org.opendaylight.vpnservice/alivenessmonitor-impl/${vpnservices.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/mdsalutil-impl/${interfacemgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/interfacemgr-api/${interfacemgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/interfacemgr-impl/${interfacemgr.version}</bundle>
@@@ -51,22 -49,23 +52,24 @@@
      <bundle>mvn:org.opendaylight.vpnservice/nexthopmgr-impl/${nexthopmgr.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/fibmanager-impl/${fibmanager.version}</bundle>
      <bundle>mvn:org.opendaylight.vpnservice/itm-impl/${itm.version}</bundle>
-     
+     <bundle>mvn:org.opendaylight.vpnservice/dhcpservice-impl/${vpnservices.version}</bundle>
+ 
      <!--<bundle>mvn:org.opendaylight.vpnservice.third-party/org.apache.thriftlib/1.0.1-SNAPSHOT</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>
      <!--<bundle>wrap:mvn:javax.servlet/servlet-api/2.5</bundle>-->
      <configfile finalname="lockmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/lockmanager-impl/${lockmanager.version}/xml/config</configfile>
-       <configfile finalname="idmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/idmanager-impl/${idmanager.version}/xml/config</configfile>
+     <configfile finalname="idmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/idmanager-impl/${idmanager.version}/xml/config</configfile>
+     <configfile finalname="idmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/idmanager-impl/${idmanager.version}/xml/config</configfile>
      <configfile finalname="bgpmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/bgpmanager-impl/${vpnservices.version}/xml/config</configfile>
      <configfile finalname="mdsalutil-impl-default-config.xml">mvn:org.opendaylight.vpnservice/mdsalutil-impl/${interfacemgr.version}/xml/config</configfile>
      <configfile finalname="interfacemgr-impl-default-config.xml">mvn:org.opendaylight.vpnservice/interfacemgr-impl/${interfacemgr.version}/xml/config</configfile>
      <configfile finalname="arputil-impl-default-config.xml">mvn:org.opendaylight.vpnservice/arputil-impl/${arputil.version}/xml/config</configfile>
 +    <configfile finalname="alivenessmonitor-impl-default-config.xml">mvn:org.opendaylight.vpnservice/alivenessmonitor-impl/${vpnservices.version}/xml/config</configfile>
      <configfile finalname="vpnmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/vpnmanager-impl/${vpnmanager.version}/xml/config</configfile>
      <configfile finalname="nexthopmgr-impl-default-config.xml">mvn:org.opendaylight.vpnservice/nexthopmgr-impl/${nexthopmgr.version}/xml/config</configfile>
      <configfile finalname="fibmanager-impl-default-config.xml">mvn:org.opendaylight.vpnservice/fibmanager-impl/${fibmanager.version}/xml/config</configfile>
      <configfile finalname="itm-impl-default-config.xml">mvn:org.opendaylight.vpnservice/itm-impl/${itm.version}/xml/config</configfile>
- 
+     <configfile finalname="dhcpservice-impl-default-config.xml">mvn:org.opendaylight.vpnservice/dhcpservice-impl/${vpnservices.version}/xml/config</configfile>
    </feature>
    <feature name='odl-vpnservice-impl-rest' version='${project.version}' description='OpenDaylight :: vpnservice :: impl :: REST '>
      <feature version="${project.version}">odl-vpnservice-impl</feature>

diff --combined pom.xml
index 880e5f3f5ca323d1726919acbc4e896b8eaea32d,8b3fc8bf82def40b9a695e69b1c4eee0e08417e6..3b9100e47762d0d7b14c5e9f154cd831ad1e45e7
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -25,10 -25,10 +25,11 @@@ and is available at http://www.eclipse.
      <module>arputil</module>
      <module>vpnmanager</module>
      <module>interfacemgr</module>
 +    <module>alivenessmonitor</module>
      <module>nexthopmgr</module>
      <module>fibmanager</module>
      <module>bgpmanager</module>
+     <module>dhcpservice</module>
      <module>itm</module>
      <module>distribution/karaf</module>
      <module>features</module>