홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
f9a76971 1 parent 53228836

More app BUCK file refactoring 

Change-Id: I97506033c4c0cf145c558df7d4f86f37c7fe8332
Inline Side-by-side
Showing 28 changed files with 248 additions and 485 deletions
...@@ -73,8 +73,6 @@ CORE = [ ...@@ -73,8 +73,6 @@ CORE = [
73 '//providers/ovsdb/device:onos-ovsdb-provider-device', 73 '//providers/ovsdb/device:onos-ovsdb-provider-device',
74 '//providers/ovsdb/host:onos-ovsdb-provider-host', 74 '//providers/ovsdb/host:onos-ovsdb-provider-host',
75 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', 75 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
76 - '//providers/pcep/topology:onos-pcep-provider-topology',
77 - '//providers/pcep/tunnel:onos-pcep-provider-tunnel',
78 '//providers/rest/device:onos-restsb-provider-device', 76 '//providers/rest/device:onos-restsb-provider-device',
79 '//providers/snmp/device:onos-snmp-provider-device', 77 '//providers/snmp/device:onos-snmp-provider-device',
80 78
...@@ -83,6 +81,7 @@ CORE = [ ...@@ -83,6 +81,7 @@ CORE = [
83 ] 81 ]
84 82
85 APPS = [ 83 APPS = [
84 + '//providers/pcep:onos-providers-pcep-oar',
86 '//apps/dhcp:onos-apps-dhcp-oar', 85 '//apps/dhcp:onos-apps-dhcp-oar',
87 '//apps/fwd:onos-apps-fwd-oar', 86 '//apps/fwd:onos-apps-fwd-oar',
88 '//apps/aaa:onos-apps-aaa-oar', 87 '//apps/aaa:onos-apps-aaa-oar',
...@@ -91,6 +90,26 @@ APPS = [ ...@@ -91,6 +90,26 @@ APPS = [
91 '//apps/proxyarp:onos-apps-proxyarp-oar', 90 '//apps/proxyarp:onos-apps-proxyarp-oar',
92 '//apps/segmentrouting:onos-apps-segmentrouting-oar', 91 '//apps/segmentrouting:onos-apps-segmentrouting-oar',
93 '//apps/gangliametrics:onos-apps-gangliametrics-oar', 92 '//apps/gangliametrics:onos-apps-gangliametrics-oar',
93 + '//apps/graphitemetrics:onos-apps-graphitemetrics-oar',
94 + '//apps/igmp:onos-apps-igmp-oar',
95 + '//apps/cordmcast:onos-apps-cordmcast-oar',
96 + '//apps/olt:onos-apps-olt-oar',
97 + '//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar',
98 + '//apps/metrics:onos-apps-metrics-oar',
99 + '//apps/mfwd:onos-apps-mfwd-oar',
100 + '//apps/mlb:onos-apps-mlb-oar',
101 + '//apps/openstackinterface:onos-apps-openstackinterface-oar',
102 + '//apps/mobility:onos-apps-mobility-oar',
103 + '//apps/optical:onos-apps-optical-oar',
104 + '//apps/pathpainter:onos-apps-pathpainter-oar',
105 + '//apps/pcep-api:onos-apps-pcep-api-oar',
106 + '//apps/pim:onos-apps-pim-oar',
107 + '//apps/reactive-routing:onos-apps-reactive-routing-oar',
108 + '//apps/sdnip:onos-apps-sdnip-oar',
109 + '//apps/virtualbng:onos-apps-virtualbng-oar',
110 + '//apps/cordvtn:onos-apps-cordvtn-oar',
111 + '//apps/vpls:onos-apps-vpls-oar',
112 + '//apps/vrouter:onos-apps-vrouter-oar',
94 ] 113 ]
95 114
96 APP_JARS = [ 115 APP_JARS = [
...@@ -98,8 +117,6 @@ APP_JARS = [ ...@@ -98,8 +117,6 @@ APP_JARS = [
98 '//apps/cpman/app:onos-app-cpman-app', 117 '//apps/cpman/app:onos-app-cpman-app',
99 '//apps/routing-api:onos-apps-routing-api', 118 '//apps/routing-api:onos-apps-routing-api',
100 '//apps/cip:onos-app-cip', 119 '//apps/cip:onos-app-cip',
101 - '//apps/cordmcast:onos-app-cord-mcast',
102 - '//apps/cordvtn:onos-apps-cordvtn',
103 '//apps/dhcp/api:onos-apps-dhcp-api', 120 '//apps/dhcp/api:onos-apps-dhcp-api',
104 '//apps/dhcp/app:onos-apps-dhcp-app', 121 '//apps/dhcp/app:onos-apps-dhcp-app',
105 '//apps/drivermatrix:onos-app-drivermatrix', 122 '//apps/drivermatrix:onos-app-drivermatrix',
...@@ -107,30 +124,14 @@ APP_JARS = [ ...@@ -107,30 +124,14 @@ APP_JARS = [
107 '//apps/faultmanagement:onos-app-fm', 124 '//apps/faultmanagement:onos-app-fm',
108 '//apps/flowanalyzer:onos-app-flowanalyzer', 125 '//apps/flowanalyzer:onos-app-flowanalyzer',
109 '//apps/fwd:onos-apps-fwd', 126 '//apps/fwd:onos-apps-fwd',
110 - '//apps/igmp:onos-app-igmp', 127 + '//apps/olt:onos-apps-olt-api',
111 - '//apps/influxdbmetrics:onos-app-influxdb', 128 + '//apps/iptopology-api:onos-apps-iptopology-api',
112 - '//apps/olt:onos-app-olt-api', 129 + '//apps/openstackinterface:onos-apps-openstackinterface-api',
113 - '//apps/olt:onos-app-olt-app',
114 - '//apps/iptopology-api:onos-app-iptopology-api',
115 - '//apps/metrics:onos-app-metrics',
116 - '//apps/graphitemetrics:onos-app-graphite',
117 - '//apps/mfwd:onos-app-mfwd',
118 - '//apps/mlb:onos-app-mlb',
119 - '//apps/mobility:onos-app-mobility',
120 - '//apps/openstackinterface:onos-app-openstackinterface-api',
121 - '//apps/openstackinterface:onos-app-openstackinterface-app',
122 '//apps/openstacknetworking:onos-app-openstacknetworking', 130 '//apps/openstacknetworking:onos-app-openstacknetworking',
123 - '//apps/openstacknode:onos-app-openstacknode', 131 + '//apps/openstacknode:onos-apps-openstacknode',
124 - '//apps/optical:onos-app-optical',
125 - '//apps/pathpainter:onos-app-pp',
126 - '//apps/pim:onos-app-pim',
127 '//apps/routing:onos-apps-routing', 132 '//apps/routing:onos-apps-routing',
128 - '//apps/sdnip:onos-app-sdnip',
129 '//apps/test:onos-app-test', 133 '//apps/test:onos-app-test',
130 '//apps/vtn:onos-app-vtn', 134 '//apps/vtn:onos-app-vtn',
131 - '//apps/virtualbng:onos-app-virtualbng',
132 - '//apps/vpls:onos-app-vpls',
133 - '//apps/vrouter:onos-app-vrouter',
134 ] 135 ]
135 136
136 java_library( 137 java_library(
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-cord-mcast'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:javax.ws.rs-api', 3 '//lib:javax.ws.rs-api',
10 '//lib:jersey-client', 4 '//lib:jersey-client',
11 '//lib:jersey-common', 5 '//lib:jersey-common',
12 '//utils/rest:onlab-rest', 6 '//utils/rest:onlab-rest',
13 - '//apps/olt:onos-app-olt-api', 7 + '//apps/olt:onos-apps-olt-api',
14 ] 8 ]
15 9
16 -TEST_DEPS = [ 10 +BUNDLES = [
17 - '//lib:TEST', 11 + '//apps/olt:onos-apps-olt-api',
12 + '//apps/cordmcast:onos-apps-cordmcast',
18 ] 13 ]
19 14
20 -java_library( 15 +osgi_jar_with_tests (
21 - name = CURRENT_NAME,
22 - srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
24 - visibility = ['PUBLIC'],
25 ) 17 )
26 18
27 -java_test( 19 +onos_app (
28 - name = 'tests', 20 + title = 'CORD Multicast App',
29 - srcs = glob([TEST + '/*.java']), 21 + category = 'Traffic Steering',
30 - deps = COMPILE_DEPS + 22 + url = 'http://onosproject.org',
31 - TEST_DEPS + 23 + description = 'CORD Multicast application',
32 - [CURRENT_TARGET], 24 + included_bundles = BUNDLES,
33 - source_under_test = [CURRENT_TARGET],
34 ) 25 )
......
...@@ -9,14 +9,31 @@ COMPILE_DEPS = [ ...@@ -9,14 +9,31 @@ COMPILE_DEPS = [
9 '//utils/rest:onlab-rest', 9 '//utils/rest:onlab-rest',
10 '//cli:onos-cli', 10 '//cli:onos-cli',
11 '//core/store/serializers:onos-core-serializers', 11 '//core/store/serializers:onos-core-serializers',
12 + '//apps/openstackinterface:onos-apps-openstackinterface-api',
12 '//apps/dhcp/api:onos-apps-dhcp-api', 13 '//apps/dhcp/api:onos-apps-dhcp-api',
13 '//protocols/ovsdb/api:onos-ovsdb-api', 14 '//protocols/ovsdb/api:onos-ovsdb-api',
14 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 15 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
15 ] 16 ]
16 17
18 +BUNDLES = [
19 + '//apps/openstackinterface:onos-apps-openstackinterface-api',
20 + '//apps/cordvtn:onos-apps-cordvtn',
21 +]
22 +
23 +EXCLUDED_BUNDLES = [
24 + '//lib:jsch', # TODO - needs wrap
25 +]
26 +
17 osgi_jar_with_tests ( 27 osgi_jar_with_tests (
18 deps = COMPILE_DEPS, 28 deps = COMPILE_DEPS,
19 web_context = '/onos/cordvtn', 29 web_context = '/onos/cordvtn',
20 ) 30 )
21 31
22 -#FIXME need onos_app
...\ No newline at end of file ...\ No newline at end of file
32 +onos_app (
33 + title = 'CORD VTN REST API',
34 + category = 'Traffic Steering',
35 + url = 'http://onosproject.org',
36 + included_bundles = BUNDLES,
37 + excluded_bundles = EXCLUDED_BUNDLES,
38 + description = 'APIs for interacting with the CORD VTN application.',
39 +)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-graphite'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:gmetric4j', 3 '//lib:gmetric4j',
10 '//lib:metrics-graphite', 4 '//lib:metrics-graphite',
11 ] 5 ]
12 6
7 +EXCLUDED_BUNDLES = [
8 + '//lib:gmetric4j',
9 + '//lib:metrics-graphite',
10 +]
11 +
13 TEST_DEPS = [ 12 TEST_DEPS = [
14 '//lib:TEST', 13 '//lib:TEST',
15 '//core/api:onos-api-tests', 14 '//core/api:onos-api-tests',
16 ] 15 ]
17 16
18 -java_library( 17 +osgi_jar_with_tests (
19 - name = CURRENT_NAME,
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
22 - visibility = ['PUBLIC'], 19 + test_deps = TEST_DEPS,
23 ) 20 )
24 21
25 -java_test( 22 +onos_app (
26 - name = 'tests', 23 + title = 'Graphite Report and Query App',
27 - srcs = glob([TEST + '/*.java']), 24 + category = 'Monitoring',
28 - deps = COMPILE_DEPS + 25 + url = 'http://onosproject.org',
29 - TEST_DEPS + 26 + description = 'Performance metric service reporter and retriever for graphite',
30 - [CURRENT_TARGET], 27 + excluded_bundles = EXCLUDED_BUNDLES,
31 - source_under_test = [CURRENT_TARGET],
32 ) 28 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-igmp'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
10 '//cli:onos-cli', 4 '//cli:onos-cli',
11 - '//apps/olt:onos-app-olt-api', 5 + '//apps/olt:onos-apps-olt-api',
12 ] 6 ]
13 7
14 -TEST_DEPS = [ 8 +BUNDLES = [
15 - '//lib:TEST', 9 + '//apps/olt:onos-apps-olt-api',
10 + '//apps/igmp:onos-apps-igmp',
16 ] 11 ]
17 12
18 -java_library( 13 +osgi_jar_with_tests (
19 - name = CURRENT_NAME,
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 14 deps = COMPILE_DEPS,
22 - visibility = ['PUBLIC'],
23 ) 15 )
24 16
25 -java_test( 17 +onos_app (
26 - name = 'tests', 18 + title = 'IGMP App',
27 - srcs = glob([TEST + '/*.java']), 19 + category = 'Traffic Steering',
28 - deps = COMPILE_DEPS + 20 + url = 'http://onosproject.org',
29 - TEST_DEPS + 21 + description = 'Internet Group Message Protocol',
30 - [CURRENT_TARGET], 22 + included_bundles = BUNDLES,
31 - source_under_test = [CURRENT_TARGET],
32 ) 23 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-influxdb'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
...@@ -12,22 +6,26 @@ COMPILE_DEPS = [ ...@@ -12,22 +6,26 @@ COMPILE_DEPS = [
12 '//cli:onos-cli', 6 '//cli:onos-cli',
13 ] 7 ]
14 8
9 +EXCLUDED_BUNDLES = [
10 + '//lib:metrics-influxdb',
11 + '//lib:influxdb-java',
12 +]
13 +
15 TEST_DEPS = [ 14 TEST_DEPS = [
16 '//lib:TEST_ADAPTERS', 15 '//lib:TEST_ADAPTERS',
17 ] 16 ]
18 17
19 -java_library( 18 +osgi_jar_with_tests (
20 - name = CURRENT_NAME,
21 - srcs = glob([SRC + '/*.java']),
22 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
23 - visibility = ['PUBLIC'], 20 + test_deps = TEST_DEPS,
24 ) 21 )
25 22
26 -java_test( 23 +# TODO : Currently non-functional, needs the ability to wrap a non-OSGI jar
27 - name = 'tests', 24 +
28 - srcs = glob([TEST + '/*.java']), 25 +onos_app (
29 - deps = COMPILE_DEPS + 26 + title = 'InfluxDB Report and Query App',
30 - TEST_DEPS + 27 + category = 'Monitoring',
31 - [CURRENT_TARGET], 28 + url = 'http://onosproject.org',
32 - source_under_test = [CURRENT_TARGET], 29 + description = 'Performance metric service reporter and retriever for influxDB.',
30 + excluded_bundles = EXCLUDED_BUNDLES,
33 ) 31 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-iptopology-api'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 ) 7 )
21 8
22 -java_test(
23 - name = 'tests',
24 - srcs = glob([TEST + '/*.java']),
25 - deps = COMPILE_DEPS +
26 - TEST_DEPS +
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-metrics'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
...@@ -12,24 +6,13 @@ COMPILE_DEPS = [ ...@@ -12,24 +6,13 @@ COMPILE_DEPS = [
12 '//cli:onos-cli', 6 '//cli:onos-cli',
13 ] 7 ]
14 8
15 -TEST_DEPS = [ 9 +osgi_jar_with_tests (
16 - '//lib:TEST',
17 -]
18 -
19 -java_library(
20 - name = CURRENT_NAME,
21 - srcs = glob([SRC + '/*.java']),
22 deps = COMPILE_DEPS, 10 deps = COMPILE_DEPS,
23 - visibility = ['PUBLIC'],
24 - resources_root = 'src/main/resources',
25 - resources = glob(['src/main/resources/**']),
26 ) 11 )
27 12
28 -java_test( 13 +onos_app (
29 - name = 'tests', 14 + title = 'OpenStack Interface App',
30 - srcs = glob([TEST + '/*.java']), 15 + category = 'Utility',
31 - deps = COMPILE_DEPS + 16 + url = 'http://onosproject.org',
32 - TEST_DEPS + 17 + description = 'Openstack Interface Application.',
33 - [CURRENT_TARGET],
34 - source_under_test = [CURRENT_TARGET],
35 ) 18 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-mfwd'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 ) 7 )
21 8
22 -java_test( 9 +onos_app (
23 - name = 'tests', 10 + title = 'Multicast Forwarding App',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Traffic Steering',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'Multicast forwarding application.',
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-mlb'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 ) 7 )
21 8
22 -java_test( 9 +onos_app (
23 - name = 'tests', 10 + title = 'Mastership Load Balancer App',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Utility',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'Application that balances mastership among nodes.',
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-mobility'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 ) 7 )
21 8
22 -java_test( 9 +onos_app (
23 - name = 'tests', 10 + title = 'Host Mobility App',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Utility',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'Host mobility application.',
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
5 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
6 '//lib:javax.ws.rs-api', 3 '//lib:javax.ws.rs-api',
...@@ -11,38 +8,28 @@ COMPILE_DEPS = [ ...@@ -11,38 +8,28 @@ COMPILE_DEPS = [
11 '//core/store/serializers:onos-core-serializers', 8 '//core/store/serializers:onos-core-serializers',
12 ] 9 ]
13 10
14 -TEST_DEPS = [ 11 +BUNDLES = [
15 - '//lib:TEST', 12 + ':onos-apps-olt-api',
13 + ':onos-apps-olt',
16 ] 14 ]
17 15
18 -java_library( 16 +osgi_jar_with_tests (
19 - name = 'onos-app-olt-api', 17 + name = 'onos-apps-olt-api',
20 srcs = glob(['api/' + SRC + '*.java']), 18 srcs = glob(['api/' + SRC + '*.java']),
21 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
22 visibility = ['PUBLIC'], 20 visibility = ['PUBLIC'],
23 ) 21 )
24 22
25 -java_test( 23 +osgi_jar_with_tests (
26 - name = 'onos-app-olt-api-tests',
27 - srcs = glob([TEST + 'api/*.java']),
28 - deps = COMPILE_DEPS +
29 - TEST_DEPS +
30 - [':onos-app-olt-api'],
31 - source_under_test = [':onos-app-olt-api'],
32 -)
33 -
34 -java_library(
35 - name = 'onos-app-olt-app',
36 srcs = glob(['app/' + SRC + '*.java']), 24 srcs = glob(['app/' + SRC + '*.java']),
37 - deps = COMPILE_DEPS + [':onos-app-olt-api'], 25 + deps = COMPILE_DEPS + [':onos-apps-olt-api'],
38 visibility = ['PUBLIC'], 26 visibility = ['PUBLIC'],
39 ) 27 )
40 28
41 -java_test( 29 +onos_app (
42 - name = 'onos-app-olt-app-tests', 30 + title = 'ONOS OLT REST API',
43 - srcs = glob([TEST + 'app/*.java']), 31 + category = 'Security',
44 - deps = COMPILE_DEPS + 32 + url = 'http://onosproject.org',
45 - TEST_DEPS + 33 + description = 'OLT application for CORD.',
46 - [':onos-app-olt-api', ':onos-app-olt-app'], 34 + included_bundles = BUNDLES,
47 - source_under_test = [':onos-app-olt-app'],
48 ) 35 )
......
...@@ -7,38 +7,26 @@ COMPILE_DEPS = [ ...@@ -7,38 +7,26 @@ COMPILE_DEPS = [
7 '//lib:javax.ws.rs-api', 7 '//lib:javax.ws.rs-api',
8 ] 8 ]
9 9
10 -TEST_DEPS = [ 10 +BUNDLES = [
11 - '//lib:TEST', 11 + '//apps/openstackinterface:onos-apps-openstackinterface-api',
12 + # TODO - this doesn't actually work now, have to refactor the BUCK files into each sub directory
12 ] 13 ]
13 14
14 -java_library( 15 +osgi_jar_with_tests (
15 - name = 'onos-app-openstackinterface-api', 16 + name = 'onos-apps-openstackinterface-api',
16 srcs = glob(['api/' + SRC + '*.java']), 17 srcs = glob(['api/' + SRC + '*.java']),
17 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
18 visibility = ['PUBLIC'], 19 visibility = ['PUBLIC'],
19 ) 20 )
20 21
21 -java_test( 22 +osgi_jar_with_tests (
22 - name = 'onos-app-openstackinterface-api-tests', 23 + deps = COMPILE_DEPS,
23 - srcs = glob([TEST + '/*.java']),
24 - deps = COMPILE_DEPS +
25 - TEST_DEPS +
26 - [':onos-app-openstackinterface-api'],
27 - source_under_test = [':onos-app-openstackinterface-api'],
28 -)
29 -
30 -java_library(
31 - name = 'onos-app-openstackinterface-app',
32 - srcs = glob(['app/' + SRC + '*.java']),
33 - deps = COMPILE_DEPS + [':onos-app-openstackinterface-api'],
34 - visibility = ['PUBLIC'],
35 ) 24 )
36 25
37 -java_test( 26 +onos_app (
38 - name = 'onos-app-openstackinterface-app-tests', 27 + title = 'Authentication App',
39 - srcs = glob([TEST + '/*.java']), 28 + category = 'Security',
40 - deps = COMPILE_DEPS + 29 + url = 'http://onosproject.org',
41 - TEST_DEPS + 30 + description = 'ONOS authentication application.',
42 - [':onos-app-openstackinterface-api', ':onos-app-openstackinterface-app'], 31 + included_bundles = BUNDLES,
43 - source_under_test = [':onos-app-openstackinterface-app'],
44 ) 32 )
......
...@@ -5,7 +5,7 @@ COMPILE_DEPS = [ ...@@ -5,7 +5,7 @@ COMPILE_DEPS = [
5 '//lib:CORE_DEPS', 5 '//lib:CORE_DEPS',
6 '//lib:jersey-client', 6 '//lib:jersey-client',
7 '//lib:javax.ws.rs-api', 7 '//lib:javax.ws.rs-api',
8 - '//apps/openstackinterface:onos-app-openstackinterface-api', 8 + '//apps/openstackinterface:onos-apps-openstackinterface-api',
9 '//core/store/serializers:onos-core-serializers', 9 '//core/store/serializers:onos-core-serializers',
10 ] 10 ]
11 11
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-openstacknode'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 3 '//protocols/ovsdb/api:onos-ovsdb-api',
...@@ -11,22 +5,6 @@ COMPILE_DEPS = [ ...@@ -11,22 +5,6 @@ COMPILE_DEPS = [
11 '//core/store/serializers:onos-core-serializers', 5 '//core/store/serializers:onos-core-serializers',
12 ] 6 ]
13 7
14 -TEST_DEPS = [ 8 +osgi_jar_with_tests (
15 - '//lib:TEST',
16 -]
17 -
18 -java_library(
19 - name = CURRENT_NAME,
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 9 deps = COMPILE_DEPS,
22 - visibility = ['PUBLIC'],
23 -)
24 -
25 -java_test(
26 - name = 'tests',
27 - srcs = glob([TEST + '/*.java']),
28 - deps = COMPILE_DEPS +
29 - TEST_DEPS +
30 - [CURRENT_TARGET],
31 - source_under_test = [CURRENT_TARGET],
32 ) 10 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-optical'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 ) 7 )
21 8
22 -java_test( 9 +onos_app (
23 - name = 'tests', 10 + title = 'Packet/Optical Use-Case App',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Traffic Steering',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'Packet/Optical use-case application.',
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-pp'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
10 4
11 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
12 - '//lib:TEST',
13 -]
14 -
15 -java_library(
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 resources_root = 'src/main/resources', 7 resources_root = 'src/main/resources',
21 resources = glob(['src/main/resources/**']), 8 resources = glob(['src/main/resources/**']),
22 ) 9 )
23 10
24 -java_test( 11 +onos_app (
25 - name = 'tests', 12 + title = 'Path Visualization App',
26 - srcs = glob([TEST + '/*.java']), 13 + category = 'Utility',
27 - deps = COMPILE_DEPS + 14 + url = 'http://onosproject.org',
28 - TEST_DEPS + 15 + description = 'Path visualization application.',
29 - [CURRENT_TARGET],
30 - source_under_test = [CURRENT_TARGET],
31 ) 16 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-pcep-api'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 3 '//protocols/ovsdb/api:onos-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 ] 5 ]
12 6
13 -TEST_DEPS = [ 7 +osgi_jar_with_tests (
14 - '//lib:TEST',
15 -]
16 -
17 -java_library(
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'],
22 ) 9 )
23 10
24 -java_test( 11 +onos_app (
25 - name = 'tests', 12 + title = 'PCEP Protocol API',
26 - srcs = glob([TEST + '/*.java']), 13 + category = 'Traffic Steering',
27 - deps = COMPILE_DEPS + 14 + url = 'http://onosproject.org',
28 - TEST_DEPS + 15 + description = 'PCEP protocol API.',
29 - [CURRENT_TARGET],
30 - source_under_test = [CURRENT_TARGET],
31 ) 16 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-pim'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
...@@ -12,24 +6,21 @@ COMPILE_DEPS = [ ...@@ -12,24 +6,21 @@ COMPILE_DEPS = [
12 '//apps/routing-api:onos-apps-routing-api', 6 '//apps/routing-api:onos-apps-routing-api',
13 ] 7 ]
14 8
15 -TEST_DEPS = [ 9 +BUNDLES = [
16 - '//lib:TEST', 10 + '//apps/routing-api:onos-apps-routing-api',
11 + ':onos-apps-pim',
17 ] 12 ]
18 13
19 -java_library( 14 +osgi_jar_with_tests (
20 - name = CURRENT_NAME,
21 - srcs = glob([SRC + '/*.java']),
22 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
23 - visibility = ['PUBLIC'],
24 resources_root = 'src/main/resources', 16 resources_root = 'src/main/resources',
25 resources = glob(['src/main/resources/**']), 17 resources = glob(['src/main/resources/**']),
26 ) 18 )
27 19
28 -java_test( 20 +onos_app (
29 - name = 'tests', 21 + title = 'Protocol Independent Multicast Emulation App',
30 - srcs = glob([TEST + '/*.java']), 22 + category = 'Traffic Steering',
31 - deps = COMPILE_DEPS + 23 + url = 'http://onosproject.org',
32 - TEST_DEPS + 24 + description = 'Protocol independent multicast emulation.',
33 - [CURRENT_TARGET], 25 + included_bundles = BUNDLES,
34 - source_under_test = [CURRENT_TARGET],
35 ) 26 )
......
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//incubator/api:onos-incubator-api',
4 + '//apps/routing-api:onos-apps-routing-api',
5 +]
6 +
7 +osgi_jar (
8 + deps = COMPILE_DEPS,
9 +)
10 +
11 +onos_app (
12 + title = 'SDN-IP Reactive Routing App',
13 + category = 'Traffic Steering',
14 + url = 'http://onosproject.org',
15 + description = 'SDN-IP reactive routing application.',
16 +)
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-sdnip'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
10 '//apps/routing-api:onos-apps-routing-api', 4 '//apps/routing-api:onos-apps-routing-api',
11 ] 5 ]
12 6
7 +BUNDLES = [
8 + '//apps/routing-api:onos-apps-routing-api',
9 + '//apps/sdnip:onos-apps-sdnip',
10 +]
11 +
13 TEST_DEPS = [ 12 TEST_DEPS = [
14 '//lib:TEST_ADAPTERS', 13 '//lib:TEST_ADAPTERS',
15 '//incubator/api:onos-incubator-api-tests', 14 '//incubator/api:onos-incubator-api-tests',
16 '//apps/routing-api:onos-apps-routing-api-tests', 15 '//apps/routing-api:onos-apps-routing-api-tests',
17 ] 16 ]
18 17
19 -java_library( 18 +osgi_jar_with_tests (
20 - name = CURRENT_NAME,
21 - srcs = glob([SRC + '/*.java']),
22 deps = COMPILE_DEPS, 19 deps = COMPILE_DEPS,
23 - visibility = ['PUBLIC'], 20 + test_deps = TEST_DEPS,
24 ) 21 )
25 22
26 -java_test( 23 +onos_app (
27 - name = 'tests', 24 + title = 'SDN-IP App',
28 - srcs = glob([TEST + '/*.java']), 25 + category = 'Utility',
29 - deps = COMPILE_DEPS + 26 + url = 'http://onosproject.org',
30 - TEST_DEPS + 27 + included_bundles = BUNDLES,
31 - [CURRENT_TARGET], 28 + description = 'SDN-IP peering application',
32 - source_under_test = [CURRENT_TARGET],
33 ) 29 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-virtualbng'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:jersey-client', 3 '//lib:jersey-client',
...@@ -13,24 +7,15 @@ COMPILE_DEPS = [ ...@@ -13,24 +7,15 @@ COMPILE_DEPS = [
13 '//utils/rest:onlab-rest', 7 '//utils/rest:onlab-rest',
14 ] 8 ]
15 9
16 -TEST_DEPS = [ 10 +osgi_jar_with_tests (
17 - '//lib:TEST',
18 -]
19 -
20 -java_library(
21 - name = CURRENT_NAME,
22 - srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
24 - visibility = ['PUBLIC'],
25 resources_root = 'src/main/resources', 12 resources_root = 'src/main/resources',
26 resources = glob(['src/main/resources/**']), 13 resources = glob(['src/main/resources/**']),
27 ) 14 )
28 15
29 -java_test( 16 +onos_app (
30 - name = 'tests', 17 + title = 'Virtual Broadband Gateway App',
31 - srcs = glob([TEST + '/*.java']), 18 + category = 'Utility',
32 - deps = COMPILE_DEPS + 19 + url = 'http://onosproject.org',
33 - TEST_DEPS + 20 + description = 'A virtual Broadband Network Gateway(BNG) application.',
34 - [CURRENT_TARGET],
35 - source_under_test = [CURRENT_TARGET],
36 ) 21 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-vpls'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:jersey-client', 3 '//lib:jersey-client',
...@@ -19,18 +13,14 @@ TEST_DEPS = [ ...@@ -19,18 +13,14 @@ TEST_DEPS = [
19 '//lib:TEST_ADAPTERS', 13 '//lib:TEST_ADAPTERS',
20 ] 14 ]
21 15
22 -java_library( 16 +osgi_jar_with_tests (
23 - name = CURRENT_NAME,
24 - srcs = glob([SRC + '/*.java']),
25 deps = COMPILE_DEPS, 17 deps = COMPILE_DEPS,
26 - visibility = ['PUBLIC'], 18 + test_deps = TEST_DEPS,
27 ) 19 )
28 20
29 -java_test( 21 +onos_app (
30 - name = 'tests', 22 + title = 'VLAN L2 Broadcast Network App',
31 - srcs = glob([TEST + '/*.java']), 23 + category = 'Traffic Steering',
32 - deps = COMPILE_DEPS + 24 + url = 'http://onosproject.org',
33 - TEST_DEPS + 25 + description = 'Application to create L2 broadcast network using VLAN.',
34 - [CURRENT_TARGET],
35 - source_under_test = [CURRENT_TARGET],
36 ) 26 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-vrouter'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
10 ] 4 ]
11 5
12 -TEST_DEPS = [ 6 +osgi_jar_with_tests (
13 - '//lib:TEST',
14 -]
15 -
16 -java_library(
17 - name = CURRENT_NAME,
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 7 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'],
21 ) 8 )
22 9
23 -java_test( 10 +onos_app (
24 - name = 'tests', 11 + title = 'Virtual Router App',
25 - srcs = glob([TEST + '/*.java']), 12 + category = 'Traffic Steering',
26 - deps = COMPILE_DEPS + 13 + url = 'http://onosproject.org',
27 - TEST_DEPS + 14 + description = 'Virtual router (vRouter) application.',
28 - [CURRENT_TARGET],
29 - source_under_test = [CURRENT_TARGET],
30 ) 15 )
......
1 +BUNDLES = [
2 + '//providers/pcep/topology:onos-providers-pcep-topology',
3 + '//providers/pcep/tunnel:onos-providers-pcep-tunnel',
4 + '//protocols/pcep/api:onos-pcep-controller-api',
5 + '//protocols/pcep/pcepio:onos-pcep-pcepio',
6 +]
7 +
8 +COMPILE_DEPS = [
9 + '//lib:CORE_DEPS',
10 +]
11 +
12 +onos_app (
13 + title = 'PCEP Provider',
14 + category = 'Provider',
15 + url = 'http://onosproject.org',
16 + included_bundles = BUNDLES,
17 + description = 'PCEP protocol providers root.',
18 + required_apps = [ 'org.onosproject.pcep-api' ],
19 +)
20 +
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-pcep-provider-topology'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 3 '//protocols/ovsdb/api:onos-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 - '//apps/pcep-api:onos-app-pcep-api', 5 + '//apps/pcep-api:onos-apps-pcep-api',
12 -]
13 -
14 -TEST_DEPS = [
15 - '//lib:TEST',
16 ] 6 ]
17 7
18 -osgi_jar( 8 +osgi_jar_with_tests (
19 - name = CURRENT_NAME,
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 9 deps = COMPILE_DEPS,
22 - visibility = ['PUBLIC'],
23 -)
24 -
25 -java_test(
26 - name = 'tests',
27 - srcs = glob([TEST + '/*.java']),
28 - deps = COMPILE_DEPS +
29 - TEST_DEPS +
30 - [CURRENT_TARGET],
31 - source_under_test = [CURRENT_TARGET],
32 ) 10 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-pcep-provider-tunnel'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 3 '//protocols/ovsdb/api:onos-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 - '//apps/pcep-api:onos-app-pcep-api', 5 + '//apps/pcep-api:onos-apps-pcep-api',
12 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
13 '//protocols/pcep/pcepio:onos-pcep-pcepio', 7 '//protocols/pcep/pcepio:onos-pcep-pcepio',
14 '//protocols/pcep/api:onos-pcep-controller-api', 8 '//protocols/pcep/api:onos-pcep-controller-api',
...@@ -18,18 +12,7 @@ TEST_DEPS = [ ...@@ -18,18 +12,7 @@ TEST_DEPS = [
18 '//lib:TEST_ADAPTERS', 12 '//lib:TEST_ADAPTERS',
19 ] 13 ]
20 14
21 -osgi_jar( 15 +osgi_jar_with_tests (
22 - name = CURRENT_NAME,
23 - srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
25 - visibility = ['PUBLIC'], 17 + test_deps = TEST_DEPS,
26 -)
27 -
28 -java_test(
29 - name = 'tests',
30 - srcs = glob([TEST + '/*.java']),
31 - deps = COMPILE_DEPS +
32 - TEST_DEPS +
33 - [CURRENT_TARGET],
34 - source_under_test = [CURRENT_TARGET],
35 ) 18 )
......
...@@ -8,7 +8,7 @@ COMPILE_DEPS = [ ...@@ -8,7 +8,7 @@ COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 8 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-ovsdb-api', 9 '//protocols/ovsdb/api:onos-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 10 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
11 - '//apps/pcep-api:onos-app-pcep-api', 11 + '//apps/pcep-api:onos-apps-pcep-api',
12 '//incubator/api:onos-incubator-api', 12 '//incubator/api:onos-incubator-api',
13 '//protocols/rest/api:onos-restsb-api', 13 '//protocols/rest/api:onos-restsb-api',
14 '//lib:javax.ws.rs-api', 14 '//lib:javax.ws.rs-api',
......