diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK index 7af8e0cac6..e44142fb48 100644 --- a/apps/openstacknetworking/BUCK +++ b/apps/openstacknetworking/BUCK @@ -1,13 +1,36 @@ -BUNDLES = [ - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', - '//apps/openstacknetworking/web:onos-apps-openstacknetworking-web', - '//apps/openstacknetworking/cli:onos-apps-openstacknetworking-cli', +COMPILE_DEPS = [ + '//lib:CORE_DEPS', + '//core/store/serializers:onos-core-serializers', + '//lib:org.apache.karaf.shell.console', + '//lib:javax.ws.rs-api', + '//utils/rest:onlab-rest', + '//cli:onos-cli', + '//apps/openstacknode:onos-apps-openstacknode', + '//apps/openstackinterface/api:onos-apps-openstackinterface-api', + '//apps/openstackinterface/app:onos-apps-openstackinterface-app', + '//apps/scalablegateway:onos-apps-scalablegateway', + '//apps/dhcp/api:onos-apps-dhcp-api', ] +osgi_jar_with_tests ( + deps = COMPILE_DEPS, + web_context = '/onos/openstacknetworking', + api_title = 'OpenStack Networking App API', + api_version = '1.0', + api_description = 'REST API for OpenStack Networking App', + api_package = 'org.onosproject.openstacknetworking.web', +) + onos_app ( + app_name = 'org.onosproject.openstacknetworking', title = 'OpenStack Networking App', category = 'Utility', url = 'http://onosproject.org', - included_bundles = BUNDLES, - required_apps = [ 'org.onosproject.openstackrouting', 'org.onosproject.openstackswitching' ] + description = 'OpenStack Networking application.', + required_apps = [ + 'org.onosproject.dhcp', + 'org.onosproject.openstacknode', + 'org.onosproject.openstackinterface', + 'org.onosproject.scalablegateway' + ] ) diff --git a/apps/openstacknetworking/api/BUCK b/apps/openstacknetworking/api/BUCK deleted file mode 100644 index 1b4424ed43..0000000000 --- a/apps/openstacknetworking/api/BUCK +++ /dev/null @@ -1,10 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//lib:jersey-client', - '//lib:javax.ws.rs-api', - '//apps/openstackinterface/api:onos-apps-openstackinterface-api', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) diff --git a/apps/openstacknetworking/api/pom.xml b/apps/openstacknetworking/api/pom.xml deleted file mode 100644 index 74196a7dcf..0000000000 --- a/apps/openstacknetworking/api/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - 4.0.0 - - - org.onosproject - onos-app-openstacknetworking - 1.10.0-SNAPSHOT - - - onos-app-openstacknetworking-api - bundle - - - - org.onosproject - onos-app-openstackinterface-api - 1.10.0-SNAPSHOT - - - org.osgi - org.osgi.compendium - - - org.onosproject - onos-api - - - org.onosproject - onos-core-serializers - ${project.version} - - - - - diff --git a/apps/openstacknetworking/cli/BUCK b/apps/openstacknetworking/cli/BUCK deleted file mode 100644 index 55a3de234a..0000000000 --- a/apps/openstacknetworking/cli/BUCK +++ /dev/null @@ -1,13 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//lib:org.apache.karaf.shell.console', - '//incubator/api:onos-incubator-api', - '//cli:onos-cli', - '//utils/osgi:onlab-osgi', - '//core/store/serializers:onos-core-serializers', - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) diff --git a/apps/openstacknetworking/cli/pom.xml b/apps/openstacknetworking/cli/pom.xml deleted file mode 100644 index 88d13c502f..0000000000 --- a/apps/openstacknetworking/cli/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - 4.0.0 - - - org.onosproject - onos-app-openstacknetworking - 1.10.0-SNAPSHOT - - - onos-app-openstacknetworking-cli - bundle - - - 1.0.0 - ONOS Openstack Networking REST API - - APIs for interacting with Openstack Neutron Plugin. - - org.onosproject.openstacknetworking.cli - - - - - - org.onosproject - onos-app-openstacknetworking-api - ${project.version} - - - - org.onosproject - onlab-osgi - - - - org.onosproject - onlab-junit - test - - - - org.apache.felix - org.apache.felix.scr.annotations - provided - - - org.onosproject - onos-cli - ${project.version} - - - org.apache.karaf.shell - org.apache.karaf.shell.console - - - diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml index 37ce5fc662..e9569cc5bf 100644 --- a/apps/openstacknetworking/pom.xml +++ b/apps/openstacknetworking/pom.xml @@ -16,7 +16,7 @@ --> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 @@ -26,15 +26,191 @@ onos-app-openstacknetworking - pom + bundle + + + org.onosproject.openstacknetworking + OpenStack Networking App + Traffic Steering + http://onosproject.org + OpenStack networking application + + org.onosproject.dhcp, + org.onosproject.openstacknode, + org.onosproject.openstacinterface, + org.onosproject.scalablegateway + + /onos/openstacknetworking + 1.0.0 + ONOS OpenStack Networking REST API + + APIs for interacting with OpenStack Neutron ONOS driver. + + org.onosproject.openstacknetworking.web + + + + + org.onosproject + onos-api + ${project.version} + + + org.onosproject + onos-core-serializers + ${project.version} + + + org.onosproject + onos-cli + ${project.version} + + + org.onosproject + onos-rest + ${project.version} + + + org.onosproject + onlab-rest + ${project.version} + + + org.onosproject + onlab-osgi + ${project.version} + + + org.onosproject + onlab-misc + ${project.version} + + + org.onosproject + onos-core-common + ${project.version} + + + org.onosproject + onlab-junit + ${project.version} + test + + + org.onosproject + onos-app-dhcp-api + ${project.version} + + + org.onosproject + onos-app-dhcp + ${project.version} + + + org.onosproject + onos-app-openstackinterface-api + ${project.version} + + + org.onosproject + onos-app-openstackinterface-app + ${project.version} + + + org.onosproject + onos-app-openstacknode + ${project.version} + + + org.onosproject + onos-app-scalablegateway + ${project.version} + + + javax.ws.rs + javax.ws.rs-api + 2.0.1 + + + org.glassfish.jersey.containers + jersey-container-servlet + + + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations + + + org.osgi + org.osgi.compendium + + + org.osgi + org.osgi.core + + + org.glassfish.jersey.core + jersey-client + + + org.glassfish.jersey.core + jersey-common + 2.25 + + + org.onosproject + onlab-misc + + + + + + + org.onosproject + onos-maven-plugin + + + org.apache.felix + maven-scr-plugin + 1.21.0 + + + generate-scr-srcdescriptor + + scr + + + + + + bundle + war + + + + + org.apache.felix + maven-bundle-plugin + true + + + <_wab>src/main/webapp/ + + WEB-INF/classes/apidoc/swagger.json=target/swagger.json, + {maven-resources} + + + ${project.groupId}.${project.artifactId} + + ${web.context} + + + + + - - api - web - cli - switching - routing - - SONA Openstack Networking Application diff --git a/apps/openstacknetworking/routing/BUCK b/apps/openstacknetworking/routing/BUCK deleted file mode 100644 index 7cd9cb1acb..0000000000 --- a/apps/openstacknetworking/routing/BUCK +++ /dev/null @@ -1,29 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//core/store/serializers:onos-core-serializers', - '//apps/openstackinterface/api:onos-apps-openstackinterface-api', - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', - '//apps/scalablegateway:onos-apps-scalablegateway', - '//apps/openstacknode:onos-apps-openstacknode', -] - -BUNDLES = [ - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', - '//apps/openstacknetworking/web:onos-apps-openstacknetworking-web', - '//apps/openstacknetworking/cli:onos-apps-openstacknetworking-cli', - '//apps/openstacknetworking/routing:onos-apps-openstacknetworking-routing', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) - -onos_app ( - app_name = 'org.onosproject.openstackrouting', - title = 'OpenStack Routing App', - category = 'Utility', - url = 'http://onosproject.org', - description = 'OpenStack routing application.', - included_bundles = BUNDLES, - required_apps = [ 'org.onosproject.openstackinterface', 'org.onosproject.openstacknode', 'org.onosproject.scalablegateway' ] -) diff --git a/apps/openstacknetworking/routing/app.xml b/apps/openstacknetworking/routing/app.xml deleted file mode 100644 index c4da7e3709..0000000000 --- a/apps/openstacknetworking/routing/app.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - SONA Openstack Networking Application - mvn:${project.groupId}/onos-app-openstackrouting/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-cli/${project.version} - \ No newline at end of file diff --git a/apps/openstacknetworking/routing/features.xml b/apps/openstacknetworking/routing/features.xml deleted file mode 100644 index f9be32effc..0000000000 --- a/apps/openstacknetworking/routing/features.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - onos-api - mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version} - mvn:${project.groupId}/onos-app-openstackrouting/${project.version} - - diff --git a/apps/openstacknetworking/routing/pom.xml b/apps/openstacknetworking/routing/pom.xml deleted file mode 100644 index c0122f023d..0000000000 --- a/apps/openstacknetworking/routing/pom.xml +++ /dev/null @@ -1,79 +0,0 @@ - - - - 4.0.0 - - - org.onosproject - onos-app-openstacknetworking - 1.10.0-SNAPSHOT - - - onos-app-openstackrouting - bundle - - - org.onosproject.openstackrouting - Openstack Routing App - Traffic Steering - http://onosproject.org - - org.onosproject.openstackinterface, - org.onosproject.openstacknode, - org.onosproject.scalablegateway - - - - - - org.osgi - org.osgi.compendium - - - org.onosproject - onos-api - - - org.onosproject - onos-core-serializers - ${project.version} - - - org.onosproject - onos-app-openstacknetworking-api - ${project.version} - - - org.onosproject - onos-app-openstackinterface-api - ${project.version} - - - org.onosproject - onos-app-scalablegateway - ${project.version} - - - org.onosproject - onos-app-openstacknode - ${project.version} - - - - diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/Constants.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/Constants.java similarity index 98% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/Constants.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/Constants.java index fa64015df6..4ba121a618 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/Constants.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/Constants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.api; import org.onlab.packet.Ip4Address; import org.onlab.packet.Ip4Prefix; diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackFloatingIpService.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackFloatingIpService.java similarity index 97% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackFloatingIpService.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackFloatingIpService.java index 40b2f3f5d7..9988a4eeda 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackFloatingIpService.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackFloatingIpService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.api; import org.onosproject.net.Host; diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackRoutingService.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRoutingService.java similarity index 97% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackRoutingService.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRoutingService.java index 762f2ed9c3..29e492e11f 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackRoutingService.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackRoutingService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.api; import org.onosproject.net.Host; diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSecurityGroupService.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSecurityGroupService.java similarity index 96% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSecurityGroupService.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSecurityGroupService.java index c7afbeb804..1709c95420 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSecurityGroupService.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSecurityGroupService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.api; import org.onosproject.net.Host; diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSwitchingService.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSwitchingService.java similarity index 95% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSwitchingService.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSwitchingService.java index 7032a12bc0..dc1113e3c4 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/OpenstackSwitchingService.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/OpenstackSwitchingService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.api; import org.onosproject.net.Host; diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/package-info.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/package-info.java similarity index 93% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/package-info.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/package-info.java index 7d014bd124..0cd17c19bb 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/package-info.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/api/package-info.java @@ -17,4 +17,4 @@ /** * Application for OpenstackRouting. */ -package org.onosproject.openstacknetworking; \ No newline at end of file +package org.onosproject.openstacknetworking.api; \ No newline at end of file diff --git a/apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java similarity index 89% rename from apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java index 66f5725274..b2f5b8d3f0 100644 --- a/apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstancePurgeFlowsCommand.java @@ -25,12 +25,12 @@ import org.onosproject.net.Host; import org.onosproject.net.HostId; import org.onosproject.net.host.HostService; -import org.onosproject.openstacknetworking.OpenstackSwitchingService; -import org.onosproject.openstacknetworking.OpenstackSecurityGroupService; -import org.onosproject.openstacknetworking.OpenstackRoutingService; -import org.onosproject.openstacknetworking.OpenstackFloatingIpService; +import org.onosproject.openstacknetworking.api.OpenstackSwitchingService; +import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService; +import org.onosproject.openstacknetworking.api.OpenstackRoutingService; +import org.onosproject.openstacknetworking.api.OpenstackFloatingIpService; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; /** * Purge Flows of OpenstackInstance Data Plane. diff --git a/apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java similarity index 89% rename from apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java index 8b53f87a1f..eda334d3bf 100644 --- a/apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/OpenstackInstanceReInstallFlowCommand.java @@ -25,12 +25,12 @@ import org.onosproject.net.Host; import org.onosproject.net.HostId; import org.onosproject.net.host.HostService; -import org.onosproject.openstacknetworking.OpenstackSwitchingService; -import org.onosproject.openstacknetworking.OpenstackSecurityGroupService; -import org.onosproject.openstacknetworking.OpenstackRoutingService; -import org.onosproject.openstacknetworking.OpenstackFloatingIpService; +import org.onosproject.openstacknetworking.api.OpenstackSwitchingService; +import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService; +import org.onosproject.openstacknetworking.api.OpenstackRoutingService; +import org.onosproject.openstacknetworking.api.OpenstackFloatingIpService; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; /** * Re-Install Flows of OpenstackInstance Data Plane. diff --git a/apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java similarity index 100% rename from apps/openstacknetworking/cli/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/cli/package-info.java diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/AbstractVmHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/AbstractVmHandler.java similarity index 98% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/AbstractVmHandler.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/AbstractVmHandler.java index a373ff0b61..f37a323eec 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/AbstractVmHandler.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/AbstractVmHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.impl; import org.onlab.osgi.DefaultServiceDirectory; import org.onlab.osgi.ServiceDirectory; @@ -38,7 +38,7 @@ import java.util.stream.Collectors; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; import static org.slf4j.LoggerFactory.getLogger; /** diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFloatingIpManager.java similarity index 97% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFloatingIpManager.java index 702248faa9..602b0f7511 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFloatingIpManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; import com.google.common.base.Strings; import org.apache.felix.scr.annotations.Activate; @@ -42,10 +42,8 @@ import org.onosproject.net.flowobjective.ForwardingObjective; import org.onosproject.net.host.HostService; import org.onosproject.openstackinterface.OpenstackFloatingIP; import org.onosproject.openstackinterface.OpenstackInterfaceService; -import org.onosproject.openstacknetworking.AbstractVmHandler; -import org.onosproject.openstacknetworking.Constants; -import org.onosproject.openstacknetworking.OpenstackFloatingIpService; -import org.onosproject.openstacknetworking.RulePopulatorUtil; +import org.onosproject.openstacknetworking.api.Constants; +import org.onosproject.openstacknetworking.api.OpenstackFloatingIpService; import org.onosproject.openstacknode.OpenstackNode; import org.onosproject.openstacknode.OpenstackNodeEvent; import org.onosproject.openstacknode.OpenstackNodeListener; @@ -65,8 +63,8 @@ import java.util.concurrent.ExecutorService; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.*; -import static org.onosproject.openstacknetworking.RulePopulatorUtil.buildExtension; +import static org.onosproject.openstacknetworking.api.Constants.*; +import static org.onosproject.openstacknetworking.impl.RulePopulatorUtil.buildExtension; @Service diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackIcmpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackIcmpHandler.java similarity index 98% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackIcmpHandler.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackIcmpHandler.java index 27c54f148d..d58062af56 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackIcmpHandler.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackIcmpHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; import com.google.common.collect.Maps; import org.apache.felix.scr.annotations.Activate; @@ -42,7 +42,7 @@ import org.onosproject.net.packet.PacketPriority; import org.onosproject.net.packet.PacketProcessor; import org.onosproject.net.packet.PacketService; import org.onosproject.openstackinterface.OpenstackRouter; -import org.onosproject.openstacknetworking.Constants; +import org.onosproject.openstacknetworking.api.Constants; import org.onosproject.openstackinterface.OpenstackInterfaceService; import org.onosproject.openstackinterface.OpenstackPort; import org.onosproject.openstacknode.OpenstackNode; @@ -61,7 +61,7 @@ import java.util.concurrent.ExecutorService; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; import static org.onosproject.openstacknode.OpenstackNodeService.NodeType.GATEWAY; import static org.slf4j.LoggerFactory.getLogger; diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackPnatHandler.java similarity index 99% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackPnatHandler.java index 234e9cec42..5a5eafc10e 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackPnatHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -52,7 +52,6 @@ import org.onosproject.net.packet.PacketService; import org.onosproject.openstackinterface.OpenstackInterfaceService; import org.onosproject.openstackinterface.OpenstackPort; import org.onosproject.openstackinterface.OpenstackRouter; -import org.onosproject.openstacknetworking.RulePopulatorUtil; import org.onosproject.openstacknode.OpenstackNodeService; import org.onosproject.scalablegateway.api.ScalableGatewayService; import org.onosproject.store.serializers.KryoNamespaces; @@ -68,7 +67,7 @@ import java.util.concurrent.ExecutorService; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; import static org.slf4j.LoggerFactory.getLogger; /** diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingArpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java similarity index 94% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingArpHandler.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java index e31f410d60..0bf93dcbfa 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingArpHandler.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingArpHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -35,7 +35,7 @@ import org.onosproject.net.packet.PacketService; import org.onosproject.openstackinterface.OpenstackInterfaceService; import org.onosproject.openstackinterface.OpenstackPort; import org.onosproject.scalablegateway.api.ScalableGatewayService; -import org.onosproject.openstacknetworking.Constants; +import org.onosproject.openstacknetworking.api.Constants; import org.slf4j.Logger; import java.nio.ByteBuffer; @@ -43,8 +43,8 @@ import java.util.concurrent.ExecutorService; import static java.util.concurrent.Executors.newSingleThreadExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.DEVICE_OWNER_FLOATING_IP; -import static org.onosproject.openstacknetworking.Constants.DEVICE_OWNER_ROUTER_GATEWAY; +import static org.onosproject.openstacknetworking.api.Constants.DEVICE_OWNER_FLOATING_IP; +import static org.onosproject.openstacknetworking.api.Constants.DEVICE_OWNER_ROUTER_GATEWAY; import static org.slf4j.LoggerFactory.getLogger; /** diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingManager.java similarity index 97% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingManager.java index f7989bd361..2482333254 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackRoutingManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -45,10 +45,8 @@ import org.onosproject.openstackinterface.OpenstackNetwork; import org.onosproject.openstackinterface.OpenstackRouter; import org.onosproject.openstackinterface.OpenstackRouterInterface; import org.onosproject.openstackinterface.OpenstackSubnet; -import org.onosproject.openstacknetworking.AbstractVmHandler; -import org.onosproject.openstacknetworking.Constants; -import org.onosproject.openstacknetworking.OpenstackRoutingService; -import org.onosproject.openstacknetworking.RulePopulatorUtil; +import org.onosproject.openstacknetworking.api.Constants; +import org.onosproject.openstacknetworking.api.OpenstackRoutingService; import org.onosproject.openstacknode.OpenstackNode; import org.onosproject.openstacknode.OpenstackNodeEvent; import org.onosproject.openstacknode.OpenstackNodeListener; @@ -67,8 +65,8 @@ import java.util.stream.Collectors; import static java.util.concurrent.Executors.newSingleThreadScheduledExecutor; import static org.onlab.util.Tools.groupedThreads; -import static org.onosproject.openstacknetworking.Constants.*; -import static org.onosproject.openstacknetworking.RulePopulatorUtil.buildExtension; +import static org.onosproject.openstacknetworking.api.Constants.*; +import static org.onosproject.openstacknetworking.impl.RulePopulatorUtil.buildExtension; import static org.onosproject.openstacknode.OpenstackNodeService.NodeType.COMPUTE; import static org.onosproject.openstacknode.OpenstackNodeService.NodeType.GATEWAY; diff --git a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupManager.java similarity index 98% rename from apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupManager.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupManager.java index 1cc6ef55b3..3f6f480216 100644 --- a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSecurityGroupManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSecurityGroupManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.openstacknetworking.switching; +package org.onosproject.openstacknetworking.impl; import com.google.common.collect.Maps; import com.google.common.collect.Sets; @@ -43,8 +43,7 @@ import org.onosproject.openstackinterface.OpenstackInterfaceService; import org.onosproject.openstackinterface.OpenstackPort; import org.onosproject.openstackinterface.OpenstackSecurityGroup; import org.onosproject.openstackinterface.OpenstackSecurityGroupRule; -import org.onosproject.openstacknetworking.OpenstackSecurityGroupService; -import org.onosproject.openstacknetworking.AbstractVmHandler; +import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,7 +53,7 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; /** * Populates flows rules for Security Groups of VMs. diff --git a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingArpHandler.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java similarity index 97% rename from apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingArpHandler.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java index d70524c4a5..b4ae36c6b8 100644 --- a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingArpHandler.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.switching; +package org.onosproject.openstacknetworking.impl; import com.google.common.base.Strings; import com.google.common.collect.Sets; @@ -40,7 +40,6 @@ import org.onosproject.net.packet.PacketService; import org.onosproject.openstackinterface.OpenstackInterfaceService; import org.onosproject.openstackinterface.OpenstackNetwork; import org.onosproject.openstackinterface.OpenstackPort; -import org.onosproject.openstacknetworking.AbstractVmHandler; import org.osgi.service.component.ComponentContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,7 +48,7 @@ import java.util.Dictionary; import java.util.Set; import static com.google.common.base.Preconditions.checkNotNull; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; /** * Handles ARP packet from VMs. diff --git a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingHostManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostManager.java similarity index 99% rename from apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingHostManager.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostManager.java index f3d81db449..99dd9274a6 100644 --- a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingHostManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingHostManager.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking.switching; +package org.onosproject.openstacknetworking.impl; import com.google.common.base.Strings; import com.google.common.collect.Sets; @@ -70,7 +70,7 @@ import static org.onosproject.dhcp.IpAssignment.AssignmentStatus.Option_RangeNot import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; import static org.onosproject.net.AnnotationKeys.PORT_NAME; -import static org.onosproject.openstacknetworking.Constants.*; +import static org.onosproject.openstacknetworking.api.Constants.*; @Service @Component(immediate = true) diff --git a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingManager.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingManager.java similarity index 95% rename from apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingManager.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingManager.java index 3a46d4a9c5..d9efb3f47a 100644 --- a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/OpenstackSwitchingManager.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingManager.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.onosproject.openstacknetworking.switching; +package org.onosproject.openstacknetworking.impl; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -36,9 +36,7 @@ import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficTreatment; import org.onosproject.net.flowobjective.FlowObjectiveService; import org.onosproject.net.flowobjective.ForwardingObjective; -import org.onosproject.openstacknetworking.AbstractVmHandler; -import org.onosproject.openstacknetworking.OpenstackSwitchingService; -import org.onosproject.openstacknetworking.RulePopulatorUtil; +import org.onosproject.openstacknetworking.api.OpenstackSwitchingService; import org.onosproject.openstacknode.OpenstackNodeService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,8 +44,8 @@ import org.slf4j.LoggerFactory; import java.util.Objects; import java.util.Optional; -import static org.onosproject.openstacknetworking.Constants.*; -import static org.onosproject.openstacknetworking.RulePopulatorUtil.buildExtension; +import static org.onosproject.openstacknetworking.api.Constants.*; +import static org.onosproject.openstacknetworking.impl.RulePopulatorUtil.buildExtension; /** diff --git a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/RulePopulatorUtil.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java similarity index 98% rename from apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/RulePopulatorUtil.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java index 3326417c99..3a7780489d 100644 --- a/apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/RulePopulatorUtil.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/RulePopulatorUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.onosproject.openstacknetworking; +package org.onosproject.openstacknetworking.impl; import org.onlab.packet.Ip4Address; import org.onosproject.core.ApplicationId; diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/package-info.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/package-info.java similarity index 94% rename from apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/package-info.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/package-info.java index 67fd1a56ab..47cd773bd6 100644 --- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/package-info.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/impl/package-info.java @@ -19,4 +19,4 @@ * forwards packets from internal networks to external ones, and accesses instances * from external networks through floating IPs. */ -package org.onosproject.openstacknetworking.routing; +package org.onosproject.openstacknetworking.impl; diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java similarity index 99% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java index 1b608c099a..c39afd6b5b 100644 --- a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpensatckRouterWebResource.java @@ -21,7 +21,7 @@ import org.onosproject.openstackinterface.OpenstackRouter; import org.onosproject.openstackinterface.OpenstackRouterInterface; import org.onosproject.openstackinterface.web.OpenstackRouterCodec; import org.onosproject.openstackinterface.web.OpenstackRouterInterfaceCodec; -import org.onosproject.openstacknetworking.OpenstackRoutingService; +import org.onosproject.openstacknetworking.api.OpenstackRoutingService; import org.onosproject.rest.AbstractWebResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java similarity index 98% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java index 2ddf176043..a6880fdf27 100644 --- a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java @@ -20,7 +20,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.onosproject.openstackinterface.OpenstackFloatingIP; import org.onosproject.openstackinterface.web.OpenstackFloatingIpCodec; -import org.onosproject.openstacknetworking.OpenstackFloatingIpService; +import org.onosproject.openstacknetworking.api.OpenstackFloatingIpService; import org.onosproject.rest.AbstractWebResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java similarity index 100% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java similarity index 97% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java index c82ac33444..7683b0ca36 100644 --- a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java +++ b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java @@ -19,7 +19,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import org.onosproject.openstackinterface.OpenstackPort; import org.onosproject.openstackinterface.web.OpenstackPortCodec; -import org.onosproject.openstacknetworking.OpenstackSecurityGroupService; +import org.onosproject.openstacknetworking.api.OpenstackSecurityGroupService; import org.onosproject.rest.AbstractWebResource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java similarity index 100% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSubnetWebResource.java diff --git a/apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/package-info.java b/apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/package-info.java similarity index 100% rename from apps/openstacknetworking/web/src/main/java/org/onosproject/openstacknetworking/web/package-info.java rename to apps/openstacknetworking/src/main/java/org/onosproject/openstacknetworking/web/package-info.java diff --git a/apps/openstacknetworking/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/openstacknetworking/src/main/resources/OSGI-INF/blueprint/shell-config.xml similarity index 100% rename from apps/openstacknetworking/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml rename to apps/openstacknetworking/src/main/resources/OSGI-INF/blueprint/shell-config.xml diff --git a/apps/openstacknetworking/web/src/main/webapp/WEB-INF/web.xml b/apps/openstacknetworking/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from apps/openstacknetworking/web/src/main/webapp/WEB-INF/web.xml rename to apps/openstacknetworking/src/main/webapp/WEB-INF/web.xml diff --git a/apps/openstacknetworking/switching/BUCK b/apps/openstacknetworking/switching/BUCK deleted file mode 100644 index cbb3ec47b2..0000000000 --- a/apps/openstacknetworking/switching/BUCK +++ /dev/null @@ -1,29 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//core/store/serializers:onos-core-serializers', - '//apps/openstackinterface/api:onos-apps-openstackinterface-api', - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', - '//apps/openstacknode:onos-apps-openstacknode', - '//apps/dhcp/api:onos-apps-dhcp-api', -] - -BUNDLES = [ - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', - '//apps/openstacknetworking/web:onos-apps-openstacknetworking-web', - '//apps/openstacknetworking/cli:onos-apps-openstacknetworking-cli', - '//apps/openstacknetworking/switching:onos-apps-openstacknetworking-switching', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, -) - -onos_app ( - app_name = 'org.onosproject.openstackswitching', - title = 'OpenStack Switching App', - category = 'Utility', - url = 'http://onosproject.org', - description = 'OpenStack Switching application.', - included_bundles = BUNDLES, - required_apps = [ 'org.onosproject.openstackinterface', 'org.onosproject.openstacknode', 'org.onosproject.dhcp' ] -) diff --git a/apps/openstacknetworking/switching/app.xml b/apps/openstacknetworking/switching/app.xml deleted file mode 100644 index 04467c14e6..0000000000 --- a/apps/openstacknetworking/switching/app.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - SONA Openstack Networking Application - mvn:${project.groupId}/onos-app-openstackswitching/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-cli/${project.version} - \ No newline at end of file diff --git a/apps/openstacknetworking/switching/features.xml b/apps/openstacknetworking/switching/features.xml deleted file mode 100644 index 1792b6131d..0000000000 --- a/apps/openstacknetworking/switching/features.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - onos-api - mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version} - mvn:${project.groupId}/onos-app-openstackswitching/${project.version} - - diff --git a/apps/openstacknetworking/switching/pom.xml b/apps/openstacknetworking/switching/pom.xml deleted file mode 100644 index 672fe47917..0000000000 --- a/apps/openstacknetworking/switching/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - 4.0.0 - - - org.onosproject - onos-app-openstacknetworking - 1.10.0-SNAPSHOT - - - onos-app-openstackswitching - bundle - - - org.onosproject.openstackswitching - Openstack Switching App - Traffic Steering - http://onosproject.org - - org.onosproject.dhcp, - org.onosproject.openstackinterface, - org.onosproject.openstacknode - - - - - - org.osgi - org.osgi.compendium - - - org.onosproject - onos-app-openstacknetworking-api - ${project.version} - - - org.onosproject - onos-app-openstackinterface-api - ${project.version} - - - org.onosproject - onos-app-openstacknode - ${project.version} - - - org.onosproject - onos-app-dhcp - ${project.version} - - - org.onosproject - onos-app-dhcp-api - ${project.version} - - - org.onosproject - onos-rest - ${project.version} - - - org.onosproject - onlab-rest - ${project.version} - - - org.onosproject - onlab-misc - - - diff --git a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/package-info.java b/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/package-info.java deleted file mode 100644 index 5b6cfb3f6b..0000000000 --- a/apps/openstacknetworking/switching/src/main/java/org/onosproject/openstacknetworking/switching/package-info.java +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Copyright 2016-present Open Networking Laboratory - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * OpenStack switch implementation. - */ -package org.onosproject.openstacknetworking.switching; diff --git a/apps/openstacknetworking/web/BUCK b/apps/openstacknetworking/web/BUCK deleted file mode 100644 index a19cc32e9f..0000000000 --- a/apps/openstacknetworking/web/BUCK +++ /dev/null @@ -1,14 +0,0 @@ -COMPILE_DEPS = [ - '//lib:CORE_DEPS', - '//lib:jersey-client', - '//lib:javax.ws.rs-api', - '//utils/rest:onlab-rest', - '//apps/openstackinterface/api:onos-apps-openstackinterface-api', - '//apps/openstackinterface/app:onos-apps-openstackinterface-app', - '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api', -] - -osgi_jar_with_tests ( - deps = COMPILE_DEPS, - web_context = '/onos/openstacknetworking' -) diff --git a/apps/openstacknetworking/web/features.xml b/apps/openstacknetworking/web/features.xml deleted file mode 100644 index 2043fc628d..0000000000 --- a/apps/openstacknetworking/web/features.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - onos-api - mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version} - mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version} - - diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml deleted file mode 100644 index fa85553b04..0000000000 --- a/apps/openstacknetworking/web/pom.xml +++ /dev/null @@ -1,135 +0,0 @@ - - - - 4.0.0 - - - org.onosproject - onos-app-openstacknetworking - 1.10.0-SNAPSHOT - - - onos-app-openstacknetworking-web - bundle - - - /onos/openstacknetworking - 1.0.0 - ONOS Openstack Networking REST API - - APIs for interacting with Openstack Neutron Plugin. - - org.onosproject.openstacknetworking.web - - - - - org.onosproject - onos-app-openstacknetworking-api - ${project.version} - - - org.onosproject - onos-app-openstackinterface-app - ${project.version} - - - org.onosproject - onos-app-openstackinterface-api - ${project.version} - - - org.onosproject - onos-rest - ${project.version} - - - org.onosproject - onlab-rest - ${project.version} - - - javax.ws.rs - javax.ws.rs-api - 2.0.1 - - - org.glassfish.jersey.containers - jersey-container-servlet - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - org.osgi - org.osgi.compendium - - - org.osgi - org.osgi.core - - - org.onosproject - onos-app-dhcp-api - ${project.version} - - - org.glassfish.jersey.core - jersey-client - - - org.glassfish.jersey.core - jersey-common - 2.25 - - - org.onosproject - onlab-misc - - - - - - - org.apache.felix - maven-bundle-plugin - true - - - <_wab>src/main/webapp/ - - ${project.groupId}.${project.artifactId} - - - *,org.glassfish.jersey.servlet - - ${web.context} - - - - - - - - diff --git a/modules.defs b/modules.defs index 6fa2961970..7395ade99e 100644 --- a/modules.defs +++ b/modules.defs @@ -141,8 +141,6 @@ ONOS_APPS = [ '//apps/mlb:onos-apps-mlb-oar', '//apps/openstackinterface:onos-apps-openstackinterface-oar', '//apps/openstacknetworking:onos-apps-openstacknetworking-oar', - '//apps/openstacknetworking/routing:onos-apps-openstacknetworking-routing-oar', - '//apps/openstacknetworking/switching:onos-apps-openstacknetworking-switching-oar', '//apps/mobility:onos-apps-mobility-oar', '//apps/optical:onos-apps-optical-oar', '//apps/newoptical:onos-apps-newoptical-oar',