Switch to the standalone Neutron project

Change-Id: I7edeecaaee44cc31d9a7cfb53889d736e1db5447
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index d209778b2468e63bdfec91b5bd9cad3aee5b2f96..387e4b63e6a5b47e7c71b6b64661fbc44de5f21a 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -148,7 +148,7 @@
         <type>xml</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.neutron</groupId>
         <artifactId>features-neutron</artifactId>
         <version>${neutron.version}</version>
         <classifier>features</classifier>
@@ -175,7 +175,7 @@
       </dependency>
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
-        <artifactId>networkconfig.neutron</artifactId>
+        <artifactId>neutron-spi</artifactId>
         <version>0.5.0-SNAPSHOT</version>
       </dependency>
       <dependency>

diff --git a/features/pom.xml b/features/pom.xml
index ddfec30b1474125e95fcacb3de510824b41595ec..324ca117090adffffdec7621d9f95e0337ad7cb6 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -39,12 +39,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-neutron</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-nsf</artifactId>
@@ -100,6 +94,12 @@
       <groupId>org.opendaylight.lispflowmapping</groupId>
       <artifactId>mappingservice.yangmodel</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <!-- error : java.lang.NoSuchMethodError: org.slf4j.helpers.MessageFormatter.format(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)Lorg/slf4j/helpers/FormattingTuple; -->
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index c1da39f0e21eac21964140f00aea58f43703f3e0..e9d624ec1f85d809c83963d101dfd0fcc0005c14 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -13,7 +13,7 @@
 
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-neutron/${neutron.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository>
 
@@ -54,7 +54,7 @@
     </feature>
 
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${lispflowmapping.version}'>
-        <feature version="${neutron.version}">odl-neutron-all</feature>
+        <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${lispflowmapping.version}">odl-lispflowmapping-mappingservice</feature>
         <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.neutron/${lispflowmapping.version}</bundle>
     </feature>

diff --git a/mappingservice/neutron/pom.xml b/mappingservice/neutron/pom.xml
index 6dcabc7ee8ec7b40c985cedee7e7a76ea84d10af..10b026a0969024ffa864e817084d218b6c7214fd 100644 (file)
--- a/mappingservice/neutron/pom.xml
+++ b/mappingservice/neutron/pom.xml
@@ -20,7 +20,7 @@
     </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
+      <artifactId>neutron-spi</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools.model</groupId>
@@ -38,7 +38,7 @@
             <Export-Package></Export-Package>
             <Import-Package>org.apache.commons.net.util,
               org.apache.felix.dm,
-              org.opendaylight.controller.networkconfig.neutron,
+              org.opendaylight.neutron.spi,
               org.opendaylight.lispflowmapping.type,
               org.opendaylight.lispflowmapping.type.lisp,
               org.opendaylight.lispflowmapping.type.lisp.address,

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/Activator.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/Activator.java
index 3f9855f31b854eb91039cab3cdd39c1316981e1c..4c1648df4f2728c94fd48b2f6276fc4879297490 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/Activator.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/Activator.java
@@ -15,9 +15,9 @@ import java.util.Hashtable;
 import org.apache.felix.dm.DependencyActivatorBase;
 import org.apache.felix.dm.DependencyManager;
 import org.opendaylight.lispflowmapping.interfaces.lisp.IFlowMapping;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortAware;
+import org.opendaylight.neutron.spi.INeutronNetworkAware;
+import org.opendaylight.neutron.spi.INeutronSubnetAware;
+import org.opendaylight.neutron.spi.INeutronPortAware;
 import org.osgi.framework.BundleContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronNetworkHandler.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronNetworkHandler.java
index 000e6aef446a8e339f6d4ea6e474b9fc6fbdc984..6a61014981ca2778c4a2deb16605e7e26428ac6e 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronNetworkHandler.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronNetworkHandler.java
@@ -10,8 +10,8 @@ package org.opendaylight.lispflowmapping.neutron;
 
 import java.net.HttpURLConnection;
 
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
+import org.opendaylight.neutron.spi.INeutronNetworkAware;
+import org.opendaylight.neutron.spi.NeutronNetwork;
 
 /**
  * LISP Service Implementation of NeutronNetworkAware API

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java
index 50d8228cfdbeb239a3d636dd031dab082a8268ed..77d64e0717c7e6929170a898c33a4456306b4510 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronPortHandler.java
@@ -10,8 +10,8 @@ package org.opendaylight.lispflowmapping.neutron;
 
 import java.net.HttpURLConnection;
 
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortAware;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
+import org.opendaylight.neutron.spi.INeutronPortAware;
+import org.opendaylight.neutron.spi.NeutronPort;
 
 /**
  * Lisp Service implementation of NeutronPortAware API

diff --git a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java
index b503fb7abc91ba6e3d24cb5ca9b5fad74e37fa8c..9112bd7839e22a1f89de10928a8b82c01c2b209d 100644 (file)
--- a/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java
+++ b/mappingservice/neutron/src/main/java/org/opendaylight/lispflowmapping/neutron/LispNeutronSubnetHandler.java
@@ -13,8 +13,8 @@ import java.net.HttpURLConnection;
 
 import org.apache.commons.net.util.SubnetUtils;
 import org.apache.commons.net.util.SubnetUtils.SubnetInfo;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetAware;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.spi.INeutronSubnetAware;
+import org.opendaylight.neutron.spi.NeutronSubnet;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.LispAFIAddress;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainer;
 import org.opendaylight.yang.gen.v1.lispflowmapping.rev131031.lispaddress.LispAddressContainerBuilder;