홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
820d633b 1 parent 23fb1353

Start refactoring of app BUCK files 

- Brian added maven coordinates to the maven JAR short path
- refactored segment routing and ganglia metrics apps

Change-Id: I7b8110e07a474d256d4821c1a9d083c9c8c11e2e
Inline Side-by-side
Showing 5 changed files with 29 additions and 42 deletions
...@@ -89,6 +89,8 @@ APPS = [ ...@@ -89,6 +89,8 @@ APPS = [
89 '//apps/acl:onos-apps-acl-oar', 89 '//apps/acl:onos-apps-acl-oar',
90 '//apps/bgprouter:onos-apps-bgprouter-oar', 90 '//apps/bgprouter:onos-apps-bgprouter-oar',
91 '//apps/proxyarp:onos-apps-proxyarp-oar', 91 '//apps/proxyarp:onos-apps-proxyarp-oar',
92 + '//apps/segmentrouting:onos-apps-segmentrouting-oar',
93 + '//apps/gangliametrics:onos-apps-gangliametrics-oar',
92 ] 94 ]
93 95
94 APP_JARS = [ 96 APP_JARS = [
...@@ -111,7 +113,6 @@ APP_JARS = [ ...@@ -111,7 +113,6 @@ APP_JARS = [
111 '//apps/olt:onos-app-olt-app', 113 '//apps/olt:onos-app-olt-app',
112 '//apps/iptopology-api:onos-app-iptopology-api', 114 '//apps/iptopology-api:onos-app-iptopology-api',
113 '//apps/metrics:onos-app-metrics', 115 '//apps/metrics:onos-app-metrics',
114 - '//apps/gangliametrics:onos-app-ganglia',
115 '//apps/graphitemetrics:onos-app-graphite', 116 '//apps/graphitemetrics:onos-app-graphite',
116 '//apps/mfwd:onos-app-mfwd', 117 '//apps/mfwd:onos-app-mfwd',
117 '//apps/mlb:onos-app-mlb', 118 '//apps/mlb:onos-app-mlb',
...@@ -125,7 +126,6 @@ APP_JARS = [ ...@@ -125,7 +126,6 @@ APP_JARS = [
125 '//apps/pim:onos-app-pim', 126 '//apps/pim:onos-app-pim',
126 '//apps/routing:onos-apps-routing', 127 '//apps/routing:onos-apps-routing',
127 '//apps/sdnip:onos-app-sdnip', 128 '//apps/sdnip:onos-app-sdnip',
128 - '//apps/segmentrouting:onos-app-segmentrouting',
129 '//apps/test:onos-app-test', 129 '//apps/test:onos-app-test',
130 '//apps/vtn:onos-app-vtn', 130 '//apps/vtn:onos-app-vtn',
131 '//apps/virtualbng:onos-app-virtualbng', 131 '//apps/virtualbng:onos-app-virtualbng',
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-ganglia'
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-ganglia', 4 '//lib:metrics-ganglia',
5 + '//lib:remotetea-oncrpc',
11 ] 6 ]
12 7
13 -TEST_DEPS = [ 8 +EXCLUDED_BUNDLES = [
14 - '//lib:TEST', 9 + '//lib:gmetric4j',
10 + '//lib:metrics-ganglia',
11 + '//lib:remotetea-oncrpc',
15 ] 12 ]
16 13
17 -java_library( 14 +osgi_jar_with_tests (
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'],
22 ) 16 )
23 17
24 -java_test( 18 +onos_app (
25 - name = 'tests', 19 + title = 'Ganglia Report and Query App',
26 - srcs = glob([TEST + '/*.java']), 20 + category = 'Monitoring',
27 - deps = COMPILE_DEPS + 21 + url = 'http://onosproject.org',
28 - TEST_DEPS + 22 + description = 'Performance metric service reporter',
29 - [CURRENT_TARGET], 23 + excluded_bundles = EXCLUDED_BUNDLES,
30 - source_under_test = [CURRENT_TARGET],
31 ) 24 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-segmentrouting'
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',
...@@ -18,22 +12,14 @@ TEST_DEPS = [ ...@@ -18,22 +12,14 @@ TEST_DEPS = [
18 '//lib:TEST_ADAPTERS', 12 '//lib:TEST_ADAPTERS',
19 ] 13 ]
20 14
21 -java_library( 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 - resources_root = 'src/main/resources',
27 - resources = glob(['src/main/resources/**']),
28 ) 18 )
29 19
30 -java_test( 20 +onos_app (
31 - name = 'tests', 21 + title = 'Proxy ARP/NDP App',
32 - srcs = glob([TEST + '/*.java']), 22 + category = 'Traffic Steering',
33 - deps = COMPILE_DEPS + 23 + url = 'http://onosproject.org',
34 - TEST_DEPS + 24 + description = 'Proxy ARP/NDP application.',
35 - [CURRENT_TARGET],
36 - source_under_test = [CURRENT_TARGET],
37 - resources_root = 'src/test/resources',
38 - resources = glob(['src/test/resources/**']),
39 ) 25 )
......
...@@ -49,6 +49,7 @@ def maven_jar( ...@@ -49,6 +49,7 @@ def maven_jar(
49 prebuilt_jar( 49 prebuilt_jar(
50 name = name, 50 name = name,
51 binary_jar = ':%s-jar' % name, 51 binary_jar = ':%s-jar' % name,
52 + maven_coords = id,
52 visibility = [ 'PUBLIC' ] 53 visibility = [ 'PUBLIC' ]
53 ) 54 )
54 55
......
...@@ -943,3 +943,10 @@ remote_file( ...@@ -943,3 +943,10 @@ remote_file(
943 url = 'http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar', 943 url = 'http://onlab.vicci.org/onos/third-party/checkstyle-6.11.2-all.jar',
944 sha1 = 'f504187b1743e73ffe72c2eede0ff57d45536b7d' 944 sha1 = 'f504187b1743e73ffe72c2eede0ff57d45536b7d'
945 ) 945 )
946 +
947 +maven_jar(
948 + name = 'remotetea-oncrpc',
949 + id = 'org.acplt.remotetea:remotetea-oncrpc:1.1.3',
950 + sha1 = '2f7d94c5179b0267a882259a03a83eaa320cbcce',
951 + license = 'Apache2.0',
952 +)
......