REST API support for DHCP Relay
Change-Id: Icfefebd15ff43718493e5223254b23ec02ee0bab
diff --git a/apps/dhcprelay/BUCK b/apps/dhcprelay/BUCK
index 0ab90d1..733fd20 100644
--- a/apps/dhcprelay/BUCK
+++ b/apps/dhcprelay/BUCK
@@ -1,30 +1,8 @@
-COMPILE_DEPS = [
- '//lib:CORE_DEPS',
- '//lib:JACKSON',
- '//lib:KRYO',
- '//lib:org.apache.karaf.shell.console',
- '//cli:onos-cli',
- '//core/store/serializers:onos-core-serializers',
- '//apps/route-service/api:onos-apps-route-service-api',
- '//apps/routing/fpm/api:onos-apps-routing-fpm-api',
-]
-
-TEST_DEPS = [
- '//lib:TEST',
- '//apps/route-service/api:onos-apps-route-service-api-tests',
- '//core/api:onos-api-tests',
-]
-
BUNDLES = [
- '//apps/dhcprelay:onos-apps-dhcprelay',
- '//apps/routing/fpm/api:onos-apps-routing-fpm-api',
+ '//apps/dhcprelay/web:onos-apps-dhcprelay-web',
+ '//apps/dhcprelay/app:onos-apps-dhcprelay-app',
]
-osgi_jar_with_tests (
- deps = COMPILE_DEPS,
- test_deps = TEST_DEPS,
-)
-
onos_app (
app_name = 'org.onosproject.dhcprelay',
title = 'DHCP Relay Agent',
diff --git a/apps/dhcprelay/BUILD b/apps/dhcprelay/BUILD
new file mode 100644
index 0000000..c444b1a
--- /dev/null
+++ b/apps/dhcprelay/BUILD
@@ -0,0 +1,14 @@
+BUNDLES = [
+ "//apps/dhcprelay/web:onos-apps-dhcprelay-web",
+ "//apps/dhcprelay/app:onos-apps-dhcprelay-app",
+]
+
+onos_app(
+ app_name = "org.onosproject.dhcprelay",
+ category = "Utility",
+ description = "DHCP Relay Agent Application.",
+ included_bundles = BUNDLES,
+ required_apps = ["org.onosproject.route-service"],
+ title = "DHCP Relay Agent",
+ url = "http://onosproject.org",
+)
diff --git a/apps/dhcprelay/app/BUCK b/apps/dhcprelay/app/BUCK
new file mode 100644
index 0000000..d698297
--- /dev/null
+++ b/apps/dhcprelay/app/BUCK
@@ -0,0 +1,21 @@
+COMPILE_DEPS = [
+ '//lib:CORE_DEPS',
+ '//lib:JACKSON',
+ '//lib:KRYO',
+ '//lib:org.apache.karaf.shell.console',
+ '//cli:onos-cli',
+ '//core/store/serializers:onos-core-serializers',
+ '//apps/route-service/api:onos-apps-route-service-api',
+ '//apps/routing/fpm/api:onos-apps-routing-fpm-api',
+]
+
+TEST_DEPS = [
+ '//lib:TEST',
+ '//apps/route-service/api:onos-apps-route-service-api-tests',
+ '//core/api:onos-api-tests',
+]
+
+osgi_jar_with_tests (
+ deps = COMPILE_DEPS,
+ test_deps = TEST_DEPS,
+)
diff --git a/apps/dhcprelay/app/BUILD b/apps/dhcprelay/app/BUILD
new file mode 100644
index 0000000..29e4908
--- /dev/null
+++ b/apps/dhcprelay/app/BUILD
@@ -0,0 +1,15 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
+ "//core/store/serializers:onos-core-serializers",
+ "//apps/route-service/api:onos-apps-route-service-api",
+ "//apps/routing/fpm/api:onos-apps-routing-fpm-api",
+]
+
+TEST_DEPS = TEST + [
+ "//apps/route-service/api:onos-apps-route-service-api-tests",
+ "//core/api:onos-api-tests",
+]
+
+osgi_jar_with_tests(
+ test_deps = TEST_DEPS,
+ deps = COMPILE_DEPS,
+)
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerUtil.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerUtil.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerUtil.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerUtil.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerImpl.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/Dhcp6HandlerUtil.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/DhcpRelayManager.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/InternalPacket.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/InternalPacket.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/InternalPacket.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/InternalPacket.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpHandler.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpRelayService.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpRelayService.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpRelayService.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpRelayService.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpServerInfo.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpServerInfo.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/DhcpServerInfo.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/DhcpServerInfo.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/package-info.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/package-info.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/api/package-info.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/api/package-info.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmAddCommand.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmAddCommand.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmAddCommand.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmAddCommand.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmDeleteCommand.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmDeleteCommand.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmDeleteCommand.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmDeleteCommand.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmRoutesCommand.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmRoutesCommand.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmRoutesCommand.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpFpmRoutesCommand.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayAggCountersCommand.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayAggCountersCommand.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayAggCountersCommand.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayAggCountersCommand.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCounterCompleter.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCounterCompleter.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCounterCompleter.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCounterCompleter.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayResetCompleter.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayResetCompleter.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayResetCompleter.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayResetCompleter.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/package-info.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/package-info.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/package-info.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/cli/package-info.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DefaultDhcpRelayConfig.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/DefaultDhcpRelayConfig.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DefaultDhcpRelayConfig.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/DefaultDhcpRelayConfig.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/DhcpServerConfig.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/EnableDhcpFpmConfig.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/EnableDhcpFpmConfig.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/EnableDhcpFpmConfig.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/EnableDhcpFpmConfig.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfig.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfig.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfig.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfig.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/IndirectDhcpRelayConfig.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/IndirectDhcpRelayConfig.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/IndirectDhcpRelayConfig.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/IndirectDhcpRelayConfig.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/package-info.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/package-info.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/config/package-info.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/config/package-info.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/package-info.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/package-info.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/package-info.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/package-info.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmPrefixStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmPrefixStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmPrefixStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmPrefixStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmRecord.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmRecord.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmRecord.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpFpmRecord.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRecord.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRecord.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRecord.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRecord.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCounters.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCounters.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCounters.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCounters.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCountersStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCountersStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCountersStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayCountersStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStoreEvent.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStoreEvent.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStoreEvent.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DhcpRelayStoreEvent.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayCountersStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayCountersStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayCountersStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayCountersStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/DistributedFpmPrefixStore.java
diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/package-info.java b/apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/package-info.java
similarity index 100%
rename from apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/store/package-info.java
rename to apps/dhcprelay/app/src/main/java/org/onosproject/dhcprelay/store/package-info.java
diff --git a/apps/dhcprelay/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/apps/dhcprelay/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
similarity index 100%
rename from apps/dhcprelay/src/main/resources/OSGI-INF/blueprint/shell-config.xml
rename to apps/dhcprelay/app/src/main/resources/OSGI-INF/blueprint/shell-config.xml
diff --git a/apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/DhcpRelayManagerTest.java b/apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/DhcpRelayManagerTest.java
similarity index 100%
rename from apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/DhcpRelayManagerTest.java
rename to apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/DhcpRelayManagerTest.java
diff --git a/apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/config/DhcpRelayConfigTest.java b/apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/config/DhcpRelayConfigTest.java
similarity index 100%
rename from apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/config/DhcpRelayConfigTest.java
rename to apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/config/DhcpRelayConfigTest.java
diff --git a/apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfigTest.java b/apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfigTest.java
similarity index 100%
rename from apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfigTest.java
rename to apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/config/IgnoreDhcpConfigTest.java
diff --git a/apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/store/DhcpRecordTest.java b/apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/store/DhcpRecordTest.java
similarity index 100%
rename from apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/store/DhcpRecordTest.java
rename to apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/store/DhcpRecordTest.java
diff --git a/apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStoreTest.java b/apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStoreTest.java
similarity index 100%
rename from apps/dhcprelay/src/test/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStoreTest.java
rename to apps/dhcprelay/app/src/test/java/org/onosproject/dhcprelay/store/DistributedDhcpRelayStoreTest.java
diff --git a/apps/dhcprelay/src/test/resources/dhcp-relay.json b/apps/dhcprelay/app/src/test/resources/dhcp-relay.json
similarity index 100%
rename from apps/dhcprelay/src/test/resources/dhcp-relay.json
rename to apps/dhcprelay/app/src/test/resources/dhcp-relay.json
diff --git a/apps/dhcprelay/src/test/resources/invalid-dhcp-relay.json b/apps/dhcprelay/app/src/test/resources/invalid-dhcp-relay.json
similarity index 100%
rename from apps/dhcprelay/src/test/resources/invalid-dhcp-relay.json
rename to apps/dhcprelay/app/src/test/resources/invalid-dhcp-relay.json
diff --git a/apps/dhcprelay/web/BUCK b/apps/dhcprelay/web/BUCK
new file mode 100644
index 0000000..d173841
--- /dev/null
+++ b/apps/dhcprelay/web/BUCK
@@ -0,0 +1,23 @@
+COMPILE_DEPS = [
+ '//lib:CORE_DEPS',
+ '//lib:JACKSON',
+ '//lib:KRYO',
+ '//lib:org.apache.karaf.shell.console',
+ '//cli:onos-cli',
+ '//utils/rest:onlab-rest',
+ '//lib:javax.ws.rs-api',
+ '//lib:jersey-server',
+ '//core/store/serializers:onos-core-serializers',
+ '//apps/route-service/api:onos-apps-route-service-api',
+ '//apps/dhcprelay/app:onos-apps-dhcprelay-app',
+ '//apps/routing/fpm/api:onos-apps-routing-fpm-api',
+]
+
+osgi_jar (
+ deps = COMPILE_DEPS,
+ web_context = '/onos/v1/dhcprelay',
+ api_title = 'DHCPRelay App',
+ api_version = '1.0',
+ api_description = 'REST API for DHCPRelay',
+ api_package = 'org.onosproject.dhcprelay.rest',
+)
\ No newline at end of file
diff --git a/apps/dhcprelay/web/BUILD b/apps/dhcprelay/web/BUILD
new file mode 100644
index 0000000..1bdee49
--- /dev/null
+++ b/apps/dhcprelay/web/BUILD
@@ -0,0 +1,16 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + REST + CLI + [
+ "@jersey_server//jar",
+ "//core/store/serializers:onos-core-serializers",
+ "//apps/route-service/api:onos-apps-route-service-api",
+ "//apps/dhcprelay/app:onos-apps-dhcprelay-app",
+ "//apps/routing/fpm/api:onos-apps-routing-fpm-api",
+]
+
+osgi_jar(
+ api_description = "REST API for DHCPRelay",
+ api_package = "org.onosproject.dhcprelay.rest",
+ api_title = "REST API for DHCPRelay Agent Application",
+ api_version = "1.0",
+ web_context = "/onos/v1/dhcprelay",
+ deps = COMPILE_DEPS,
+)
diff --git a/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebApplication.java b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebApplication.java
new file mode 100644
index 0000000..180394a
--- /dev/null
+++ b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebApplication.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.
+ */
+
+package org.onosproject.dhcprelay.rest;
+
+import org.onlab.rest.AbstractWebApplication;
+
+import java.util.Set;
+
+/**
+ * DHCP Relay Web application.
+ */
+public class DhcpRelayWebApplication extends AbstractWebApplication {
+ @Override
+ public Set<Class<?>> getClasses() {
+ return getClasses(DhcpRelayWebResource.class);
+ }
+}
diff --git a/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java
new file mode 100644
index 0000000..9338a4b
--- /dev/null
+++ b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/DhcpRelayWebResource.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+ *
+ * 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.
+ *
+ */
+
+package org.onosproject.dhcprelay.rest;
+
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.IpPrefix;
+import org.onosproject.dhcprelay.api.DhcpRelayService;
+import org.onosproject.rest.AbstractWebResource;
+import org.onosproject.routeservice.Route;
+import org.onosproject.routeservice.RouteStore;
+import org.onosproject.routing.fpm.api.FpmRecord;
+import org.slf4j.Logger;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.Response;
+
+import java.io.IOException;
+import java.util.Optional;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * DHCP Relay agent REST API.
+ */
+@Path("fpm-delete")
+public class DhcpRelayWebResource extends AbstractWebResource {
+ private static final Logger LOG = getLogger(DhcpRelayWebResource.class);
+
+ /**
+ * Deletes the fpm route from fpm record.
+ * Corresponding route from the route store
+ *
+ * @param prefix IpPrefix
+ * @return 204 NO CONTENT
+ * @throws IOException to signify bad request
+ */
+ @DELETE
+ @Path("{prefix}")
+ public Response dhcpFpmDelete(@PathParam("prefix") String prefix) {
+ DhcpRelayService dhcpRelayService = get(DhcpRelayService.class);
+ RouteStore routeStore = get(RouteStore.class);
+
+ try {
+ // removes fpm route from fpm record
+ Optional<FpmRecord> fpmRecord = dhcpRelayService.removeFpmRecord(IpPrefix.valueOf(prefix));
+ if (fpmRecord.isPresent()) {
+ IpAddress nextHop = fpmRecord.get().nextHop();
+ Route route = new Route(Route.Source.DHCP, IpPrefix.valueOf(prefix), nextHop);
+ // removes DHCP route from route store
+ routeStore.removeRoute(route);
+ } else {
+ LOG.warn("fpmRecord is not present");
+ }
+ } catch (IllegalArgumentException ex) {
+ throw new IllegalArgumentException(ex);
+ }
+
+ return Response.noContent().build();
+ }
+
+}
diff --git a/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/package-info.java b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/package-info.java
new file mode 100644
index 0000000..959a884
--- /dev/null
+++ b/apps/dhcprelay/web/src/main/java/org/onosproject/dhcprelay/rest/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.
+ */
+
+/**
+ * DHCP Relay agent REST API.
+ */
+package org.onosproject.dhcprelay.rest;
diff --git a/apps/dhcprelay/web/src/main/webapp/WEB-INF/web.xml b/apps/dhcprelay/web/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..0322a40
--- /dev/null
+++ b/apps/dhcprelay/web/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2018-present Open Networking Foundation
+ ~
+ ~ 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.
+ -->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="ONOS" version="2.5">
+ <display-name>DHCPRELAY REST API v1.0</display-name>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secured</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-role>
+ <role-name>admin</role-name>
+ </security-role>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>karaf</realm-name>
+ </login-config>
+
+ <servlet>
+ <servlet-name>JAX-RS Service</servlet-name>
+ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+ <init-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>org.onosproject.dhcprelay.rest.DhcpRelayWebApplication</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JAX-RS Service</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
diff --git a/modules.bzl b/modules.bzl
new file mode 100644
index 0000000..c1b22eb
--- /dev/null
+++ b/modules.bzl
@@ -0,0 +1,318 @@
+UTILS = [
+ "//utils/osgiwrap:osgi-jar",
+ "//utils/osgi:onlab-osgi",
+ "//utils/junit:onlab-junit",
+ "//utils/misc:onlab-misc",
+ "//utils/rest:onlab-rest",
+]
+
+API = [
+ "//core/api:onos-api",
+ "//incubator/api:onos-incubator-api",
+]
+
+CORE = UTILS + API + [
+ "//core/net:onos-core-net",
+ "//core/common:onos-core-common",
+ "//core/store/primitives:onos-core-primitives",
+ "//core/store/serializers:onos-core-serializers",
+ "//core/store/dist:onos-core-dist",
+ "//core/security:onos-security",
+ "//core/store/persistence:onos-core-persistence",
+ "//incubator/net:onos-incubator-net",
+ "//incubator/store:onos-incubator-store",
+ "//incubator/rpc:onos-incubator-rpc",
+ "//cli:onos-cli",
+ "//protocols/rest/api:onos-protocols-rest-api",
+ "//protocols/rest/ctl:onos-protocols-rest-ctl",
+ "//protocols/bgp/bgpio:onos-protocols-bgp-bgpio",
+ "//protocols/bgp/api:onos-protocols-bgp-api",
+ "//protocols/bgp/ctl:onos-protocols-bgp-ctl",
+ "//protocols/netconf/api:onos-protocols-netconf-api",
+ "//protocols/netconf/ctl:onos-protocols-netconf-ctl",
+ "//protocols/openflow/api:onos-protocols-openflow-api",
+ "//protocols/openflow/ctl:onos-protocols-openflow-ctl",
+ "//protocols/ospf/api:onos-protocols-ospf-api",
+ "//protocols/ospf/protocol:onos-protocols-ospf-protocol",
+ "//protocols/ospf/ctl:onos-protocols-ospf-ctl",
+ "//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc",
+ "//protocols/ovsdb/api:onos-protocols-ovsdb-api",
+ "//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl",
+ "//protocols/p4runtime/api:onos-protocols-p4runtime-api",
+ "//protocols/p4runtime/model:onos-protocols-p4runtime-model",
+ "//protocols/pcep/pcepio:onos-protocols-pcep-pcepio",
+ "//protocols/pcep/server/api:onos-protocols-pcep-server-api",
+ "//protocols/pcep/server/ctl:onos-protocols-pcep-server-ctl",
+ "//protocols/snmp/api:onos-protocols-snmp-api",
+ "//protocols/snmp/ctl:onos-protocols-snmp-ctl",
+ "//protocols/isis/api:onos-protocols-isis-api",
+ "//protocols/isis/ctl:onos-protocols-isis-ctl",
+ "//protocols/isis/isisio:onos-protocols-isis-isisio",
+ "//protocols/lisp/api:onos-protocols-lisp-api",
+ "//protocols/lisp/ctl:onos-protocols-lisp-ctl",
+ "//protocols/lisp/msg:onos-protocols-lisp-msg",
+ "//protocols/tl1/api:onos-protocols-tl1-api",
+ "//protocols/tl1/ctl:onos-protocols-tl1-ctl",
+ "//protocols/restconf/client/api:onos-protocols-restconf-client-api",
+ "//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl",
+ "//protocols/xmpp/core/api:onos-protocols-xmpp-core-api",
+ "//protocols/xmpp/core/ctl:onos-protocols-xmpp-core-ctl",
+ "//drivers/utilities:onos-drivers-utilities",
+ "//providers/netconf/device:onos-providers-netconf-device",
+ "//providers/openflow/device:onos-providers-openflow-device",
+ "//providers/openflow/packet:onos-providers-openflow-packet",
+ "//providers/openflow/flow:onos-providers-openflow-flow",
+ "//providers/openflow/group:onos-providers-openflow-group",
+ "//providers/openflow/meter:onos-providers-openflow-meter",
+ "//providers/ovsdb/device:onos-providers-ovsdb-device",
+ "//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel",
+ "//providers/rest/device:onos-providers-rest-device",
+ "//providers/snmp/device:onos-providers-snmp-device",
+ "//providers/isis/cfg:onos-providers-isis-cfg",
+ "//providers/isis/topology:onos-providers-isis-topology",
+ "//providers/lisp/device:onos-providers-lisp-device",
+ "//providers/tl1/device:onos-providers-tl1-device",
+ "//providers/general/device:onos-providers-general-device",
+ "//providers/p4runtime/packet:onos-providers-p4runtime-packet",
+ "//web/api:onos-rest",
+ "//web/gui2:onos-gui2",
+ "//web/gui:onos-gui",
+ # "//incubator/protobuf/models:onos-incubator-protobuf-models",
+ # "//incubator/protobuf/services/nb:onos-incubator-protobuf-services-nb",
+]
+
+ONOS_DRIVERS = [
+ # Drivers
+ "//drivers/default:onos-drivers-default-oar",
+ "//drivers/arista:onos-drivers-arista-oar",
+ "//drivers/ciena/waveserver:onos-drivers-ciena-waveserver-oar",
+ "//drivers/ciena/c5162:onos-drivers-ciena-c5162-oar",
+ "//drivers/ciena/c5170:onos-drivers-ciena-c5170-oar",
+ "//drivers/ciena/waveserverai:onos-drivers-ciena-waveserverai-oar",
+ "//drivers/cisco/netconf:onos-drivers-cisco-netconf-oar",
+ "//drivers/cisco/rest:onos-drivers-cisco-rest-oar",
+ "//drivers/corsa:onos-drivers-corsa-oar",
+ "//drivers/fujitsu:onos-drivers-fujitsu-oar",
+ "//drivers/lumentum:onos-drivers-lumentum-oar",
+ "//drivers/netconf:onos-drivers-netconf-oar",
+ "//drivers/server:onos-drivers-server-oar",
+ "//drivers/optical:onos-drivers-optical-oar",
+ "//drivers/ovsdb:onos-drivers-ovsdb-oar",
+ "//drivers/juniper:onos-drivers-juniper-oar",
+ "//drivers/lisp:onos-drivers-lisp-oar",
+ "//drivers/flowspec:onos-drivers-flowspec-oar",
+ "//drivers/huawei:onos-drivers-huawei-oar",
+ "//drivers/microsemi/ea1000:onos-drivers-microsemi-ea1000-oar",
+ "//drivers/oplink:onos-drivers-oplink-oar",
+ "//drivers/bmv2:onos-drivers-bmv2-oar",
+ "//drivers/barefoot:onos-drivers-barefoot-oar",
+ "//drivers/mellanox:onos-drivers-mellanox-oar",
+ "//drivers/hp:onos-drivers-hp-oar",
+ "//drivers/p4runtime:onos-drivers-p4runtime-oar",
+ "//drivers/gnmi:onos-drivers-gnmi-oar",
+ "//drivers/polatis/netconf:onos-drivers-polatis-netconf-oar",
+ "//drivers/polatis/openflow:onos-drivers-polatis-openflow-oar",
+ "//drivers/odtn-driver:onos-drivers-odtn-driver-oar",
+]
+
+ONOS_PROVIDERS = [
+ # Providers
+ "//providers/bgp:onos-providers-bgp-oar",
+ "//providers/bgpcep:onos-providers-bgpcep-oar",
+ "//providers/host:onos-providers-host-oar",
+ "//providers/hostprobing:onos-providers-hostprobing-oar",
+ "//providers/lldp:onos-providers-lldp-oar",
+ "//providers/netcfghost:onos-providers-netcfghost-oar",
+ "//providers/netcfglinks:onos-providers-netcfglinks-oar",
+ "//providers/netconf:onos-providers-netconf-oar",
+ "//providers/openflow/message:onos-providers-openflow-message-oar",
+ "//providers/ovsdb:onos-providers-ovsdb-oar",
+ "//providers/ovsdb/host:onos-providers-ovsdb-host-oar",
+ "//providers/ovsdb/base:onos-providers-ovsdb-base-oar",
+ "//providers/pcep:onos-providers-pcep-oar",
+ "//providers/null:onos-providers-null-oar",
+ "//providers/openflow/base:onos-providers-openflow-base-oar",
+ "//providers/openflow/app:onos-providers-openflow-app-oar",
+ "//providers/rest:onos-providers-rest-oar",
+ "//providers/isis:onos-providers-isis-oar",
+ "//providers/snmp:onos-providers-snmp-oar",
+ "//providers/link:onos-providers-link-oar",
+ "//providers/lisp:onos-providers-lisp-oar",
+ "//providers/tl1:onos-providers-tl1-oar",
+ "//providers/general:onos-providers-general-oar",
+ "//providers/p4runtime:onos-providers-p4runtime-oar",
+ # "//providers/ietfte:onos-providers-ietfte-oar",
+ "//providers/xmpp/device:onos-providers-xmpp-device-oar",
+]
+
+ONOS_APPS = [
+ # Apps
+ "//apps/dhcp:onos-apps-dhcp-oar",
+ "//apps/dhcprelay:onos-apps-dhcprelay-oar",
+ "//apps/fwd:onos-apps-fwd-oar",
+ "//apps/packet-stats:onos-apps-packet-stats-oar",
+ "//apps/acl:onos-apps-acl-oar",
+ "//apps/bgprouter:onos-apps-bgprouter-oar",
+ "//apps/cip:onos-apps-cip-oar",
+ "//apps/drivermatrix:onos-apps-drivermatrix-oar",
+ "//apps/events:onos-apps-events-oar",
+ "//apps/proxyarp:onos-apps-proxyarp-oar",
+ "//apps/segmentrouting:onos-apps-segmentrouting-oar",
+ "//apps/gangliametrics:onos-apps-gangliametrics-oar",
+ "//apps/graphitemetrics:onos-apps-graphitemetrics-oar",
+ "//apps/flowanalyzer:onos-apps-flowanalyzer-oar",
+ "//apps/intentsync:onos-apps-intentsync-oar",
+ "//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar",
+ "//apps/metrics:onos-apps-metrics-oar",
+ "//apps/mfwd:onos-apps-mfwd-oar",
+ "//apps/mlb:onos-apps-mlb-oar",
+ "//apps/mobility:onos-apps-mobility-oar",
+ "//apps/newoptical:onos-apps-newoptical-oar",
+ "//apps/optical-model:onos-apps-optical-model-oar",
+ "//apps/optical-rest:onos-apps-optical-rest-oar",
+ "//apps/pathpainter:onos-apps-pathpainter-oar",
+ "//apps/pcep-api:onos-apps-pcep-api-oar",
+ "//apps/pim:onos-apps-pim-oar",
+ "//apps/linkprops:onos-apps-linkprops-oar",
+ "//apps/reactive-routing:onos-apps-reactive-routing-oar",
+ "//apps/roadm:onos-apps-roadm-oar",
+ "//apps/sdnip:onos-apps-sdnip-oar",
+ "//apps/test/cluster-ha:onos-apps-test-cluster-ha-oar",
+ "//apps/test/demo:onos-apps-test-demo-oar",
+ "//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar",
+ "//apps/test/election:onos-apps-test-election-oar",
+ "//apps/test/flow-perf:onos-apps-test-flow-perf-oar",
+ "//apps/test/intent-perf:onos-apps-test-intent-perf-oar",
+ "//apps/test/route-scale:onos-apps-test-route-scale-oar",
+ "//apps/test/loadtest:onos-apps-test-loadtest-oar",
+ "//apps/test/netcfg-monitor:onos-apps-test-netcfg-monitor-oar",
+ "//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar",
+ "//apps/test/primitive-perf:onos-apps-test-primitive-perf-oar",
+ "//apps/test/transaction-perf:onos-apps-test-transaction-perf-oar",
+ "//apps/virtualbng:onos-apps-virtualbng-oar",
+ "//apps/vpls:onos-apps-vpls-oar",
+ "//apps/vrouter:onos-apps-vrouter-oar",
+ "//apps/routing/fibinstaller:onos-apps-routing-fibinstaller-oar",
+ "//apps/routing/cpr:onos-apps-routing-cpr-oar",
+ "//apps/routing/fpm:onos-apps-routing-fpm-oar",
+ "//apps/vtn:onos-apps-vtn-oar",
+ "//apps/faultmanagement:onos-apps-faultmanagement-oar",
+ "//apps/openstacknode:onos-apps-openstacknode-oar",
+ "//apps/openstacknetworking:onos-apps-openstacknetworking-oar",
+ "//apps/openstacknetworkingui:onos-apps-openstacknetworkingui-oar",
+ "//apps/openstacktelemetry:onos-apps-openstacktelemetry-oar",
+ "//apps/openstacktroubleshoot:onos-apps-openstacktroubleshoot-oar",
+ "//apps/openstackvtap:onos-apps-openstackvtap-oar",
+ "//apps/cpman/app:onos-apps-cpman-app-oar",
+ "//apps/scalablegateway:onos-apps-scalablegateway-oar",
+ "//apps/castor:onos-apps-castor-oar",
+ # "//apps/yms:onos-apps-yms-oar",
+ "//apps/ofagent:onos-apps-ofagent-oar",
+ "//apps/mappingmanagement:onos-apps-mappingmanagement-oar",
+ "//apps/config:onos-apps-config-oar",
+ "//apps/configsync:onos-apps-configsync-oar",
+ "//apps/configsync-netconf:onos-apps-configsync-netconf-oar",
+ "//apps/netconf/client:onos-apps-netconf-client-oar",
+ "//apps/tetopology:onos-apps-tetopology-oar",
+ "//apps/tetunnel:onos-apps-tetunnel-oar",
+ # "//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature",
+ # "//apps/tenbi:onos-apps-tenbi-oar",
+ "//protocols/restconf/server:onos-protocols-restconf-server-oar",
+ "//apps/restconf:onos-apps-restconf-oar",
+ "//apps/flowspec-api:onos-apps-flowspec-api-oar",
+ "//apps/yang:onos-apps-yang-oar",
+ "//apps/yang-gui:onos-apps-yang-gui-oar",
+ "//apps/cord-support:onos-apps-cord-support-oar",
+ "//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar",
+ "//apps/l3vpn:onos-apps-l3vpn-oar",
+ "//apps/openroadm:onos-apps-openroadm-oar",
+ "//apps/artemis:onos-apps-artemis-oar",
+ "//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp-oar",
+ "//apps/gluon:onos-apps-gluon-oar",
+ "//apps/evpnopenflow:onos-apps-evpnopenflow-oar",
+ "//apps/route-service:onos-apps-route-service-oar",
+ "//apps/evpn-route-service:onos-apps-evpn-route-service-oar",
+ # "//incubator/protobuf/registry:onos-incubator-protobuf-registry-oar",
+ # "//incubator/protobuf/services/nb:onos-incubator-protobuf-services-nb-oar",
+ "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf-oar",
+ "//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel-oar",
+ "//apps/cfm:onos-apps-cfm-oar",
+ "//apps/routeradvertisement:onos-apps-routeradvertisement-oar",
+ "//apps/powermanagement:onos-apps-powermanagement-oar",
+ "//apps/t3:onos-apps-t3-oar",
+ "//apps/simplefabric:onos-apps-simplefabric-oar",
+ # "//apps/kafka-integration:onos-apps-kafka-integration-oar",
+ "//apps/rabbitmq:onos-apps-rabbitmq-oar",
+ "//apps/odtn/api:onos-apps-odtn-api-oar",
+ "//apps/odtn/service:onos-apps-odtn-service-oar",
+ "//apps/mcast:onos-apps-mcast-oar",
+ "//apps/layout:onos-apps-layout-oar",
+ "//apps/imr:onos-apps-imr-oar",
+ "//apps/nodemetrics:onos-apps-nodemetrics-oar",
+ "//apps/inbandtelemetry:onos-apps-inbandtelemetry-oar",
+ # "//web/gui2:onos-web-gui2-oar",
+ "//apps/workflow:onos-apps-workflow-oar",
+]
+
+PROTOCOL_APPS = [
+ "//protocols/grpc:onos-protocols-grpc-oar",
+ "//protocols/p4runtime:onos-protocols-p4runtime-oar",
+ "//protocols/gnmi:onos-protocols-gnmi-oar",
+ "//protocols/xmpp/core:onos-protocols-xmpp-core-oar",
+ "//protocols/xmpp/pubsub:onos-protocols-xmpp-pubsub-oar",
+]
+
+MODELS = [
+ "//models/ietf:onos-models-ietf-oar",
+ "//models/common:onos-models-common-oar",
+ "//models/huawei:onos-models-huawei-oar",
+ "//models/openconfig:onos-models-openconfig-oar",
+ "//models/openconfig-infinera:onos-models-openconfig-infinera-oar",
+ "//models/openroadm:onos-models-openroadm-oar",
+ "//models/tapi:onos-models-tapi-oar",
+ "//models/l3vpn:onos-models-l3vpn-oar",
+ "//models/microsemi:onos-models-microsemi-oar",
+ "//models/polatis:onos-models-polatis-oar",
+ "//models/ciena/waveserverai:onos-models-ciena-waveserverai-oar",
+]
+
+PIPELINES = [
+ "//pipelines/basic:onos-pipelines-basic-oar",
+ "//pipelines/fabric:onos-pipelines-fabric-oar",
+]
+
+APP_JARS = [
+ "//apps/cpman/api:onos-apps-cpman-api",
+ "//apps/routing-api:onos-apps-routing-api",
+ "//apps/dhcp/api:onos-apps-dhcp-api",
+ "//apps/dhcp/app:onos-apps-dhcp-app",
+ "//apps/imr/api:onos-apps-imr-api",
+ "//apps/imr/app:onos-apps-imr-app",
+ "//apps/dhcprelay/app:onos-apps-dhcprelay-app",
+ "//apps/dhcprelay/web:onos-apps-dhcprelay-web",
+ "//apps/fwd:onos-apps-fwd",
+ "//apps/iptopology-api:onos-apps-iptopology-api",
+ "//apps/routing/common:onos-apps-routing-common",
+ "//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc",
+ "//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr",
+ "//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
+ "//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
+ "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
+ # "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
+]
+
+FEATURES = [
+ "//tools/package/features:onos-thirdparty-base",
+ "//tools/package/features:onos-thirdparty-web",
+ "//tools/package/features:onos-api",
+ "//tools/package/features:onos-core",
+ "//tools/package/features:onos-incubator",
+ "//tools/package/features:onos-cli",
+ "//tools/package/features:onos-rest",
+ "//tools/package/features:onos-gui",
+ "//tools/package/features:onos-gui2",
+ "//tools/package/features:onos-security",
+]
+
+APPS = ONOS_DRIVERS + ONOS_PROVIDERS + ONOS_APPS + MODELS + PIPELINES + \
+ PROTOCOL_APPS + APP_JARS