홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
be27bb3d 1 parent 4847ea3d

Updating BUCK files 

Change-Id: I24f279b42a270e59cf4bf4564e2aa4d81459c8e2
Inline Side-by-side
Showing 16 changed files with 42 additions and 196 deletions
...@@ -73,6 +73,9 @@ CORE = [ ...@@ -73,6 +73,9 @@ CORE = [
73 ] 73 ]
74 74
75 APPS = [ 75 APPS = [
76 + #Drivers
77 + '//drivers/default:onos-drivers-default-oar',
78 +
76 # Providers 79 # Providers
77 '//providers/bgp:onos-providers-bgp-oar', 80 '//providers/bgp:onos-providers-bgp-oar',
78 '//providers/host:onos-providers-host-oar', 81 '//providers/host:onos-providers-host-oar',
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//lib:org.apache.karaf.shell.console',
4 - '//cli:onos-cli',
5 ] 3 ]
6 4
7 osgi_jar_with_tests ( 5 osgi_jar_with_tests (
...@@ -12,5 +10,5 @@ onos_app ( ...@@ -12,5 +10,5 @@ onos_app (
12 title = 'Reactive Forwarding App', 10 title = 'Reactive Forwarding App',
13 category = 'Traffic Steering', 11 category = 'Traffic Steering',
14 url = 'http://onosproject.org', 12 url = 'http://onosproject.org',
15 - description = 'Reactive forwarding application using flow subsystem.', 13 + description = 'Reactive forwarding application using flow objective subsystem.',
16 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-cli'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:org.apache.karaf.shell.console', 3 '//lib:org.apache.karaf.shell.console',
...@@ -11,12 +6,8 @@ COMPILE_DEPS = [ ...@@ -11,12 +6,8 @@ COMPILE_DEPS = [
11 '//core/common:onos-core-common', 6 '//core/common:onos-core-common',
12 ] 7 ]
13 8
14 -osgi_jar( 9 +osgi_jar (
15 - name = CURRENT_NAME,
16 - srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 10 deps = COMPILE_DEPS,
18 visibility = ['PUBLIC'], 11 visibility = ['PUBLIC'],
19 - resources_root = 'src/main/resources',
20 - resources = glob(['src/main/resources/**']),
21 ) 12 )
22 13
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-common'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 SRC_DEPS = [ 1 SRC_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
...@@ -13,21 +8,9 @@ TEST_DEPS = [ ...@@ -13,21 +8,9 @@ TEST_DEPS = [
13 '//core/api:onos-api-tests', 8 '//core/api:onos-api-tests',
14 ] 9 ]
15 10
16 -osgi_jar( 11 +osgi_jar_with_tests (
17 - name = CURRENT_NAME, 12 + name = 'onos-core-common',
18 - srcs = glob([SRC + '/*.java']),
19 deps = SRC_DEPS, 13 deps = SRC_DEPS,
14 + test_deps = TEST_DEPS,
20 visibility = ['PUBLIC'], 15 visibility = ['PUBLIC'],
21 ) 16 )
22 -
23 -java_test(
24 - name = 'onos-core-common-tests',
25 - visibility = ['PUBLIC'],
26 - srcs = glob([TEST + '/*.java']),
27 - resources_root = 'src/test/resources',
28 - resources = glob(['src/test/resources/**']),
29 - deps = SRC_DEPS +
30 - TEST_DEPS +
31 - [CURRENT_TARGET],
32 - source_under_test = [CURRENT_TARGET],
33 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-net'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
...@@ -15,20 +10,9 @@ TEST_DEPS = [ ...@@ -15,20 +10,9 @@ TEST_DEPS = [
15 '//core/store/dist:onos-core-dist-tests', 10 '//core/store/dist:onos-core-dist-tests',
16 ] 11 ]
17 12
18 -osgi_jar( 13 +osgi_jar_with_tests (
19 - name = CURRENT_NAME, 14 + name = 'onos-core-net',
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 15 deps = COMPILE_DEPS,
16 + test_deps = TEST_DEPS,
22 visibility = ['PUBLIC'], 17 visibility = ['PUBLIC'],
23 -) 18 +)
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 - resources_root = 'src/test/resources',
33 - resources = glob(['src/test/resources/**']),
34 -)
...\ No newline at end of file ...\ No newline at end of file
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-dist'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//core/common:onos-core-common', 3 '//core/common:onos-core-common',
...@@ -18,23 +13,13 @@ COMPILE_DEPS = [ ...@@ -18,23 +13,13 @@ COMPILE_DEPS = [
18 13
19 TEST_DEPS = [ 14 TEST_DEPS = [
20 '//lib:TEST', 15 '//lib:TEST',
21 - '//core/api:onos-api-tests', 16 + '//core/api:onos-api-tests',
22 - '//core/common:onos-core-common-tests', 17 + '//core/common:onos-core-common-tests',
23 ] 18 ]
24 19
25 -osgi_jar( 20 +osgi_jar_with_tests (
26 - name = CURRENT_NAME, 21 + name = 'onos-core-dist',
27 - srcs = glob([SRC + '/*.java']),
28 deps = COMPILE_DEPS, 22 deps = COMPILE_DEPS,
29 - visibility = ['PUBLIC'], 23 + test_deps = TEST_DEPS,
30 -)
31 -
32 -java_test(
33 - name= 'onos-core-dist-tests',
34 - srcs = glob([TEST + '/*.java']),
35 - deps = COMPILE_DEPS +
36 - TEST_DEPS +
37 - [CURRENT_TARGET],
38 - source_under_test = [CURRENT_TARGET],
39 visibility = ['PUBLIC'], 24 visibility = ['PUBLIC'],
40 ) 25 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-persistence'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:catalyst-serializer', 3 '//lib:catalyst-serializer',
...@@ -13,18 +8,9 @@ TEST_DEPS = [ ...@@ -13,18 +8,9 @@ TEST_DEPS = [
13 '//lib:TEST', 8 '//lib:TEST',
14 ] 9 ]
15 10
16 -osgi_jar( 11 +osgi_jar_with_tests (
17 - name = CURRENT_NAME, 12 + name = 'onos-core-persistence',
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
14 + test_deps = TEST_DEPS,
20 visibility = ['PUBLIC'], 15 visibility = ['PUBLIC'],
21 ) 16 )
22 -
23 -java_test(
24 - name = 'tests',
25 - srcs = glob([TEST + '/*.java']),
26 - deps = COMPILE_DEPS +
27 - TEST_DEPS +
28 - [CURRENT_TARGET],
29 - source_under_test = [CURRENT_TARGET],
30 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-primitives'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//core/common:onos-core-common', 3 '//core/common:onos-core-common',
...@@ -32,18 +27,9 @@ TEST_DEPS = [ ...@@ -32,18 +27,9 @@ TEST_DEPS = [
32 '//core/api:onos-api-tests', 27 '//core/api:onos-api-tests',
33 ] 28 ]
34 29
35 -osgi_jar( 30 +osgi_jar_with_tests (
36 - name = CURRENT_NAME, 31 + name = 'onos-core-primitives',
37 - srcs = glob([SRC + '/*.java']),
38 deps = COMPILE_DEPS, 32 deps = COMPILE_DEPS,
33 + test_deps = TEST_DEPS,
39 visibility = ['PUBLIC'], 34 visibility = ['PUBLIC'],
40 ) 35 )
41 -
42 -java_test(
43 - name = 'tests',
44 - srcs = glob([TEST + '/*.java']),
45 - deps = COMPILE_DEPS +
46 - TEST_DEPS +
47 - [CURRENT_TARGET],
48 - source_under_test = [CURRENT_TARGET],
49 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-core-serializers'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
...@@ -12,18 +7,9 @@ TEST_DEPS = [ ...@@ -12,18 +7,9 @@ TEST_DEPS = [
12 '//lib:TEST', 7 '//lib:TEST',
13 ] 8 ]
14 9
15 -osgi_jar( 10 +osgi_jar_with_tests (
16 - name = CURRENT_NAME, 11 + name = 'onos-core-serializers',
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
13 + test_deps = TEST_DEPS,
19 visibility = ['PUBLIC'], 14 visibility = ['PUBLIC'],
20 ) 15 )
21 -
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 -)
......
...@@ -18,4 +18,9 @@ onos_app ( ...@@ -18,4 +18,9 @@ onos_app (
18 category = 'Drivers', 18 category = 'Drivers',
19 url = 'http://onosproject.org', 19 url = 'http://onosproject.org',
20 description = 'ONOS Default device drivers application.', 20 description = 'ONOS Default device drivers application.',
21 + included_bundles = [
22 + ':onos-drivers-default',
23 + '//lib:openflowj',
24 + '//protocols/openflow/api:onos-protocols-openflow-api',
25 + ]
21 ) 26 )
......
1 -SRC = 'src/main/java/org/onosproject/incubator/**/'
2 -TEST = 'src/test/java/org/onosproject/incubator/**/'
3 -CURRENT_NAME = 'onos-incubator-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 ] 3 ]
...@@ -11,21 +6,9 @@ TEST_DEPS = [ ...@@ -11,21 +6,9 @@ TEST_DEPS = [
11 '//lib:TEST_ADAPTERS', 6 '//lib:TEST_ADAPTERS',
12 ] 7 ]
13 8
14 -osgi_jar( 9 +osgi_jar_with_tests (
15 - name = CURRENT_NAME, 10 + name = 'onos-incubator-api',
16 - srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
12 + test_deps = TEST_DEPS,
18 visibility = ['PUBLIC'], 13 visibility = ['PUBLIC'],
19 ) 14 )
20 -
21 -java_test(
22 - name = 'onos-incubator-api-tests',
23 - srcs = glob([TEST + '/*.java']),
24 - deps = COMPILE_DEPS +
25 - TEST_DEPS +
26 - [CURRENT_TARGET],
27 - source_under_test = [CURRENT_TARGET],
28 - visibility = ['PUBLIC'],
29 - resources_root = 'src/test/resources',
30 - resources = glob(['src/test/resources/**']),
31 -)
......
1 -SRC = 'src/main/java/org/onosproject/incubator/**/'
2 -TEST = 'src/test/java/org/onosproject/incubator/**/'
3 -CURRENT_NAME = 'onos-incubator-core'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
...@@ -12,18 +7,8 @@ TEST_DEPS = [ ...@@ -12,18 +7,8 @@ TEST_DEPS = [
12 '//lib:TEST', 7 '//lib:TEST',
13 ] 8 ]
14 9
15 -osgi_jar( 10 +osgi_jar_with_tests (
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
12 + test_deps = TEST_DEPS,
19 visibility = ['PUBLIC'], 13 visibility = ['PUBLIC'],
20 ) 14 )
21 -
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/incubator/**/'
2 -TEST = 'src/test/java/org/onosproject/incubator/**/'
3 -CURRENT_NAME = 'onos-incubator-rpc'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//incubator/api:onos-incubator-api', 3 '//incubator/api:onos-incubator-api',
...@@ -12,18 +7,8 @@ TEST_DEPS = [ ...@@ -12,18 +7,8 @@ TEST_DEPS = [
12 '//lib:TEST', 7 '//lib:TEST',
13 ] 8 ]
14 9
15 -osgi_jar( 10 +osgi_jar_with_tests (
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
12 + test_deps = TEST_DEPS,
19 visibility = ['PUBLIC'], 13 visibility = ['PUBLIC'],
20 ) 14 )
21 -
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/incubator/store/**/'
2 -TEST = 'src/test/java/org/onosproject/incubator/store/**/'
3 -CURRENT_NAME = 'onos-incubator-store'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:concurrent-trees', 3 '//lib:concurrent-trees',
...@@ -17,18 +12,8 @@ TEST_DEPS = [ ...@@ -17,18 +12,8 @@ TEST_DEPS = [
17 '//core/common:onos-core-common-tests', 12 '//core/common:onos-core-common-tests',
18 ] 13 ]
19 14
20 -osgi_jar( 15 +osgi_jar_with_tests (
21 - name = CURRENT_NAME,
22 - srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
17 + test_deps = TEST_DEPS,
24 visibility = ['PUBLIC'], 18 visibility = ['PUBLIC'],
25 ) 19 )
26 -
27 -java_test(
28 - name = 'tests',
29 - srcs = glob([TEST + '/*.java']),
30 - deps = COMPILE_DEPS +
31 - TEST_DEPS +
32 - [CURRENT_TARGET],
33 - source_under_test = [CURRENT_TARGET],
34 -)
......
...@@ -4,6 +4,6 @@ COMPILE_DEPS = [ ...@@ -4,6 +4,6 @@ COMPILE_DEPS = [
4 '//protocols/netconf/api:onos-protocols-netconf-api', 4 '//protocols/netconf/api:onos-protocols-netconf-api',
5 ] 5 ]
6 6
7 -osgi_jar( 7 +osgi_jar_with_tests (
8 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
9 ) 9 )
......
...@@ -10,6 +10,7 @@ BUNDLES = [ ...@@ -10,6 +10,7 @@ BUNDLES = [
10 ] 10 ]
11 11
12 onos_app ( 12 onos_app (
13 + app_name = 'org.onosproject.openflow-base',
13 title = 'OpenFlow Provider', 14 title = 'OpenFlow Provider',
14 category = 'Provider', 15 category = 'Provider',
15 url = 'http://onosproject.org', 16 url = 'http://onosproject.org',
......