Refactoring of provider buck builds.
Change-Id: I9b5e2566b83c13a8b7b086005a08a8182305ffdb
diff --git a/providers/openflow/base/BUCK b/providers/openflow/base/BUCK
new file mode 100644
index 0000000..2d3cbfa
--- /dev/null
+++ b/providers/openflow/base/BUCK
@@ -0,0 +1,18 @@
+BUNDLES = [
+ '//lib:openflowj',
+ '//protocols/openflow/api:onos-of-api',
+ '//protocols/openflow/ctl:onos-of-ctl',
+ '//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',
+]
+
+onos_app (
+ title = 'OpenFlow Provider',
+ category = 'Provider',
+ url = 'http://onosproject.org',
+ description = 'OpenFlow protocol southbound providers.',
+ included_bundles = BUNDLES,
+)
diff --git a/providers/openflow/device/BUCK b/providers/openflow/device/BUCK
index 4b87aa4..11599d5 100644
--- a/providers/openflow/device/BUCK
+++ b/providers/openflow/device/BUCK
@@ -1,9 +1,3 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-device'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
@@ -14,18 +8,7 @@
'//lib:TEST_ADAPTERS',
]
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
-)
-
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
+ test_deps = TEST_DEPS,
)
diff --git a/providers/openflow/flow/BUCK b/providers/openflow/flow/BUCK
index cc8ac28..d575458 100644
--- a/providers/openflow/flow/BUCK
+++ b/providers/openflow/flow/BUCK
@@ -1,31 +1,10 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-flow'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-of-api',
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
-)
diff --git a/providers/openflow/group/BUCK b/providers/openflow/group/BUCK
index 2d176ab..44ad141 100644
--- a/providers/openflow/group/BUCK
+++ b/providers/openflow/group/BUCK
@@ -1,32 +1,10 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-group'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-of-api',
- '//providers/openflow/flow:onos-of-provider-flow',
+ '//providers/openflow/flow:onos-providers-openflow-flow',
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
-)
-
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
)
diff --git a/providers/openflow/message/BUCK b/providers/openflow/message/BUCK
index dff2a84..8e7da43 100644
--- a/providers/openflow/message/BUCK
+++ b/providers/openflow/message/BUCK
@@ -1,32 +1,23 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-message'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-of-api',
- '//apps/cpman/api:onos-app-cpman-api',
+ '//apps/cpman/api:onos-apps-cpman-api',
]
-TEST_DEPS = [
- '//lib:TEST',
+BUNDLES = [
+ '//apps/cpman/api:onos-apps-cpman-api',
+ ':onos-providers-openflow-message',
]
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
+onos_app (
+ title = 'Control Message Stats Provider',
+ category = 'Provider',
+ url = 'http://onosproject.org',
+ description = 'ONOS OpenFlow control message provider.',
+ included_bundles = BUNDLES,
)
diff --git a/providers/openflow/meter/BUCK b/providers/openflow/meter/BUCK
index 9eae14a..6e986a7 100644
--- a/providers/openflow/meter/BUCK
+++ b/providers/openflow/meter/BUCK
@@ -1,31 +1,9 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-meter'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-of-api',
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
-)
-
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
)
diff --git a/providers/openflow/packet/BUCK b/providers/openflow/packet/BUCK
index b209b2b..d575458 100644
--- a/providers/openflow/packet/BUCK
+++ b/providers/openflow/packet/BUCK
@@ -1,31 +1,10 @@
-SRC = 'src/main/java/org/onosproject/**/'
-TEST = 'src/test/java/org/onosproject/**/'
-
-CURRENT_NAME = 'onos-of-provider-packet'
-CURRENT_TARGET = ':' + CURRENT_NAME
-
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//lib:openflowj',
'//protocols/openflow/api:onos-of-api',
]
-TEST_DEPS = [
- '//lib:TEST',
-]
-
-osgi_jar(
- name = CURRENT_NAME,
- srcs = glob([SRC + '/*.java']),
+osgi_jar_with_tests (
deps = COMPILE_DEPS,
- visibility = ['PUBLIC'],
)
-java_test(
- name = 'tests',
- srcs = glob([TEST + '/*.java']),
- deps = COMPILE_DEPS +
- TEST_DEPS +
- [CURRENT_TARGET],
- source_under_test = [CURRENT_TARGET],
-)