Fix some test dependencies and pretty format all BUILD files
Change-Id: I300e236c15491f8724f1e493e2414388217f2174
diff --git a/apps/cip/BUILD b/apps/cip/BUILD
index 80cd90a..2e5780e 100644
--- a/apps/cip/BUILD
+++ b/apps/cip/BUILD
@@ -1,8 +1,8 @@
-osgi_jar_with_tests (
+osgi_jar_with_tests(
deps = CORE_DEPS,
)
-onos_app (
+onos_app(
category = "Utility",
description = "ONOS Cluster IP alias application.",
title = "Cluster IP Alias",
diff --git a/apps/evpn-route-service/BUILD b/apps/evpn-route-service/BUILD
index 8ed33f3..d099839 100644
--- a/apps/evpn-route-service/BUILD
+++ b/apps/evpn-route-service/BUILD
@@ -3,9 +3,9 @@
"//apps/evpn-route-service/app:onos-apps-evpn-route-service-app",
]
-onos_app (
- title = "EVPN Routing",
+onos_app(
category = "Traffic Engineering",
- url = "http://onosproject.org",
included_bundles = BUNDLES,
+ title = "EVPN Routing",
+ url = "http://onosproject.org",
)
diff --git a/apps/faultmanagement/BUILD b/apps/faultmanagement/BUILD
index 6f77dc4..0a83736 100644
--- a/apps/faultmanagement/BUILD
+++ b/apps/faultmanagement/BUILD
@@ -8,7 +8,7 @@
onos_app(
category = "Monitoring",
description = "Provides managements of alarms. Stores retrieved alarms from devices. " +
- "Offers CLI, UI and REST integration to obtain and display them from ONOS.",
+ "Offers CLI, UI and REST integration to obtain and display them from ONOS.",
included_bundles = BUNDLES,
origin = "BTI Systems",
title = "Fault Management",
diff --git a/apps/faultmanagement/fmmgr/BUILD b/apps/faultmanagement/fmmgr/BUILD
index 9e95ac0..c7c933e 100644
--- a/apps/faultmanagement/fmmgr/BUILD
+++ b/apps/faultmanagement/fmmgr/BUILD
@@ -3,6 +3,12 @@
"//core/store/serializers:onos-core-serializers",
]
+TEST_DEPS = TEST_ADAPTERS + [
+ "//utils/osgi:onlab-osgi-tests",
+ "//incubator/api:onos-incubator-api-tests",
+]
+
osgi_jar_with_tests(
+ test_deps = TEST_DEPS,
deps = COMPILE_DEPS,
)
diff --git a/apps/faultmanagement/fmweb/BUILD b/apps/faultmanagement/fmweb/BUILD
index 1f13858..10eb32a 100644
--- a/apps/faultmanagement/fmweb/BUILD
+++ b/apps/faultmanagement/fmweb/BUILD
@@ -5,12 +5,20 @@
"//utils/rest:onlab-rest",
]
+TEST_DEPS = TEST_ADAPTERS + [
+ "@jersey_test_framework_core//jar",
+ "@jersey_test_framework_jetty//jar",
+ "//utils/osgi:onlab-osgi-tests",
+ "//web/api:onos-rest-tests",
+ "//incubator/api:onos-incubator-api-tests",
+]
+
osgi_jar_with_tests(
api_description = "REST API for Fault Management",
api_package = "org.onosproject.faultmanagement",
api_title = "Fault Management Rest API",
api_version = "/onos/v1/fm",
- test_deps = TEST_ADAPTERS,
+ test_deps = TEST_DEPS,
web_context = "/onos/dhcp",
deps = COMPILE_DEPS,
)
diff --git a/apps/fwd/BUILD b/apps/fwd/BUILD
index 48b1eec..f2f4bc4 100644
--- a/apps/fwd/BUILD
+++ b/apps/fwd/BUILD
@@ -10,13 +10,13 @@
onos_app(
category = "Traffic Engineering",
description = "Provisions traffic between end-stations using hop-by-hop flow programming by " +
- "intercepting packets for which there are currently no matching flow objectives on the " +
- "data plane. The paths paved in this manner are short-lived, i.e. they expire a few " +
- "seconds after the flow on whose behalf they were programmed stops.\n\n" +
- "The application relies on the ONOS path service to compute the shortest paths. " +
- "In the event of negative topology events (link loss, device disconnect, etc.), " +
- "the application will proactively invalidate any paths that it had programmed to lead " +
- "through the resources that are no longer available.",
+ "intercepting packets for which there are currently no matching flow objectives on the " +
+ "data plane. The paths paved in this manner are short-lived, i.e. they expire a few " +
+ "seconds after the flow on whose behalf they were programmed stops.\n\n" +
+ "The application relies on the ONOS path service to compute the shortest paths. " +
+ "In the event of negative topology events (link loss, device disconnect, etc.), " +
+ "the application will proactively invalidate any paths that it had programmed to lead " +
+ "through the resources that are no longer available.",
title = "Reactive Forwarding",
url = "http://onosproject.org",
)
diff --git a/apps/inbandtelemetry/api/BUILD b/apps/inbandtelemetry/api/BUILD
new file mode 100644
index 0000000..93d94d3
--- /dev/null
+++ b/apps/inbandtelemetry/api/BUILD
@@ -0,0 +1,8 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + [
+ "//core/store/serializers:onos-core-serializers",
+]
+
+osgi_jar_with_tests(
+ test_deps = TEST_ADAPTERS,
+ deps = COMPILE_DEPS,
+)
diff --git a/pipelines/basic/BUILD b/pipelines/basic/BUILD
index 79e660d..66314df 100644
--- a/pipelines/basic/BUILD
+++ b/pipelines/basic/BUILD
@@ -3,10 +3,12 @@
"//drivers/default:onos-drivers-default",
"//protocols/p4runtime/model:onos-protocols-p4runtime-model",
"//protocols/p4runtime/api:onos-protocols-p4runtime-api",
+ "//apps/inbandtelemetry/api:onos-apps-inbandtelemetry-api",
]
BUNDLES = [
"//pipelines/basic:onos-pipelines-basic",
+ "//apps/inbandtelemetry/api:onos-apps-inbandtelemetry-api",
]
osgi_jar(
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index f445a4e..7f1ab8f 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -118,36 +118,39 @@
visibility = ["//visibility:public"],
)
-osgi_feature (
+osgi_feature(
name = "onos-incubator",
description = "ONOS core incubator components",
- required_features = ["onos-core"],
included_bundles = [
- "//incubator/net:onos-incubator-net",
- "//incubator/store:onos-incubator-store",
- "//incubator/rpc:onos-incubator-rpc",
+ "//incubator/net:onos-incubator-net",
+ "//incubator/store:onos-incubator-store",
+ "//incubator/rpc:onos-incubator-rpc",
],
+ required_features = ["onos-core"],
visibility = ["//visibility:public"],
)
-osgi_feature (
+osgi_feature(
name = "onos-rest",
description = "ONOS REST API components",
- required_features = ["onos-api", "onos-thirdparty-web"],
included_bundles = [
- "//utils/rest:onlab-rest",
- "//web/api:onos-rest",
+ "//utils/rest:onlab-rest",
+ "//web/api:onos-rest",
+ ],
+ required_features = [
+ "onos-api",
+ "onos-thirdparty-web",
],
visibility = ["//visibility:public"],
)
-osgi_feature (
+osgi_feature(
name = "onos-cli",
- description ="ONOS admin command console components",
- required_features = ["onos-api"],
+ description = "ONOS admin command console components",
included_bundles = [
- "//cli:onos-cli",
+ "//cli:onos-cli",
],
+ required_features = ["onos-api"],
visibility = ["//visibility:public"],
)