Merge remote branch 'origin/release-1.0.X' into mer

Conflicts:
	mappingservice/integrationtest/pom.xml

Change-Id: I62fc34b7c566198dc62ee1d20026ded5e579f303
Signed-off-by: David Goldberg <david.goldberg@contextream.com>

diff --combined commons/code-parent/pom.xml
index 082c72563e273ddbcbfb1041ceefeb5330d9cd6f,9de62d9ad62451734f246b6f18ab6a271840430d..4f2166c82f956d112b1ca7954d7401423a8a2a0e
--- 1/commons/code-parent/pom.xml
--- 2/commons/code-parent/pom.xml
+++ b/commons/code-parent/pom.xml
@@@ -6,12 -6,12 +6,12 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>lispflowmapping-commons</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>../parent</relativePath>
        </parent>
        <artifactId>lispflowmapping-code-commons</artifactId>
        <packaging>pom</packaging>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
                <developerConnection>scm:git:ssh://git.opendaylight.org:29418/lispflowmapping.git</developerConnection>
@@@ -22,7 -22,6 +22,6 @@@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>common.unittest.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
                        <scope>test</scope>
                </dependency>
                        <dependency>

diff --combined commons/parent/pom.xml
index 79474941deff3d72e21febaf2ca9f89a39917698,e946ccdba60716cabd10de5d9042366330acfa3e..903d53017cb9500d905346197fc9afa9142b95f5
--- 1/commons/parent/pom.xml
--- 2/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@@ -3,7 -3,7 +3,7 @@@
        <modelVersion>4.0.0</modelVersion>
        <groupId>org.opendaylight.lispflowmapping</groupId>
        <artifactId>lispflowmapping-commons</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <description></description>
        <packaging>pom</packaging>
        <url>http://www.opendaylight.org</url>
@@@ -14,7 -14,7 +14,7 @@@
                <tag>HEAD</tag>
        </scm>
        <properties>
 -              <lispflowmapping.version>1.0.0-SNAPSHOT</lispflowmapping.version>
 +              <lispflowmapping.version>1.1.0-SNAPSHOT</lispflowmapping.version>
                <jacoco.version>0.5.3.201107060350</jacoco.version>
                <enforcer.version>1.3.1</enforcer.version>
                <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
@@@ -40,6 -40,7 +40,7 @@@
                <java.version.source>1.7</java.version.source>
                <java.version.target>1.7</java.version.target>
                <releaseplugin.version>2.3.2</releaseplugin.version>
+               <slf4j.version>1.7.2</slf4j.version>
        </properties>
        
        <repositories>
@@@ -130,7 -131,6 +131,6 @@@
                                <artifactId>clustering.services</artifactId>
                                <version>0.5.0-SNAPSHOT</version>
                        </dependency>
- 
                        <dependency>
                                <groupId>org.opendaylight.yangtools</groupId>
                                <artifactId>yang-binding</artifactId>
@@@ -221,7 -221,27 +221,27 @@@
                                <artifactId>config-api</artifactId>
                                <version>0.2.3-SNAPSHOT</version>
                        </dependency>
- 
+             <dependency>
+               <groupId>org.opendaylight.lispflowmapping</groupId>
+               <artifactId>mappingservice.yangmodel</artifactId>
+               <version>${lispflowmapping.version}</version>
+             </dependency>
+             <dependency>
+               <groupId>org.opendaylight.lispflowmapping</groupId>
+               <artifactId>mappingservice.api</artifactId>
+               <version>${lispflowmapping.version}</version>
+             </dependency>
+             <dependency>
+               <groupId>org.opendaylight.lispflowmapping</groupId>
+               <artifactId>mappingservice.implementation</artifactId>
+               <version>${lispflowmapping.version}</version>
+             </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.lispflowmapping</groupId>
+                       <artifactId>common.unittest.tools</artifactId>
+                       <version>${lispflowmapping.version}</version>
+                       <scope>test</scope>
+               </dependency>
                </dependencies>
        </dependencyManagement>
  

diff --combined commons/unittest_tools/pom.xml
index fad6751581841b711a563bbd004530df84bec2b2,78ad3b1e613957b571c36e3c98257fc70fa6e8bf..9aa8591fb2acb73a06926a0b1d902f37966d51f5
--- 1/commons/unittest_tools/pom.xml
--- 2/commons/unittest_tools/pom.xml
+++ b/commons/unittest_tools/pom.xml
@@@ -6,11 -6,11 +6,11 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>lispflowmapping-commons</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>../parent</relativePath>
        </parent>
        <artifactId>common.unittest.tools</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <packaging>jar</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@@ -47,7 -47,7 +47,7 @@@
                <dependency>
  <groupId>org.slf4j</groupId>
  <artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>${slf4j.version}</version>
  </dependency>
                
        </dependencies>

diff --combined mappingservice/api/pom.xml
index 9173fdeb776e8bd07426790f33cc00fa810666fc,2829e5e147ea1d8a32550db597f89f8e18533d46..508dced01b9519b004b70e7edc248274b0131601
--- 1/mappingservice/api/pom.xml
--- 2/mappingservice/api/pom.xml
+++ b/mappingservice/api/pom.xml
@@@ -6,11 -6,11 +6,11 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.api</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@@ -78,7 -78,6 +78,6 @@@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
        </dependencies>
  </project>

diff --combined mappingservice/config/pom.xml
index 7342eb1706031a587c09c08677f016b76abc447c,20683b50c0a9c7863ae40e1f742f9aa4b91c01d4..44a0713f133ebbec363e4b1f94bcd8d32e893384
--- 1/mappingservice/config/pom.xml
--- 2/mappingservice/config/pom.xml
+++ b/mappingservice/config/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
        <parent>
                <artifactId>lispflowmapping-commons</artifactId>
                <groupId>org.opendaylight.lispflowmapping</groupId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>../../commons/parent</relativePath>
        </parent>
        <artifactId>mappingservice.config</artifactId>
@@@ -150,7 -150,6 +150,6 @@@
        <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools</groupId>

diff --combined mappingservice/implementation/pom.xml
index 427c90d1d25389208d7c13f8128964bddf318ef9,6ab380076c0d2af62e519a10cd2881b0e43fa0df..cd0ee2e7465afeae947964170ed5b58a8ae939ca
--- 1/mappingservice/implementation/pom.xml
--- 2/mappingservice/implementation/pom.xml
+++ b/mappingservice/implementation/pom.xml
@@@ -6,11 -6,11 +6,11 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.implementation</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@@ -60,7 -60,6 +60,7 @@@
                                                        org.opendaylight.controller.sal.core,
                                                        org.apache.felix.dm,
                                                        org.apache.commons.lang3,
 +                                                      org.apache.commons.lang3.tuple,
                                                        org.apache.commons.lang3.builder,
                                                        org.osgi.service.component,
                                                        org.slf4j,
@@@ -120,12 -119,10 +120,10 @@@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>equinoxSDK381</groupId>

diff --combined mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
index 0e5cb2f8b8647f8ee20705193d3f1cc6308dc175,be8dac0ef9d9d8aa0f89f100d0939b8dccd96b14..5c773e48fff6e5896cd2c064bccceef4f79cc989
--- 1/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
--- 2/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
+++ b/mappingservice/implementation/src/main/java/org/opendaylight/lispflowmapping/implementation/util/LispNotificationHelper.java
@@@ -1,11 -1,16 +1,18 @@@
+ /*
+  * Copyright (c) 2014 Contextream, Inc. and others.  All rights reserved.
+  *
+  * This program and the accompanying materials are made available under the
+  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  * and is available at http://www.eclipse.org/legal/epl-v10.html
+  */
  package org.opendaylight.lispflowmapping.implementation.util;
  
  import java.net.Inet4Address;
  import java.net.InetAddress;
  import java.net.UnknownHostException;
  
 +import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainer;
 +import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.lispaddresscontainer.address.Ipv4;
  import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapregisternotification.MapRegister;
  import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.mapregisternotification.MapRegisterBuilder;
  import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.maprequestnotification.MapRequest;
@@@ -41,31 -46,21 +48,31 @@@ public class LispNotificationHelper 
      }
  
      public static InetAddress getInetAddressFromIpAddress(IpAddress ipAddress) {
 -        InetAddress address = InetAddress.getLoopbackAddress();
 -        if (ipAddress == null) {
 -            return address;
 -        }
 -        if (ipAddress.getIpv4Address() != null) {
 -            try {
 -                address = Inet4Address.getByName(ipAddress.getIpv4Address().getValue());
 -            } catch (UnknownHostException e) {
 -            }
 -        } else if (ipAddress.getIpv6Address() != null) {
 -            try {
 -                address = Inet4Address.getByName(ipAddress.getIpv6Address().getValue());
 -            } catch (UnknownHostException e) {
 +        InetAddress address = null;
 +        if (ipAddress != null) {
 +            if (ipAddress.getIpv4Address() != null) {
 +                address = getAddressByName(ipAddress.getIpv4Address().getValue());
 +            } else if (ipAddress.getIpv6Address() != null) {
 +                address = getAddressByName(ipAddress.getIpv6Address().getValue());
              }
          }
 +        if (address == null) {
 +            address = InetAddress.getLoopbackAddress();
 +        }
          return address;
      }
 +
 +    public static InetAddress getInetAddressFromContainer(LispAddressContainer container) {
 +        Ipv4Address ipAddress = ((Ipv4) LispAFIConvertor.toAFI(container)).getIpv4Address();
 +        return getAddressByName(ipAddress.getValue());
 +    }
 +
 +    public static InetAddress getAddressByName(String IPAddress) {
 +        try {
 +            InetAddress address = InetAddress.getByName(IPAddress);
 +            return address;
 +        } catch (UnknownHostException e) {
 +            return null;
 +        }
 +    }
  }

diff --combined mappingservice/integrationtest/pom.xml
index 2278b3ae41a4e487a1a7bfff0ddd6452d7e5ca27,1b63bee4cb8eac8cf4aac3a97d8cd00192452735..beb8bff8a5d7c029d67e7d087fb067d38e80079b
--- 1/mappingservice/integrationtest/pom.xml
--- 2/mappingservice/integrationtest/pom.xml
+++ b/mappingservice/integrationtest/pom.xml
@@@ -129,7 -129,7 +129,7 @@@
                </plugins>
        </build>
        <properties>
 -              <lispflowmapping.version>1.0.0-SNAPSHOT</lispflowmapping.version>
 +              <lispflowmapping.version>1.1.0-SNAPSHOT</lispflowmapping.version>
                <exam.version>3.0.0</exam.version>
                <url.version>1.5.0</url.version>
                <!-- Sonar jacoco plugin to get integration test coverage info -->
@@@ -143,7 -143,7 +143,7 @@@
                <junit.version>4.8.1</junit.version>
                <xtend.version>2.4.3</xtend.version>
                <old-jackson.version>1.9.8</old-jackson.version>
-                 <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
+               <hosttracker.version>0.5.1-SNAPSHOT</hosttracker.version>
        </properties>
        <dependencies>
  
@@@ -220,11 -220,16 +220,16 @@@
                        <version>${netconf.version}</version>
                </dependency>
                <dependency>
-             <groupId>org.osgi</groupId>
-             <artifactId>org.osgi.core</artifactId>
-             <version>${osgi.core.version}</version>
-             <scope>provided</scope>
-         </dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>netconf-util</artifactId>
+                       <version>${netconf.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.osgi</groupId>
+                       <artifactId>org.osgi.core</artifactId>
+                       <version>${osgi.core.version}</version>
+                       <scope>provided</scope>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>containermanager.it.implementation</artifactId>
@@@ -584,11 -589,6 +589,11 @@@
                        <artifactId>jersey-client</artifactId>
                        <version>${jersey.version}</version>
                </dependency>
 +              <dependency>
 +        <groupId>com.sun.jersey</groupId>
 +        <artifactId>jersey-json</artifactId>
 +        <version>${jersey.version}</version>
 +      </dependency>
                <dependency>
                        <groupId>org.opendaylight.yangtools.thirdparty</groupId>
                        <artifactId>xtend-lib-osgi</artifactId>
@@@ -616,10 -616,10 +621,10 @@@
                        <scope>test</scope>
                </dependency>
                <dependency>
-             <groupId>org.opendaylight.controller</groupId>
-             <artifactId>config-persister-file-xml-adapter</artifactId>
-             <version>${config.version}</version>
-         </dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>config-persister-file-xml-adapter</artifactId>
+                       <version>${config.version}</version>
+               </dependency>
                <dependency>
                        <groupId>org.opendaylight.controller.model</groupId>
                        <artifactId>model-inventory</artifactId>
@@@ -629,11 -629,6 +634,6 @@@
                        <groupId>org.javassist</groupId>
                        <artifactId>javassist</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller.thirdparty</groupId>
-                       <artifactId>exificient</artifactId>
-               </dependency>
- 
                <dependency>
                        <groupId>org.opendaylight.controller</groupId>
                        <artifactId>config-manager</artifactId>

diff --combined mappingservice/northbound/pom.xml
index 3ddf233bef907e21e51a28976f9784d82e8ccf16,01f57872659462bc9949575661f987621853ac0a..c1e37a0040cfcae10ae1c7440f33de78bdc2126e
--- 1/mappingservice/northbound/pom.xml
--- 2/mappingservice/northbound/pom.xml
+++ b/mappingservice/northbound/pom.xml
@@@ -5,11 -5,11 +5,11 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.northbound</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <packaging>bundle</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@@ -22,7 -22,7 +22,7 @@@
                        <plugin>
                                <groupId>org.codehaus.enunciate</groupId>
                                <artifactId>maven-enunciate-plugin</artifactId>
-                               <version>1.27</version>
+                               <version>${enunciate.version}</version>
                                <!-- <dependencies> <dependency> <groupId>org.opendaylight.controller</groupId> 
                                        <artifactId>sal</artifactId> <version>0.5.0-SNAPSHOT</version> </dependency> 
                                        <dependency> <groupId>org.opendaylight.controller</groupId> <artifactId>clustering.services</artifactId> 
@@@ -108,13 -108,11 +108,11 @@@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.yangmodel</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
  
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
  
                <dependency>
@@@ -141,7 -139,7 +139,7 @@@
                <dependency>
                        <groupId>org.codehaus.enunciate</groupId>
                        <artifactId>enunciate-core-annotations</artifactId>
-                       <version>1.27</version>
+                       <version>${enunciate.version}</version>
                </dependency>
  
        </dependencies>

diff --combined mappingservice/pom.xml
index 5082ea6a61b128b6ab06d95b5f77b74b84036bd7,68ab06a08ce7246acaa7fe3b071ea0075e8d7969..8bc9849795e49851d79fd9a42d2a6d15c253bdd5
--- 1/mappingservice/pom.xml
--- 2/mappingservice/pom.xml
+++ b/mappingservice/pom.xml
@@@ -6,11 -6,11 +6,11 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>lispflowmapping-code-commons</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>../commons/code-parent</relativePath>
        </parent>
        <artifactId>mappingservice-parent</artifactId>
 -      <version>1.0.0-SNAPSHOT</version>
 +      <version>1.1.0-SNAPSHOT</version>
        <packaging>pom</packaging>
        <scm>
                <connection>scm:git:https://git.opendaylight.org/gerrit/p/lispflowmapping.git</connection>
@@@ -25,15 -25,12 +25,13 @@@
                  <module>implementation</module>
                  <module>southbound</module>
                  <module>northbound</module>
 +                <module>neutron</module>
                  <module>integrationtest</module>
          </modules>
        <dependencies>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>common.unittest.tools</artifactId>
-                       <version>${lispflowmapping.version}</version>
-                       <scope>test</scope>
                </dependency>
                        <dependency>
                                <groupId>junit</groupId>

diff --combined mappingservice/southbound/pom.xml
index 88b56919b3781e9f316e23578ff7d69ea70093e9,b97faf30aa26c17b999ca1fa3298612b5ea8a831..dd608237ec55b4eda9fd02a2880ca2701565492c
--- 1/mappingservice/southbound/pom.xml
--- 2/mappingservice/southbound/pom.xml
+++ b/mappingservice/southbound/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
        <parent>
                <groupId>org.opendaylight.lispflowmapping</groupId>
                <artifactId>mappingservice-parent</artifactId>
 -              <version>1.0.0-SNAPSHOT</version>
 +              <version>1.1.0-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>mappingservice.southbound</artifactId>
@@@ -76,12 -76,10 +76,10 @@@
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.api</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.opendaylight.lispflowmapping</groupId>
                        <artifactId>mappingservice.implementation</artifactId>
-                       <version>${lispflowmapping.version}</version>
                </dependency>
        </dependencies>
  </project>