홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
1aaffb75 1 parent c1806860

Remove all references to java_library in the source BUCK build. 

Change-Id: Ie0e8753b62aeff9c4b5476b0108d05e92e3decdb
Inline Side-by-side
Showing 14 changed files with 177 additions and 243 deletions
...@@ -97,12 +97,16 @@ APPS = [ ...@@ -97,12 +97,16 @@ APPS = [
97 '//apps/aaa:onos-apps-aaa-oar', 97 '//apps/aaa:onos-apps-aaa-oar',
98 '//apps/acl:onos-apps-acl-oar', 98 '//apps/acl:onos-apps-acl-oar',
99 '//apps/bgprouter:onos-apps-bgprouter-oar', 99 '//apps/bgprouter:onos-apps-bgprouter-oar',
100 + '//apps/cip:onos-apps-cip-oar',
101 + '//apps/drivermatrix:onos-apps-drivermatrix-oar',
102 + '//apps/events:onos-apps-events-oar',
100 '//apps/proxyarp:onos-apps-proxyarp-oar', 103 '//apps/proxyarp:onos-apps-proxyarp-oar',
101 '//apps/segmentrouting:onos-apps-segmentrouting-oar', 104 '//apps/segmentrouting:onos-apps-segmentrouting-oar',
102 '//apps/gangliametrics:onos-apps-gangliametrics-oar', 105 '//apps/gangliametrics:onos-apps-gangliametrics-oar',
103 '//apps/graphitemetrics:onos-apps-graphitemetrics-oar', 106 '//apps/graphitemetrics:onos-apps-graphitemetrics-oar',
104 '//apps/igmp:onos-apps-igmp-oar', 107 '//apps/igmp:onos-apps-igmp-oar',
105 '//apps/cordmcast:onos-apps-cordmcast-oar', 108 '//apps/cordmcast:onos-apps-cordmcast-oar',
109 + '//apps/flowanalyzer:onos-apps-flowanalyzer-oar',
106 '//apps/olt:onos-apps-olt-oar', 110 '//apps/olt:onos-apps-olt-oar',
107 '//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar', 111 '//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar',
108 '//apps/metrics:onos-apps-metrics-oar', 112 '//apps/metrics:onos-apps-metrics-oar',
...@@ -119,6 +123,13 @@ APPS = [ ...@@ -119,6 +123,13 @@ APPS = [
119 '//apps/pim:onos-apps-pim-oar', 123 '//apps/pim:onos-apps-pim-oar',
120 '//apps/reactive-routing:onos-apps-reactive-routing-oar', 124 '//apps/reactive-routing:onos-apps-reactive-routing-oar',
121 '//apps/sdnip:onos-apps-sdnip-oar', 125 '//apps/sdnip:onos-apps-sdnip-oar',
126 + '//apps/test/demo:onos-apps-test-demo-oar',
127 + '//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar',
128 + '//apps/test/election:onos-apps-test-election-oar',
129 + '//apps/test/flow-perf:onos-apps-test-flow-perf-oar',
130 + '//apps/test/intent-perf:onos-apps-test-intent-perf-oar',
131 + '//apps/test/loadtest:onos-apps-test-loadtest-oar',
132 + '//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar',
122 '//apps/virtualbng:onos-apps-virtualbng-oar', 133 '//apps/virtualbng:onos-apps-virtualbng-oar',
123 '//apps/cordvtn:onos-apps-cordvtn-oar', 134 '//apps/cordvtn:onos-apps-cordvtn-oar',
124 '//apps/vpls:onos-apps-vpls-oar', 135 '//apps/vpls:onos-apps-vpls-oar',
...@@ -134,18 +145,13 @@ APPS = [ ...@@ -134,18 +145,13 @@ APPS = [
134 APP_JARS = [ 145 APP_JARS = [
135 '//apps/cpman/api:onos-apps-cpman-api', 146 '//apps/cpman/api:onos-apps-cpman-api',
136 '//apps/routing-api:onos-apps-routing-api', 147 '//apps/routing-api:onos-apps-routing-api',
137 - '//apps/cip:onos-app-cip',
138 '//apps/dhcp/api:onos-apps-dhcp-api', 148 '//apps/dhcp/api:onos-apps-dhcp-api',
139 '//apps/dhcp/app:onos-apps-dhcp-app', 149 '//apps/dhcp/app:onos-apps-dhcp-app',
140 - '//apps/drivermatrix:onos-app-drivermatrix',
141 - '//apps/events:onos-app-events',
142 - '//apps/flowanalyzer:onos-app-flowanalyzer',
143 '//apps/fwd:onos-apps-fwd', 150 '//apps/fwd:onos-apps-fwd',
144 '//apps/olt:onos-apps-olt-api', 151 '//apps/olt:onos-apps-olt-api',
145 '//apps/iptopology-api:onos-apps-iptopology-api', 152 '//apps/iptopology-api:onos-apps-iptopology-api',
146 '//apps/openstacknode:onos-apps-openstacknode', 153 '//apps/openstacknode:onos-apps-openstacknode',
147 '//apps/routing:onos-apps-routing', 154 '//apps/routing:onos-apps-routing',
148 - '//apps/test:onos-app-test',
149 '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc', 155 '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
150 '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr', 156 '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
151 '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr', 157 '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-cip'
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 = 'Cluster IP alias App',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Utility',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'ONOS Cluster IP alias 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-drivermatrix'
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 ] 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 resources_root = 'src/main/resources', 9 resources_root = 'src/main/resources',
23 resources = glob(['src/main/resources/**']), 10 resources = glob(['src/main/resources/**']),
24 ) 11 )
25 12
26 -java_test( 13 +onos_app (
27 - name = 'tests', 14 + title = 'Driver Support Matrix',
28 - srcs = glob([TEST + '/*.java']), 15 + category = 'Utility',
29 - deps = COMPILE_DEPS + 16 + url = 'http://onosproject.org',
30 - TEST_DEPS + 17 + description = 'Driver behaviour support matrix.',
31 - [CURRENT_TARGET],
32 - source_under_test = [CURRENT_TARGET],
33 ) 18 )
19 +
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-events'
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 ] 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 resources_root = 'src/main/resources', 9 resources_root = 'src/main/resources',
23 resources = glob(['src/main/resources/**']), 10 resources = glob(['src/main/resources/**']),
24 ) 11 )
25 12
26 -java_test( 13 +onos_app (
27 - name = 'tests', 14 + title = 'Event History App',
28 - srcs = glob([TEST + '/*.java']), 15 + category = 'Utility',
29 - deps = COMPILE_DEPS + 16 + url = 'http://onosproject.org',
30 - TEST_DEPS + 17 + description = 'App to display ONOS event history.',
31 - [CURRENT_TARGET],
32 - source_under_test = [CURRENT_TARGET],
33 ) 18 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-flowanalyzer'
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',
...@@ -14,20 +8,16 @@ TEST_DEPS = [ ...@@ -14,20 +8,16 @@ TEST_DEPS = [
14 '//lib:TEST_ADAPTERS', 8 '//lib:TEST_ADAPTERS',
15 ] 9 ]
16 10
17 -java_library( 11 +osgi_jar_with_tests (
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'], 13 + test_deps = TEST_DEPS,
22 resources_root = 'src/main/resources', 14 resources_root = 'src/main/resources',
23 resources = glob(['src/main/resources/**']), 15 resources = glob(['src/main/resources/**']),
24 ) 16 )
25 17
26 -java_test( 18 +onos_app (
27 - name = 'tests', 19 + title = 'Flow Space Analysis App',
28 - srcs = glob([TEST + '/*.java']), 20 + category = 'Monitoring',
29 - deps = COMPILE_DEPS + 21 + url = 'http://onosproject.org',
30 - TEST_DEPS + 22 + description = 'Simple flow space analyzer.',
31 - [CURRENT_TARGET],
32 - source_under_test = [CURRENT_TARGET],
33 ) 23 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -#FIXME there are some tests in main
3 -TEST = 'src/test/java/org/onosproject/**/'
4 -
5 -COMPILE_DEPS = [
6 - '//lib:CORE_DEPS',
7 - '//lib:org.apache.karaf.shell.console',
8 - '//cli:onos-cli',
9 - '//utils/rest:onlab-rest',
10 - '//lib:javax.ws.rs-api',
11 - '//core/store/serializers:onos-core-serializers',
12 -]
13 -
14 -TEST_DEPS = [
15 - '//lib:TEST',
16 -]
17 -
18 -java_library(
19 - name = 'onos-app-test',
20 - visibility = ['PUBLIC'],
21 - deps = [':onos-app-demo',
22 - ':onos-app-distributed-primitives',
23 - ':onos-app-election',
24 - ':onos-app-intent-perf',
25 - ':onos-app-loadtest',
26 - ':onos-app-messaging-perf',
27 - ],
28 -)
29 -
30 -# demo
31 -
32 -java_library(
33 - name = 'onos-app-demo',
34 - srcs = glob(['demo/' + SRC + '*.java']),
35 - deps = COMPILE_DEPS,
36 - visibility = ['PUBLIC'],
37 -)
38 -
39 -java_test(
40 - name = 'onos-app-demo-tests',
41 - srcs = glob(['demo/' + TEST + '*.java']),
42 - deps = COMPILE_DEPS +
43 - TEST_DEPS +
44 - [':onos-app-demo'],
45 - source_under_test = [':onos-app-demo'],
46 -)
47 -
48 -# distributed-primitives
49 -
50 -java_library(
51 - name = 'onos-app-distributed-primitives',
52 - srcs = glob(['distributed-primitives/' + SRC + '*.java']),
53 - deps = COMPILE_DEPS,
54 - visibility = ['PUBLIC'],
55 -)
56 -
57 -java_test(
58 - name = 'onos-app-distributed-primitives-tests',
59 - srcs = glob(['distributed-primitives/' + TEST + '*.java']),
60 - deps = COMPILE_DEPS +
61 - TEST_DEPS +
62 - [':onos-app-distributed-primitives'],
63 - source_under_test = [':onos-app-distributed-primitives'],
64 -)
65 -
66 -# election
67 -
68 -java_library(
69 - name = 'onos-app-election',
70 - srcs = glob(['election/' + SRC + '*.java']),
71 - deps = COMPILE_DEPS,
72 - visibility = ['PUBLIC'],
73 -)
74 -
75 -java_test(
76 - name = 'onos-app-election-tests',
77 - srcs = glob(['election/' + TEST + '*.java']),
78 - deps = COMPILE_DEPS +
79 - TEST_DEPS +
80 - [':onos-app-election'],
81 - source_under_test = [':onos-app-election'],
82 -)
83 -
84 -# intent-perf
85 -
86 -java_library(
87 - name = 'onos-app-intent-perf',
88 - srcs = glob(['intent-perf/' + SRC + '*.java']),
89 - deps = COMPILE_DEPS,
90 - visibility = ['PUBLIC'],
91 -)
92 -
93 -java_test(
94 - name = 'onos-app-intent-perf-tests',
95 - srcs = glob(['intent-perf/' + TEST + '*.java']),
96 - deps = COMPILE_DEPS +
97 - TEST_DEPS +
98 - [':onos-app-intent-perf'],
99 - source_under_test = [':onos-app-intent-perf'],
100 -)
101 -
102 -# loadtest
103 -
104 -java_library(
105 - name = 'onos-app-loadtest',
106 - srcs = glob(['loadtest/' + SRC + '*.java']),
107 - deps = COMPILE_DEPS,
108 - visibility = ['PUBLIC'],
109 -)
110 -
111 -java_test(
112 - name = 'onos-app-loadtest-tests',
113 - srcs = glob(['loadtest/' + TEST + '*.java']),
114 - deps = COMPILE_DEPS +
115 - TEST_DEPS +
116 - [':onos-app-loadtest'],
117 - source_under_test = [':onos-app-loadtest'],
118 -)
119 -
120 -# messaging-perf
121 -
122 -java_library(
123 - name = 'onos-app-messaging-perf',
124 - srcs = glob(['messaging-perf/' + SRC + '*.java']),
125 - deps = COMPILE_DEPS,
126 - visibility = ['PUBLIC'],
127 -)
128 -
129 -java_test(
130 - name = 'onos-app-messaging-perf-tests',
131 - srcs = glob(['messaging-perf/' + TEST + '*.java']),
132 - deps = COMPILE_DEPS +
133 - TEST_DEPS +
134 - [':onos-app-messaging-perf'],
135 - source_under_test = [':onos-app-messaging-perf'],
136 -)
137 -
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Flow Throughput Demo App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Flow throughput test application.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Distributed Primitives Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'ONOS app to test distributed primitives.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Master Election Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Master election test application.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Flow Performance Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Messaging performance test application.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Intent Performance Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Intent performance test application.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Distributed Load Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Distributed consensus load test application.',
19 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//utils/rest:onlab-rest',
6 + '//lib:javax.ws.rs-api',
7 + '//core/store/serializers:onos-core-serializers',
8 +]
9 +
10 +osgi_jar_with_tests (
11 + deps = COMPILE_DEPS,
12 +)
13 +
14 +onos_app (
15 + title = 'Messaging Performance Test App',
16 + category = 'Test',
17 + url = 'http://onosproject.org',
18 + description = 'Messaging performance test application.',
19 +)
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-xos-integration'
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,16 @@ COMPILE_DEPS = [ ...@@ -13,24 +7,16 @@ 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'], 12 + import_packages = '*,org.onosproject.cli.net',
25 resources_root = 'src/main/resources', 13 resources_root = 'src/main/resources',
26 resources = glob(['src/main/resources/**']), 14 resources = glob(['src/main/resources/**']),
27 ) 15 )
28 16
29 -java_test( 17 +onos_app (
30 - name = 'tests', 18 + title = 'ONOS XOS Integration App',
31 - srcs = glob([TEST + '/*.java']), 19 + category = 'Utility',
32 - deps = COMPILE_DEPS + 20 + url = 'http://onosproject.org',
33 - TEST_DEPS + 21 + description = 'ONOS XOS integration application.',
34 - [CURRENT_TARGET],
35 - source_under_test = [CURRENT_TARGET],
36 ) 22 )
......