Rename neutron artifacts

author Ryan Moats <rmoats@us.ibm.com>

Tue, 17 Feb 2015 18:22:41 +0000 (12:22 -0600)

committer Ryan Moats <rmoats@us.ibm.com>

Wed, 18 Feb 2015 21:17:19 +0000 (15:17 -0600)
author Ryan Moats <rmoats@us.ibm.com>
Tue, 17 Feb 2015 18:22:41 +0000 (12:22 -0600)
committer Ryan Moats <rmoats@us.ibm.com>
Wed, 18 Feb 2015 21:17:19 +0000 (15:17 -0600)
diff --git a/features/pom.xml b/features/pom.xml

index c5979e046f103c206686f9ebd28a397b79dec93e..53f717a0c172304244a29be2b9d4e6f5fb1c2925 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -5,7 +5,7 @@
      <groupId>org.opendaylight.controller</groupId>
      <artifactId>commons.opendaylight</artifactId>
      <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../opendaylight/commons/opendaylight</relativePath>
+    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
    </parent>
    <groupId>org.opendaylight.neutron</groupId>
    <artifactId>features-neutron</artifactId>
@@ -24,10 +24,6 @@
        <classifier>features</classifier>
        <type>xml</type>
      </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
-    </dependency>
      <dependency>
        <groupId>org.osgi</groupId>
        <artifactId>org.osgi.core</artifactId>
@@ -53,8 +49,8 @@
        <artifactId>org.eclipse.persistence.core</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>neutron-spi</artifactId>
      </dependency>
      <dependency>
        <groupId>commons-net</groupId>
diff --git a/neutron-spi/pom.xml b/neutron-spi/pom.xml

new file mode 100644 (file)

index 0000000..49d34b6
--- /dev/null
+++ b/neutron-spi/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>commons.opendaylight</artifactId>
+    <version>1.5.0-SNAPSHOT</version>
+    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
+  </parent>
+  <groupId>org.opendaylight.neutron</groupId>
+  <artifactId>neutron-spi</artifactId>
+  <version>0.5.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>*</Import-Package>
+          </instructions>
+          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <scm>
+    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
+    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
+    <tag>HEAD</tag>
+    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
+  </scm>
+  <distributionManagement>
+    <!-- OpenDayLight Released artifact -->
+    <repository>
+      <id>opendaylight-release</id>
+      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>
+    </repository>
+    <!-- OpenDayLight Snapshot artifact -->
+    <snapshotRepository>
+      <id>opendaylight-snapshot</id>
+      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
+    </snapshotRepository>
+    <!-- Site deployment -->
+    <site>
+      <id>website</id>
+      <url>${sitedeploy}</url>
+    </site>
+  </distributionManagement>
+</project>
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java

index 9b4f579025e55340a8317d6cda20a0368c014e25..30acd734c3246dbfc5843302b1424d9f411b7295 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java

similarity index 94%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java

index c986bffd6b6a72574e42374888e44dc9b87061ff..917108c062a4652b9fbc5cac70405540d3adb521 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronFirewallCRUD {
       *
       * @param uuid
       *            UUID of the Firewall object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronFirewall}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronFirewall}
       *          OpenStackFirewall class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java

index 203d513923c406c5fef5cca5e6eb2034312ffb1a..0c39f5cad58de72d1fcbb2ae9fee9919c68d1d74 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Firewall Policys needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java

similarity index 97%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java

index 6049656a6e309069f997adb755d7304faeb1a840..f105cb38b16793ec09be49fe85a3ffbc2a233c63 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallPolicyCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallPolicyCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java

index a663058328f8fef01bc9ee74b436e4d03b837018..b23c008e4f1423aac3a83efc3548c47aa303091b 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Firewall Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java

similarity index 97%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java

index 990896bdb7249591cf90e4f2509e9be36cfa572f..2e3516001f3d3ce075f8809aaeea69606b1ad23f 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFirewallRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFirewallRuleCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java

index 43175d3236455e1d3f9f4a5df23b3e3e290e9ac0..9e60e7c00332b7756b44acb08c4eaaacacaf3c04 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron FloatingIPs needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java

similarity index 92%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java

index e416ee7d2f31efb450fc4c6795a687c95eb25591..e799e858c2666d23431a29825c98d9e8270742fb 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronFloatingIPCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronFloatingIPCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronFloatingIPCRUD {
       *
       * @param uuid
       *            UUID of the FloatingIP object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP.OpenStackFloatingIPs}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronFloatingIP.OpenStackFloatingIPs}
       *          OpenStack FloatingIP class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java

index e4aa5f382b2a152741169c0ebb6ea861240a5b9c..7609fada7749eb541c02a65af794d21c7e0ecf29 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of LoadBalancer Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java

similarity index 97%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java

index a2ce41eab2b825b4d630ef49d2651e84d28dd5bc..1efeeae1b69bd2a3d6c40d818452a74ab7c259cb 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -92,4 +92,4 @@ public interface INeutronLoadBalancerCRUD {
  
      public boolean neutronLoadBalancerInUse(String uuid);
  
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java

index 7194da32b4a4f4974b2b068a34a1cedc8df15744..8b6117e2b12ec4e7c9e67709f5a1ebedb5fdfe7b 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of LoadBalancerHealthMonitor Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java

index 78380001dfa9e98faf6cbca5e38caf9031b3a726..d59a2637b74b1ec05454db32c2f4493b28597a7b 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerHealthMonitorCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerHealthMonitorCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java

index 417419f93642d527626596a0418dfcab1ced1515..439b33631aa0056034b403eaec3aef221b7347ac 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of LoadBalancerListener Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java

similarity index 97%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java

index c160f8ed8b6554da6431d96b1868863041eee08c..4117e7d093acf658f1f446be6c5cae017513eeef 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerListenerCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerListenerCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -92,4 +92,4 @@ public interface INeutronLoadBalancerListenerCRUD {
  
      public boolean neutronLoadBalancerListenerInUse(String uuid);
  
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java

index 16c7d3716973b3d9e4b18d9ed60469e2469b24e5..2c1b28d5a114811a332d3f72378996f616f6d226 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of LoadBalancerPool Rules needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java

similarity index 97%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java

index 9614448d065a56c3d4ce0ab965720ec94c18dbe9..7f188e63c02a7d4770f18c907c71b9b2aed0d108 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -92,4 +92,4 @@ public interface INeutronLoadBalancerPoolCRUD {
  
      public boolean neutronLoadBalancerPoolInUse(String uuid);
  
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java

index 69a57748ddabc88212411cf6b4ecf3d088a80381..bb01bf1e9875d7a41169c925bd54a6a411ad3605 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberAware.java
@@ -5,7 +5,7 @@
   * 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.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  public interface INeutronLoadBalancerPoolMemberAware {
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java

similarity index 94%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java

index c1f5c7003ce87750d1cff33649e367eedbf94e4f..29f8c9ccd6d5ae147ec11ebd368dc9801a7fbad3 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -29,7 +29,7 @@ public interface INeutronLoadBalancerPoolMemberCRUD {
       *
       * @param uuid
       *            UUID of the NeutronLoadBalancerPoolMember object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember}
       *          OpenStackNeutronLoadBalancerPoolMember class
       */
  
@@ -88,4 +88,4 @@ public interface INeutronLoadBalancerPoolMemberCRUD {
  
      public boolean neutronLoadBalancerPoolMemberInUse(String uuid);
  
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberRequest.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java

similarity index 95%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberRequest.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java

index d8c5eb9e938326c74998437f97367f7287b6a8b5..3d614c93ea10949a053aea6852bd5a9e26bca480 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronLoadBalancerPoolMemberRequest.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronLoadBalancerPoolMemberRequest.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlElement;
  import java.util.List;
@@ -47,4 +47,4 @@ public class INeutronLoadBalancerPoolMemberRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancerPoolMember != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java

index 88d3c1dc6e84726842361add116002fd035ebb24..45c9eaa30e1ed7f7fe2ddc5ce2a3cb22b6e2912f 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron Networks needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java

similarity index 93%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java

index bf900a618f1057c5fbc8babc12635cbec7045d37..cda35c48480f7e8cac5cc8e60c62c252f94a8fd1 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronNetworkCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronNetworkCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronNetworkCRUD {
       *
       * @param uuid
       *            UUID of the Network object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronNetwork.OpenStackNetworks}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronNetwork.OpenStackNetworks}
       *          OpenStack Network class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java

similarity index 88%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronObject.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java

index bebac37c41732bf2bb102d698a2e13202f72302d..63280f37b487bc6602df37ebe558979b675319ce 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronObject.java
@@ -8,7 +8,7 @@
   *  Authors : Dave Tucker
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This class contains behaviour common to Neutron configuration objects
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java

index 3f40ba3879a84a2b8aa517f0baad66e2cf0c1672..2cf2f65ba959595ddf76e2881e6bc7d6d87a3e54 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron Ports needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java

similarity index 94%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java

index ce30c6806eea294c57bc637e3fb532377c3b21b4..67c8822bb4c3bce9ba96afec92507ca71e0d4a1f 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronPortCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronPortCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronPortCRUD {
       *
       * @param uuid
       *            UUID of the Port object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronPort.OpenStackPorts}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronPort.OpenStackPorts}
       *          OpenStack Port class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java

index 3c9e83d490c0e0d561077f42ad3903b1c11e93b9..4d08edb369d4dec25c898cf5a045470973454916 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron Routers needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java

similarity index 93%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java

index b1a943fce1946e287271da2984206c84b3942bab..0a48fc6bff6a6d789dcf594aebd516711a268475 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronRouterCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronRouterCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronRouterCRUD {
       *
       * @param uuid
       *            UUID of the Router object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronRouter.OpenStackRouters}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronRouter.OpenStackRouters}
       *          OpenStack Router class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java

index 0fdf77f968708111a5dd3dd99a442843c762351e..3e3f2599377b7177969ea7cfed1d14eaa0a19fb4 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupAware.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron Security Groups needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java

similarity index 93%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java

index a408ef92a7be75bcfff59195a6f3c6632ac13292..73f9edc517f5757bfdd979ef16f2275c0cd52cc2 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityGroupCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityGroupCRUD.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -31,7 +31,7 @@ public interface INeutronSecurityGroupCRUD {
       * Security Group object exists
       *
       * @param uuid UUID of the Security Group object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronSecurityGroup.OpenStackSecurity Groups}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup.OpenStackSecurity Groups}
       * OpenStack Security Group class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java

index ff2a1c4978f6891998c098905439ec932daf76f0..43e1c427fbff07f231259016c4f0343f417e04bb 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleAware.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods required to be aware of Neutron Security Rules
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java

similarity index 93%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java

index 73b41c71a4745b204028a04f3a54ea9850ad79b7..118e125313455dd1a84b85e3650008d83bbd439c 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSecurityRuleCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSecurityRuleCRUD.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -31,7 +31,7 @@ public interface INeutronSecurityRuleCRUD {
       * Security Rule object exists
       *
       * @param uuid UUID of the security rule object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronSecurityRule.OpenStackNetworks}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronSecurityRule.OpenStackNetworks}
       * OpenStackSecurity Rule class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetAware.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetAware.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java

index fa0707698d6a88208693bfb9233fd523b512c6de..a390553640bfbd34422a0013f88a5eeede5ea828 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetAware.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetAware.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  /**
   * This interface defines the methods a service that wishes to be aware of Neutron Subnets needs to implement
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetCRUD.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java

similarity index 93%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetCRUD.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java

index 6f9a6ffb7b54850dce84b900ca08cadd57c00ce4..5e27d1fd3977cb8c3c0c0401a314caffa2e77e07 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/INeutronSubnetCRUD.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/INeutronSubnetCRUD.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.util.List;
  
@@ -33,7 +33,7 @@ public interface INeutronSubnetCRUD {
       *
       * @param uuid
       *            UUID of the Subnet object
-     * @return {@link org.opendaylight.controller.networkconfig.neutron.NeutronSubnet.OpenStackSubnets}
+     * @return {@link org.opendaylight.neutron.neutron.spi.NeutronSubnet.OpenStackSubnets}
       *          OpenStack Subnet class
       */
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronCRUDInterfaces.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronCRUDInterfaces.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java

index 0ae523a138a58f274cf6c5a03dc8ab34fc24f92a..c0ce79e17e8d45541245885134d737b13037677d 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronCRUDInterfaces.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronCRUDInterfaces.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import org.osgi.framework.BundleContext;
  import org.osgi.framework.FrameworkUtil;
@@ -109,4 +109,4 @@ public class NeutronCRUDInterfaces {
          }
          return null;
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewall.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java

index 5d427ef12ae8f25d5aaa164d4250eb26b0ef01b5..4deb8f98ca75cd9959e662ffd600a15f04f09715 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewall.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallPolicy.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java

index 782e18bb8989222ab9d091f35526490fa0602498..e1ca07539ae24fdffc699114ce67bd53139f9283 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallPolicy.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -160,4 +160,4 @@ public class NeutronFirewallPolicy implements Serializable {
              ", firewallPolicyIsAudited='" + firewallPolicyIsAudited + '\'' +
              '}';
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallRule.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java

index d4c239302a2952c19a1e978222badfc17c5d8490..00155d9de4589888c19d0412f62b142b5d5a8952 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFirewallRule.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -318,4 +318,4 @@ public class NeutronFirewallRule implements Serializable {
  
      public void initDefaults() {
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFloatingIP.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFloatingIP.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java

index 9c8c91b284f0914a16011429306de380fb7f2399..4113578e4786e567280cd14fe608736fbf2f1951 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronFloatingIP.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronFloatingIP.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  import java.util.Iterator;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancer.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java

index 58f0eb45124b87fe70673151b8734d2fe4a4fa24..9ea27f76070463cdeae713e88618af6c3a19433b 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancer.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancer.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -156,4 +156,4 @@ public class NeutronLoadBalancer implements Serializable {
                  ", loadBalancerVipSubnetID='" + loadBalancerVipSubnetID + '\'' +
                  '}';
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerHealthMonitor.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java

index d23fe113a041b61e66304719063dbc3f64eb9287..775f319c63636bf7fd9597e51b0c9d330a9381a6 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerHealthMonitor.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerHealthMonitor.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@ -225,4 +225,4 @@ public class NeutronLoadBalancerHealthMonitor implements Serializable {
                  ", loadBalancerHealthMonitorStatus='" + loadBalancerHealthMonitorStatus + '\'' +
                  '}';
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerListener.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java

index 8b4ada3d0f302df87d4786f8ba77df7491195fb2..48c23bf3adca988b680fb5520667ed1422721303 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerListener.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -222,4 +222,4 @@ public class NeutronLoadBalancerListener implements Serializable {
                  ", neutronLoadBalancerListenerLoadBalancerID='" + neutronLoadBalancerListenerLoadBalancerID + '\'' +
                  '}';
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPool.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java

index 363de412d856bf56a41950fb62d2672ee7cbc399..f02875151c17370ee85eb32e66c3caeda1e852c6 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPool.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPoolMember.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java

index 313a951b2f48c731874cd34cfbd34ec5b6b8e223..28183d6544abbd28ac443734223045ec23adae10 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronLoadBalancerPoolMember.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronLoadBalancerPoolMember.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java

index 1cbbb36f785ca2b60f4ab27e278f033825e24abd..8acd31c0f9a6cf13e13fc5dc337d02095421ab9e 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronNetwork.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  import java.util.ArrayList;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java

index 38539883533d89104f1e060081ee566d7edb707d..98e5d7f616af183ee398aebb92f375e30d8a461a 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronPort.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronPort.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  
  import java.io.Serializable;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java

index 9d5ee38b50ed2550fa6f271e08e874016e42c01d..8051df99d945faff164539a0b489ebb9080112c6 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  import java.util.HashMap;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_Interface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java

similarity index 96%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_Interface.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java

index c7ae4eb1726e33d82213f5bced6064eb68a79a52..30f29319fd716853423ae874f10cb4c460a294c4 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_Interface.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_Interface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_NetworkReference.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java

similarity index 94%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_NetworkReference.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java

index 8583d44531ec5387b1ea7b1d8b884fc98ffe2564..52b23a8810beccf2e6dc20faecc9e4257aece334 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronRouter_NetworkReference.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronRouter_NetworkReference.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityGroup.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java

index ca56c7b05019bdeadecde2d126bb03221fe851c2..a47529ac057fca5e9b87697b8399b82e3945a002 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityGroup.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -137,4 +137,4 @@ public class NeutronSecurityGroup implements Serializable {
      public void initDefaults() {
          //TODO verify no defaults values are nessecary required.
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityRule.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java

index 6247691bdd5ece95e5b756fee8f29572b5d97ba9..264dbd663cc8f0db446d115f91b46a1dcb385faa 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSecurityRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSecurityRule.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -212,4 +212,4 @@ public class NeutronSecurityRule implements Serializable {
      public void initDefaults() {
          //TODO verify no defaults values are nessecary required.
      }
-}
-\ No newline at end of file
+}
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java

similarity index 99%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java

index 2a44d8b88af50d13ca48c42b7bd471f27c2b8108..3b5766327e8c7b07dd12b22dd17970f321a28726 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  import java.net.InetAddress;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_HostRoute.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java

similarity index 94%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_HostRoute.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java

index 07744061e66b4eba3fbd18c20455e4ef1b7ba9fa..7b23cdd8836aecb73302b44a5daefd540f3ecc45 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_HostRoute.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_HostRoute.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java

similarity index 98%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java

index 75da310b2b63b9f967afdbc354fba1ee3871dfa3..46907d87f20c4820d798fd96cb9a89ec1e6a7897 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/NeutronSubnet_IPAllocationPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/NeutronSubnet_IPAllocationPool.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  import java.util.ArrayList;
diff --git a/src/main/java/org/opendaylight/controller/networkconfig/neutron/Neutron_IPs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java

similarity index 96%

rename from src/main/java/org/opendaylight/controller/networkconfig/neutron/Neutron_IPs.java

rename to neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java

index fe5d45b3a6fea57a7d08591ee42f461fba87757a..ba9fb8d397fec9763bb64b82e97e7da966c4795a 100644 (file)
--- a/src/main/java/org/opendaylight/controller/networkconfig/neutron/Neutron_IPs.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/neutron-spi/Neutron_IPs.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron;
+package org.opendaylight.neutron.neutron.spi;
  
  import java.io.Serializable;
  
diff --git a/northbound/enunciate.xml b/northbound-api/enunciate.xml

similarity index 100%

rename from northbound/enunciate.xml

rename to northbound-api/enunciate.xml
diff --git a/northbound/pom.xml b/northbound-api/pom.xml

similarity index 87%

rename from northbound/pom.xml

rename to northbound-api/pom.xml

index 90110ce250c9be8ce92f8af3932fab95f2833d08..6f2428a435d5c4b676935c91554126975a8f0b4a 100644 (file)
--- a/northbound/pom.xml
+++ b/northbound-api/pom.xml
@@ -5,10 +5,10 @@
      <groupId>org.opendaylight.controller</groupId>
      <artifactId>enunciate-parent</artifactId>
      <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../../commons/enunciate-parent</relativePath>
+    <relativePath>../../controller/opendaylight/commons/enunciate-parent</relativePath>
    </parent>
    <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>networkconfig.neutron.northbound</artifactId>
+  <artifactId>northbound-api</artifactId>
    <version>0.5.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <dependencies>
@@ -33,8 +33,13 @@
        <artifactId>org.eclipse.persistence.moxy</artifactId>
      </dependency>
      <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>neutron-spi</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
      </dependency>
    </dependencies>
  
@@ -46,7 +51,7 @@
          <extensions>true</extensions>
          <configuration>
            <instructions>
-            <Import-Package>org.opendaylight.controller.networkconfig.neutron,
+            <Import-Package>org.opendaylight.neutron,
                              org.eclipse.persistence.jaxb.rs,
                              com.sun.jersey.spi.container.servlet,
                              javax.ws.rs,
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/BadRequestException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java

similarity index 92%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/BadRequestException.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java

index 9db8633b9968e80e4e92c50e595f08514e801c1e..3836fb4826c850d5225954ed31970017f08ee674 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/BadRequestException.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/BadRequestException.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.ws.rs.WebApplicationException;
  import javax.ws.rs.core.MediaType;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java

similarity index 77%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java

index 8e0ff5c859f101003f69ea4a4ed6b58daa6e3072..386351633cdf9be9a255b5ca19da1773ec774a97 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/INeutronRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/INeutronRequest.java
@@ -8,9 +8,9 @@
   *  Authors : Dave Tucker
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronObject;
+import org.opendaylight.neutron.neutron.spi.INeutronObject;
  
  import java.util.List;
  
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/InternalServerErrorException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java

similarity index 94%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/InternalServerErrorException.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java

index 5a40a1861bdaa898b9c38c0b98005ceb22aca7cf..96989f251c9526d9a355e3d8532d2032f855c168 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/InternalServerErrorException.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/InternalServerErrorException.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.ws.rs.WebApplicationException;
  import javax.ws.rs.core.Response;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java

index e9ab011cf6375dab69ecd021354249074057b4c3..b8ca83c645324dc8ba5b0993024169372d8e3901 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallNorthbound.java
@@ -6,16 +6,16 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewall;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallAware;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
  
  import javax.ws.rs.Consumes;
  import javax.ws.rs.DELETE;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java

index 671bbd031eb5efeffc6ecfe537f026b34a32afc1..7d16b349bbfb5fa28f2eb0e44fba40c3a30fc4f1 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallPolicyAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallPolicyCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallPolicy;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyAware;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
  
  /**
   * Neutron Northbound REST APIs for Firewall Policies.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java

index 473846a6d95d2a6751ff155c108ffdac277aa904..21c89b051af44df7f5d2818f3d0e292b7f20c035 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallPolicyRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallPolicyRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallPolicy;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronFirewallPolicyRequest {
      public boolean isSingleton() {
          return (singletonFirewallPolicy != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java

index 11a7836b225a8ac10ce58816342ed1cf0c787221..4e8f56743a595b8deef50900b7a3e02805d61451 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewall;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronFirewallRequest {
      public boolean isSingleton() {
          return (singletonFirewall != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java

index 19e67dd2347eb71782e32b9b11338199ea4ccdcc..ff6b3240d807f7966a7264f87c605d7feca7908c 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRuleRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRuleRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallRule;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronFirewallRuleRequest {
      public boolean isSingleton() {
          return (singletonFirewallRule != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java

index cc2a417f919acf1082c4f95b30e61f87b759086f..3ea9f61e38e4b1a65a1f68a3fee66d4fe42c5469 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFirewallRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFirewallRulesNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallPolicyCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallRuleAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallRule;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleAware;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
  
  /**
   * Neutron Northbound REST APIs for Firewall Rule.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java

index efb86e0542e9b9fcec607b55bdc8fb9742cbf8bb..31463b7b3c3b3a8781f640e8796d858de27cb6e6 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPRequest.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.List;
  
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP;
+import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
  
  @XmlRootElement
  @XmlAccessorType(XmlAccessType.NONE)
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java

similarity index 96%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java

index c388410cd3324bc91e07d3b90ac9a0b3c14c3959..a9749dd6b8fc7be56275650de5c70f5de1654956 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronFloatingIPsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronFloatingIPsNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.Iterator;
@@ -26,17 +26,17 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFloatingIPAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFloatingIPCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
-import org.opendaylight.controller.networkconfig.neutron.Neutron_IPs;
+import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPAware;
+import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
  
  /**
   * Neutron Northbound REST APIs.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java

index d9a53e9cbc2f97b0c7cce36d2efe458280dd2a56..55594500c5645aa0f69d68eaf8296984c6edce0c 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerHealthMonitorAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancer;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorAware;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java

similarity index 91%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java

index dc4af2f31f80b5ef5f3fde9ae0ca657bfbf8dacc..903648c5f6fedc4a75f06ee0035888e6815b55e0 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerHealthMonitorRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerHealthMonitorRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronLoadBalancerHealthMonitorRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancerHealthMonitor != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java

similarity index 98%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java

index 1490946c3842ce580ae6920b36c20e78d38dbad5..6949bf547687939abf0c768e6b29623441418bdc 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerListenerAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerAware;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
  
  /**
   * Neutron Northbound REST APIs for LoadBalancerListener Policies.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java

index ba375af92686fd33d3aef2390975c1bddfe3dde6..8812eb099e6f00ff9c19cdc7bb782e09b69c69a7 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerListenerRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerListenerRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronLoadBalancerListenerRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancerListener != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java

index 78535e4311dd7e2ca16f309ea05b863baab43d1b..f4a1100faab21f072741e2fc6cee1c071866cc85 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -28,10 +28,10 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancer;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerAware;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
  
  /**
   * Neutron Northbound REST APIs for LoadBalancers.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java

similarity index 89%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java

index 9b949da72e81608918f8afb3448a93b8e276733f..ac54995809d7af5ccd64fcbacf39eeccc8518a67 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMemberRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMemberRequest.java
@@ -5,9 +5,9 @@
   * 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.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
  
  import javax.xml.bind.annotation.XmlElement;
  import java.util.List;
@@ -48,4 +48,4 @@ public class NeutronLoadBalancerPoolMemberRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancerPoolMember != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java

index 92ef04616a42e42c0e85dc41e751bcfaafd70720..2a4113d2acf0e9a5222945be75b3b1284049aae5 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolMembersNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolMembersNorthbound.java
@@ -8,7 +8,7 @@
   * Authors : Srini Seetharaman
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.HashMap;
@@ -28,11 +28,11 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolMemberAware;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPool;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberAware;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
  
  @Path("/pools/{loadBalancerPoolUUID}/members")
  public class NeutronLoadBalancerPoolMembersNorthbound {
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java

index a156bbbcda45e9863fea1940d5fde00e2c0758af..2e38e1893223a1df275ec623c2a1a33133bff148 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolNorthbound.java
@@ -8,7 +8,7 @@
   * Authors : Srini Seetharaman
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -30,11 +30,11 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPool;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolAware;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
  
  /**
   * Neutron Northbound REST APIs for LoadBalancerPool Policies.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java

index a1cdc419e1222a3fc22aa0aef5a1bf2789d816d3..505529e0455e01403a42d5450b776bedefc41be9 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerPoolRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerPoolRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronLoadBalancerPoolRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancerPool != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java

index 1cf4e7016dc63692335a39f8e1beb64aa4e4108c..337fe501b93486194d579969c0684022b4ce2508 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronLoadBalancerRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronLoadBalancerRequest.java
@@ -6,9 +6,9 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancer;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -55,4 +55,4 @@ public class NeutronLoadBalancerRequest {
      public boolean isSingleton() {
          return (singletonLoadBalancer != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java

similarity index 92%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java

index 2001fb758af68801ef5f17d26cb13264438087df..c5e8cf3f95275b3ce07f0b81b77ce5a2b93fa267 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworkRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworkRequest.java
@@ -6,14 +6,14 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.List;
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
  
  @XmlRootElement
  @XmlAccessorType(XmlAccessType.NONE)
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java

index 7c4c3457950059fa8cb20c1a70c650abd19a1782..b1497772bc69d6ae2d122647bfd72e2e9435b19e 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNetworksNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNetworksNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.HashMap;
@@ -31,10 +31,10 @@ import javax.ws.rs.core.UriInfo;
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
  import org.codehaus.enunciate.jaxrs.TypeHint;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkAware;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
  
  /**
   * Neutron Northbound REST APIs for Network.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java

index 052d3dc2dde679f7d7520542f33052cdb8e2c166..060b195944bf84fa807953b771f242b740a6278e 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronNorthboundRSApplication.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronNorthboundRSApplication.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import org.eclipse.persistence.jaxb.rs.MOXyJsonProvider;
  
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java

similarity index 93%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java

index f65d7f694bd161e4c6da43fda260ac8db49292c5..a07ae42d16d7eb7e7832cbb1b1b162e9b7402974 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPageLink.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPageLink.java
@@ -8,7 +8,7 @@
   * Authors : Dave Tucker
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -41,4 +41,4 @@ public class NeutronPageLink {
      public void setHref(String href) {
          this.href = href;
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java

similarity index 92%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java

index 3bfac8a4fdf4d04a8131f10c6bf74f8df017ef03..1b1833fcb0f6d0e07010a2f2eb48fb385306474b 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortRequest.java
@@ -6,14 +6,14 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.List;
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
  
  @XmlRootElement
  @XmlAccessorType(XmlAccessType.NONE)
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java

index 9f12eca9fbb3df2f564b9eb6521bdc9afe790603..1fa1fd8d0e42fcaff989d7ac3c68f10eb63f2ee1 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronPortsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronPortsNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.HashMap;
@@ -30,14 +30,14 @@ import javax.ws.rs.core.UriInfo;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
-import org.opendaylight.controller.networkconfig.neutron.Neutron_IPs;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortAware;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
  
  /**
   * Neutron Northbound REST APIs.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java

index 806fd69e8af50ff0b85f48366521b0f0556f25a4..d493b004a844ff649b29596fa6b5d96855b2199d 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRouterRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRouterRequest.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.List;
  
@@ -15,7 +15,7 @@ import javax.xml.bind.annotation.XmlAccessorType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronRouter;
+import org.opendaylight.neutron.neutron.spi.NeutronRouter;
  
  
  @XmlRootElement
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java

index e03c9b485ebd5b5a336276db9dbb059a1155f72a..025eb34866781b65ca0ccccd43e96fe833484a7c 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronRoutersNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronRoutersNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.Iterator;
@@ -26,17 +26,17 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronRouterAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronRouterCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronRouter;
-import org.opendaylight.controller.networkconfig.neutron.NeutronRouter_Interface;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronRouterAware;
+import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronRouter;
+import org.opendaylight.neutron.neutron.spi.NeutronRouter_Interface;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  
  
  /**
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java

index 6e779d64e2fcd3de5b79c75228efe1681a98e878..c70b8577be2fdb6e5715cfa428a65527a2af186d 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupRequest.java
@@ -7,9 +7,9 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityGroup;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -56,4 +56,4 @@ public class NeutronSecurityGroupRequest {
      public boolean isSingleton() {
          return (singletonSecurityGroup != null);
      }
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java

index 8e2c2f3f70a17f0253209ef242196f5f72031efb..1a782d7d7dbc3eab315099bbec961722969f1b9c 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityGroupsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityGroupsNorthbound.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -29,10 +29,10 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityGroup;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupAware;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java

similarity index 90%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java

index b805bd63bc065f3f43e0ec7d2898a12d1d944267..f467d5872fc91a7fe2f56f912a823259486a7812 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRuleRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRuleRequest.java
@@ -7,9 +7,9 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityRule;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
  
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
@@ -56,4 +56,4 @@ public class NeutronSecurityRuleRequest {
          return bulkRequest;
      }
  
-}
-\ No newline at end of file
+}
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java

index 528daa4a9e290af6e2e669b1480679d81d21d785..bdf12d7eb7c7766623fdb7e562007101783e4dca 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSecurityRulesNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSecurityRulesNorthbound.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -29,11 +29,11 @@ import javax.ws.rs.core.Response;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityRule;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleAware;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java

similarity index 92%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java

index 4c230c525bcb79ffed8fe700110bf6af34e8260a..ac994f676159d5ac816ef82df113c660fc6b24c4 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetRequest.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetRequest.java
@@ -6,14 +6,14 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.List;
  import javax.xml.bind.annotation.XmlAccessType;
  import javax.xml.bind.annotation.XmlAccessorType;
  import javax.xml.bind.annotation.XmlElement;
  import javax.xml.bind.annotation.XmlRootElement;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  
  @XmlRootElement
  @XmlAccessorType(XmlAccessType.NONE)
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java

similarity index 97%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java

index e6c61599e5821583fb72b7a22018c9685cad9b12..eb3da1d237eb3bb2850922ea06421a5dfe8cc663 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronSubnetsNorthbound.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronSubnetsNorthbound.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  
  import java.util.ArrayList;
@@ -31,11 +31,11 @@ import javax.ws.rs.core.UriInfo;
  
  import org.codehaus.enunciate.jaxrs.ResponseCode;
  import org.codehaus.enunciate.jaxrs.StatusCodes;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetAware;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetAware;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  
  /**
   * Neutron Northbound REST APIs for Subnets.<br>
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronUtil.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java

similarity index 93%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronUtil.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java

index 481d95a89daa9393e545de5a9972af919e94510d..2a0a87a6260b36cbd3265a3cba145b6e4ccf763f 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/NeutronUtil.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/NeutronUtil.java
@@ -1,4 +1,4 @@
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import org.osgi.framework.BundleContext;
  import org.osgi.framework.FrameworkUtil;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java

similarity index 93%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java

index 25b5da13843c1bbadf5aeee0e17870d20eff640a..b4650533c0d94e058330d52b559ff32871e46174 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/PaginatedRequestFactory.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/PaginatedRequestFactory.java
@@ -8,7 +8,7 @@
   *  Authors : Dave Tucker
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import java.util.ArrayList;
  import java.util.Collections;
@@ -16,10 +16,10 @@ import java.util.Comparator;
  import java.util.List;
  import javax.ws.rs.core.UriInfo;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronObject;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.INeutronObject;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  
  public class PaginatedRequestFactory {
      private static final Comparator<INeutronObject> NEUTRON_OBJECT_COMPARATOR = new Comparator<INeutronObject>() {
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceConflictException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java

similarity index 94%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceConflictException.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java

index d9644dfe59bcfd2816d0641cb368b856e8fdc05f..8b5d548cc297c3c24813967cafbec9c0a2612f20 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceConflictException.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceConflictException.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.ws.rs.WebApplicationException;
  import javax.ws.rs.core.Response;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceNotFoundException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java

similarity index 94%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceNotFoundException.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java

index 3f39eb766c86de122a29eb43555f90a9d054220f..18d4b305f991895e8328b83b91ff9674b62f3728 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ResourceNotFoundException.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ResourceNotFoundException.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.ws.rs.WebApplicationException;
  import javax.ws.rs.core.Response;
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/RestMessages.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java

similarity index 95%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/RestMessages.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java

index e619974090b867334beafce0be542ac559f9803a..1db2cdce93540677432febc3d765cb3317e0564a 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/RestMessages.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/RestMessages.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  public enum RestMessages {
      SUCCESS("Success"), NOCONTAINER("Container does not exist"), NOSUBNET("Subnet does not exist"), NOSTATICROUTE(
diff --git a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ServiceUnavailableException.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java

similarity index 94%

rename from northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ServiceUnavailableException.java

rename to northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java

index 2d899a09e927b2adb4959fe995afa8367c925cba..dcd1cd7a69d0be142eb4f35a8028c498af6f1177 100644 (file)
--- a/northbound/src/main/java/org/opendaylight/controller/networkconfig/neutron/northbound/ServiceUnavailableException.java
+++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound-api/ServiceUnavailableException.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.northbound;
+package org.opendaylight.neutron.northbound.api;
  
  import javax.ws.rs.WebApplicationException;
  import javax.ws.rs.core.Response;
diff --git a/northbound/src/main/resources/WEB-INF/web.xml b/northbound-api/src/main/resources/WEB-INF/web.xml

similarity index 100%

rename from northbound/src/main/resources/WEB-INF/web.xml

rename to northbound-api/src/main/resources/WEB-INF/web.xml
diff --git a/northbound/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties b/northbound-api/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties

similarity index 100%

rename from northbound/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties

rename to northbound-api/src/main/resources/org/opendaylight/controller/networkconfig/neutron/northbound/jaxb.properties
diff --git a/pom.xml b/pom.xml

index 644b383a9f490ad18a5e19eb036744087e2c8333..1891a1a6be9daaaba74e59ec7f24b4925c8c8b53 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,66 +1,20 @@
  <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright IBM Corporation, 2013.  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
+-->
+
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.opendaylight.controller</groupId>
-    <artifactId>commons.opendaylight</artifactId>
-    <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../commons/opendaylight</relativePath>
-  </parent>
    <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>networkconfig.neutron</artifactId>
+  <artifactId>project-neutron</artifactId>
    <version>0.5.0-SNAPSHOT</version>
-  <packaging>bundle</packaging>
-  <dependencies>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-api</artifactId>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-bundle-plugin</artifactId>
-        <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>*</Import-Package>
-          </instructions>
-          <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/controller.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/controller.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OpenDaylight_Controller:Main</url>
-  </scm>
-  <distributionManagement>
-    <!-- OpenDayLight Released artifact -->
-    <repository>
-      <id>opendaylight-release</id>
-      <url>${nexusproxy}/repositories/${nexus.repository.release}/</url>
-    </repository>
-    <!-- OpenDayLight Snapshot artifact -->
-    <snapshotRepository>
-      <id>opendaylight-snapshot</id>
-      <url>${nexusproxy}/repositories/${nexus.repository.snapshot}/</url>
-    </snapshotRepository>
-    <!-- Site deployment -->
-    <site>
-      <id>website</id>
-      <url>${sitedeploy}</url>
-    </site>
-  </distributionManagement>
+  <packaging>pom</packaging>
+  <modules>
+    <module>neutron-spi</module>
+    <module>northbound-api</module>
+    <module>transcriber</module>
+  </modules>
  </project>
diff --git a/implementation/pom.xml b/transcriber/pom.xml

similarity index 85%

rename from implementation/pom.xml

rename to transcriber/pom.xml

index 108f5b91da38d4fd14bbbb5825d7d22f36c1ca7c..1d27be184e741a0cf53a99aca9b1e51592ee5918 100644 (file)
--- a/implementation/pom.xml
+++ b/transcriber/pom.xml
@@ -5,16 +5,17 @@
      <groupId>org.opendaylight.controller</groupId>
      <artifactId>commons.opendaylight</artifactId>
      <version>1.5.0-SNAPSHOT</version>
-    <relativePath>../../../commons/opendaylight</relativePath>
+    <relativePath>../../controller/opendaylight/commons/opendaylight</relativePath>
    </parent>
    <groupId>org.opendaylight.neutron</groupId>
-  <artifactId>networkconfig.neutron.implementation</artifactId>
+  <artifactId>transcriber</artifactId>
    <version>0.5.0-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <dependencies>
      <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>networkconfig.neutron</artifactId>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>neutron-spi</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
      </dependency>
      <dependency>
        <groupId>org.osgi</groupId>
@@ -30,7 +31,7 @@
          <configuration>
            <instructions>
              <Import-Package>*</Import-Package>
-            <Bundle-Activator>org.opendaylight.controller.networkconfig.neutron.implementation.Activator</Bundle-Activator>
+            <Bundle-Activator>org.opendaylight.neutron.transcriber.Activator</Bundle-Activator>
            </instructions>
            <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation>
          </configuration>
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/Activator.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java

similarity index 85%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/Activator.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java

index 0fbf933c17f828038183bb32e4f96d6c84bfa6f2..bdf4ad31d3a7f8814c01c06a404a628dd16ca4dd 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/Activator.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/Activator.java
@@ -6,25 +6,25 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.util.ArrayList;
  import java.util.List;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallPolicyCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolMemberCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronRouterCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
  import org.osgi.framework.BundleActivator;
  import org.osgi.framework.BundleContext;
  import org.osgi.framework.ServiceRegistration;
@@ -132,4 +132,4 @@ public class Activator implements BundleActivator {
         }
  
      }
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java

index 421f850a0eea59c3af1b3b192908692c9aca57bd..13b4853122aac366c3704c8e3000bde58e0aa1d8 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewall;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewall;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@ -114,4 +114,4 @@ public class NeutronFirewallInterface implements INeutronFirewallCRUD {
      }
  
  
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallPolicyInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java

index 886d7fd26556bf7fa458e4eb85f67ac76b85afd1..11fa6074d6d0ab1d9ead9be1f9ff89037e670ee8 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallPolicyInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallPolicyCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallPolicy;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallPolicyCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallPolicy;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@ -113,4 +113,4 @@ public class NeutronFirewallPolicyInterface implements INeutronFirewallPolicyCRU
          return !neutronFirewallPolicyExists(firewallPolicyUUID);
      }
  
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallRuleInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java

index cd0f39a76fe0d5c9ae32cdb8fbebe6fff615adf1..0259497e6e72bc32167604f076f15fd73ed74810 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFirewallRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronFirewallRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFirewallRule;
+import org.opendaylight.neutron.neutron.spi.INeutronFirewallRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronFirewallRule;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@ -113,4 +113,4 @@ public class NeutronFirewallRuleInterface implements INeutronFirewallRuleCRUD {
          return !neutronFirewallRuleExists(firewallRuleUUID);
      }
  
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java

similarity index 89%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java

index 51824d6ce1a93e42f372e6863e0f91ee2f696bb2..74ea59e1cc7e3a1f4a149697471db517a277bc04 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronFloatingIPInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFloatingIPInterface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -17,14 +17,14 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronFloatingIPCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronFloatingIP;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.INeutronFloatingIPCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronFloatingIP;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerHealthMonitorInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java

index ecf3994fb5663fc4a68e1d7661d95296613eb8db..ef9e8f587cd647b748b01db093685ae0a348342a 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerHealthMonitorCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerHealthMonitor;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerHealthMonitor;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java

index 472de903588e8bac55aca1b829ee17a3471f5840..845ff4b7c93057a42894ff9e8079bf680e45c190 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancer;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancer;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerListenerInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java

index 6acc06deb33b432ad2be183118290e024df1d3b3..f20b48159e31d6158e1554b5c237a50b58eb2800 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerListenerInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerListenerCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerListener;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerListenerCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerListener;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java

index 03c9cd94e368d15801582b78aac6a11927f88a9f..4b0274c58ad4ebfd1198227490130826543b7a99 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPool;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPool;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolMemberInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolMemberInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java

index 8ed3a3682684111d2e117501a3a302e4babfb9f6..97c0ea8015a863c133fe63c4490d60e7fbec0682 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronLoadBalancerPoolMemberInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolMemberInterface.java
@@ -6,10 +6,10 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronLoadBalancerPoolMemberCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronLoadBalancerPoolMember;
+import org.opendaylight.neutron.neutron.spi.INeutronLoadBalancerPoolMemberCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronLoadBalancerPoolMember;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java

index c9e15495209bb5847e8f571512f8a2a9ac78a5b4..45257eaae802894bedf8526f80d86c20eace9482 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronNetworkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -17,8 +17,8 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java

similarity index 91%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java

index 5c8780028dd0a5ce9cfa16aa5148ee952137aae2..e0cf8cf4924763a652073abbcd9636c0e33bb2ff 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -18,14 +18,14 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronPortCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.networkconfig.neutron.NeutronPort;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
-import org.opendaylight.controller.networkconfig.neutron.Neutron_IPs;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronPortCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronPort;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.Neutron_IPs;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java

index 5e4c5a42774d7691f82bdb27037e97b832d75ebb..8767f99a2b7eba1e9593d27355792866b8dce000 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronRouterInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -17,8 +17,8 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronRouterCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronRouter;
+import org.opendaylight.neutron.neutron.spi.INeutronRouterCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronRouter;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityGroupInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityGroupInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java

index d59bf9e093689287b9be480868318bf2e0779d80..d3da70c108db670bee27de20b1cdcf7924c8ff27 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityGroupInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityGroupInterface.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -18,8 +18,8 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityGroupCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityGroup;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityGroupCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityGroup;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@ -116,4 +116,4 @@ public class NeutronSecurityGroupInterface implements INeutronSecurityGroupCRUD
          return !neutronSecurityGroupExists(securityGroupUUID);
      }
  
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java

similarity index 94%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityRuleInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java

index 884d15f452697e69ee82a1460a1754d5b64612d4..d9c7b5735bd37834aa625ccaab0871b3712dacc3 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -7,7 +7,7 @@
   *
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -18,8 +18,8 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronSecurityRuleCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSecurityRule;
+import org.opendaylight.neutron.neutron.spi.INeutronSecurityRuleCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronSecurityRule;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@ -113,4 +113,4 @@ public class NeutronSecurityRuleInterface implements INeutronSecurityRuleCRUD {
          return !neutronSecurityRuleExists(securityRuleUUID);
      }
  
-}
-\ No newline at end of file
+}
diff --git a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java

similarity index 90%

rename from implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java

rename to transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java

index 81fa107fd8005d038a506b6f7938216e7722e158..761077184e3326678d70024a2257c44856a7356c 100644 (file)
--- a/implementation/src/main/java/org/opendaylight/controller/networkconfig/neutron/implementation/NeutronSubnetInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
@@ -6,7 +6,7 @@
   * and is available at http://www.eclipse.org/legal/epl-v10.html
   */
  
-package org.opendaylight.controller.networkconfig.neutron.implementation;
+package org.opendaylight.neutron.transcriber;
  
  import java.lang.reflect.Method;
  import java.util.ArrayList;
@@ -17,11 +17,11 @@ import java.util.Set;
  import java.util.concurrent.ConcurrentHashMap;
  import java.util.concurrent.ConcurrentMap;
  
-import org.opendaylight.controller.networkconfig.neutron.INeutronNetworkCRUD;
-import org.opendaylight.controller.networkconfig.neutron.INeutronSubnetCRUD;
-import org.opendaylight.controller.networkconfig.neutron.NeutronCRUDInterfaces;
-import org.opendaylight.controller.networkconfig.neutron.NeutronNetwork;
-import org.opendaylight.controller.networkconfig.neutron.NeutronSubnet;
+import org.opendaylight.neutron.neutron.spi.INeutronNetworkCRUD;
+import org.opendaylight.neutron.neutron.spi.INeutronSubnetCRUD;
+import org.opendaylight.neutron.neutron.spi.NeutronCRUDInterfaces;
+import org.opendaylight.neutron.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.neutron.spi.NeutronSubnet;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
author	Ryan Moats <rmoats@us.ibm.com>
	Tue, 17 Feb 2015 18:22:41 +0000 (12:22 -0600)
committer	Ryan Moats <rmoats@us.ibm.com>
	Wed, 18 Feb 2015 21:17:19 +0000 (15:17 -0600)