홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Brian O'Connor
8dac818d 1 parent fdbb7f4f

Refactor protocol BUCK files to use more modern rules and format 

Change-Id: I9262fdeef12cfd098afefc711d995ffc76b9efb1
Inline Side-by-side
Showing 52 changed files with 173 additions and 408 deletions
...@@ -23,26 +23,27 @@ CORE = [ ...@@ -23,26 +23,27 @@ CORE = [
23 23
24 '//protocols/rest/api:onos-protocols-rest-api', 24 '//protocols/rest/api:onos-protocols-rest-api',
25 '//protocols/rest/ctl:onos-protocols-rest-ctl', 25 '//protocols/rest/ctl:onos-protocols-rest-ctl',
26 - '//protocols/bgp/bgpio:onos-bgpio', 26 + '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
27 - '//protocols/bgp/api:onos-bgp-api', 27 + '//protocols/bgp/api:onos-protocols-bgp-api',
28 - '//protocols/bgp/ctl:onos-bgp-ctl', 28 + '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
29 '//protocols/netconf/api:onos-protocols-netconf-api', 29 '//protocols/netconf/api:onos-protocols-netconf-api',
30 '//protocols/netconf/ctl:onos-protocols-netconf-ctl', 30 '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
31 - '//protocols/openflow/api:onos-of-api', 31 + '//protocols/openflow/api:onos-protocols-openflow-api',
32 - '//protocols/openflow/ctl:onos-of-ctl', 32 + '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
33 - '//protocols/ospf/api:onos-ospf-api', 33 + '//protocols/ospf/api:onos-protocols-ospf-api',
34 - '//protocols/ospf/protocol:onos-ospf-protocol', 34 + '//protocols/ospf/protocol:onos-protocols-ospf-protocol',
35 - '//protocols/ospf/ctl:onos-ospf-ctl', 35 + '//protocols/ospf/ctl:onos-protocols-ospf-ctl',
36 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 36 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
37 - '//protocols/ovsdb/api:onos-ovsdb-api', 37 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
38 - '//protocols/ovsdb/ctl:onos-ovsdb-ctl', 38 + '//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl',
39 - '//protocols/pcep/pcepio:onos-pcep-pcepio', 39 + '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
40 - '//protocols/pcep/api:onos-pcep-controller-api', 40 + '//protocols/pcep/api:onos-protocols-pcep-api',
41 - '//protocols/pcep/ctl:onos-pcep-ctl', 41 + '//protocols/pcep/ctl:onos-protocols-pcep-ctl',
42 - '//protocols/snmp/api:onos-snmp-api', 42 + '//protocols/snmp/api:onos-protocols-snmp-api',
43 - '//protocols/snmp/ctl:onos-snmp-ctl', 43 + '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
44 - '//protocols/isis:onos-isis-api', 44 + '//protocols/isis/api:onos-protocols-isis-api',
45 - '//protocols/isis:onos-isis-isisio', 45 + '//protocols/isis/ctl:onos-protocols-isis-ctl',
46 + '//protocols/isis/isisio:onos-protocols-isis-isisio',
46 47
47 '//drivers/utilities:onos-drivers-utilities', 48 '//drivers/utilities:onos-drivers-utilities',
48 '//drivers/bti:onos-drivers-bti-oar', 49 '//drivers/bti:onos-drivers-bti-oar',
...@@ -64,6 +65,8 @@ CORE = [ ...@@ -64,6 +65,8 @@ CORE = [
64 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', 65 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
65 '//providers/rest/device:onos-providers-rest-device', 66 '//providers/rest/device:onos-providers-rest-device',
66 '//providers/snmp/device:onos-providers-snmp-device', 67 '//providers/snmp/device:onos-providers-snmp-device',
68 + '//providers/isis/cfg:onos-providers-isis-cfg',
69 + '//providers/isis/device:onos-providers-isis-device',
67 70
68 '//web/api:onos-rest', 71 '//web/api:onos-rest',
69 '//web/gui:onos-gui', 72 '//web/gui:onos-gui',
...@@ -83,6 +86,7 @@ APPS = [ ...@@ -83,6 +86,7 @@ APPS = [
83 '//providers/null:onos-providers-null-oar', 86 '//providers/null:onos-providers-null-oar',
84 '//providers/openflow/base:onos-providers-openflow-base-oar', 87 '//providers/openflow/base:onos-providers-openflow-base-oar',
85 '//providers/rest:onos-providers-rest-oar', 88 '//providers/rest:onos-providers-rest-oar',
89 + '//providers/isis:onos-providers-isis-oar',
86 90
87 # Apps 91 # Apps
88 '//apps/dhcp:onos-apps-dhcp-oar', 92 '//apps/dhcp:onos-apps-dhcp-oar',
......
...@@ -15,8 +15,8 @@ COMPILE_DEPS = [ ...@@ -15,8 +15,8 @@ COMPILE_DEPS = [
15 '//apps/openstackinterface/api:onos-apps-openstackinterface-api', 15 '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
16 '//apps/dhcp/api:onos-apps-dhcp-api', 16 '//apps/dhcp/api:onos-apps-dhcp-api',
17 '//apps/xosclient:onos-apps-xosclient', 17 '//apps/xosclient:onos-apps-xosclient',
18 - '//protocols/ovsdb/api:onos-ovsdb-api', 18 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
19 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 19 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
20 ] 20 ]
21 21
22 BUNDLES = [ 22 BUNDLES = [
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/ovsdb/api:onos-ovsdb-api', 3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
5 '//core/store/serializers:onos-core-serializers', 5 '//core/store/serializers:onos-core-serializers',
6 ] 6 ]
7 7
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/ovsdb/api:onos-ovsdb-api', 3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
5 ] 5 ]
6 6
7 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/snmp/api:onos-snmp-api', 3 + '//protocols/snmp/api:onos-protocols-snmp-api',
4 '//incubator/api:onos-incubator-api', 4 '//incubator/api:onos-incubator-api',
5 '//lib:org.apache.servicemix.bundles.snmp4j', 5 '//lib:org.apache.servicemix.bundles.snmp4j',
6 '//lib:snmp-core', 6 '//lib:snmp-core',
......
...@@ -2,7 +2,7 @@ COMPILE_DEPS = [ ...@@ -2,7 +2,7 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 '//drivers/utilities:onos-drivers-utilities', 4 '//drivers/utilities:onos-drivers-utilities',
5 - '//protocols/openflow/api:onos-of-api', 5 + '//protocols/openflow/api:onos-protocols-openflow-api',
6 '//core/store/serializers:onos-core-serializers', 6 '//core/store/serializers:onos-core-serializers',
7 ] 7 ]
8 8
...@@ -13,6 +13,7 @@ osgi_jar_with_tests ( ...@@ -13,6 +13,7 @@ osgi_jar_with_tests (
13 ) 13 )
14 14
15 onos_app ( 15 onos_app (
16 + app_name = 'org.onosproject.drivers',
16 title = 'Default device drivers', 17 title = 'Default device drivers',
17 category = 'Drivers', 18 category = 'Drivers',
18 url = 'http://onosproject.org', 19 url = 'http://onosproject.org',
......
...@@ -2,7 +2,7 @@ COMPILE_DEPS = [ ...@@ -2,7 +2,7 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:org.apache.servicemix.bundles.snmp4j', 3 '//lib:org.apache.servicemix.bundles.snmp4j',
4 '//drivers/utilities:onos-drivers-utilities', 4 '//drivers/utilities:onos-drivers-utilities',
5 - '//protocols/snmp/api:onos-snmp-api', 5 + '//protocols/snmp/api:onos-protocols-snmp-api',
6 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
7 ] 7 ]
8 8
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//drivers/utilities:onos-drivers-utilities', 3 '//drivers/utilities:onos-drivers-utilities',
4 - '//protocols/ovsdb/api:onos-ovsdb-api', 4 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
5 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 5 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
6 ] 6 ]
7 7
8 TEST_DEPS = [ 8 TEST_DEPS = [
9 '//lib:TEST_ADAPTERS', 9 '//lib:TEST_ADAPTERS',
10 - '//protocols/ovsdb/api:onos-protocols-ovsdb-tests', 10 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api-tests',
11 ] 11 ]
12 12
13 osgi_jar_with_tests ( 13 osgi_jar_with_tests (
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-bgp-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 - '//protocols/bgp/bgpio:onos-bgpio', 3 + '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
9 ] 4 ]
10 5
11 -osgi_jar( 6 +osgi_jar_with_tests (
12 - name = CURRENT_NAME,
13 - srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 7 deps = COMPILE_DEPS,
15 - visibility = ['PUBLIC'],
16 ) 8 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-bgpio'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 ] 3 ]
9 4
10 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
11 - '//lib:TEST',
12 -]
13 -
14 -osgi_jar(
15 - name = CURRENT_NAME,
16 - srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
18 - visibility = ['PUBLIC'],
19 -)
20 -
21 -java_test(
22 - name = 'tests',
23 - srcs = glob([TEST + '/*.java']),
24 - deps = COMPILE_DEPS +
25 - TEST_DEPS +
26 - [CURRENT_TARGET],
27 - source_under_test = [CURRENT_TARGET],
28 ) 7 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-bgp-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:jersey-client', 3 '//lib:jersey-client',
9 '//lib:httpclient-osgi', 4 '//lib:httpclient-osgi',
10 '//lib:httpcore-osgi', 5 '//lib:httpcore-osgi',
11 '//lib:javax.ws.rs-api', 6 '//lib:javax.ws.rs-api',
12 - '//protocols/bgp/api:onos-bgp-api', 7 + '//protocols/bgp/api:onos-protocols-bgp-api',
13 - '//protocols/bgp/bgpio:onos-bgpio', 8 + '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
14 -]
15 -
16 -TEST_DEPS = [
17 - '//lib:TEST',
18 ] 9 ]
19 10
20 -osgi_jar( 11 +osgi_jar_with_tests (
21 - name = CURRENT_NAME,
22 - srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
24 - visibility = ['PUBLIC'],
25 -)
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 ) 13 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -COMPILE_DEPS = [
5 - '//lib:CORE_DEPS',
6 - '//lib:netty-buffer',
7 -]
8 -
9 -TEST_DEPS = [
10 - '//lib:TEST',
11 -]
12 -
13 -java_library(
14 - name = 'onos-isis',
15 - visibility = ['PUBLIC'],
16 - deps = [':onos-isis-api',
17 - ':onos-isis-isisio',
18 - ],
19 -)
20 -
21 -# onos-isis-api
22 -
23 -osgi_jar(
24 - name = 'onos-isis-api',
25 - srcs = glob(['api/' + SRC + '*.java']),
26 - deps = COMPILE_DEPS,
27 - visibility = ['PUBLIC'],
28 -)
29 -
30 -java_test(
31 - name = 'onos-isis-api-tests',
32 - srcs = glob(['api/' + TEST + '*.java']),
33 - deps = COMPILE_DEPS +
34 - TEST_DEPS +
35 - [':onos-isis-api'],
36 - source_under_test = [':onos-isis-api'],
37 -)
38 -
39 -# onos-isis-isisio
40 -
41 -osgi_jar(
42 - name = 'onos-isis-isisio',
43 - srcs = glob(['isisio/' + SRC + '*.java']),
44 - deps = COMPILE_DEPS + [':onos-isis-api'],
45 - visibility = ['PUBLIC'],
46 -)
47 -
48 -java_test(
49 - name = 'onos-isis-isisio-tests',
50 - srcs = glob(['isisio/' + TEST + '*.java']),
51 - deps = COMPILE_DEPS +
52 - TEST_DEPS +
53 - [':onos-isis-isisio'],
54 - source_under_test = [':onos-isis-isisio'],
55 -)
56 -
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 +]
4 +
5 +osgi_jar_with_tests (
6 + deps = COMPILE_DEPS,
7 +)
8 +
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//protocols/isis/api:onos-protocols-isis-api',
4 + '//protocols/isis/isisio:onos-protocols-isis-isisio',
5 +]
6 +
7 +osgi_jar_with_tests (
8 + deps = COMPILE_DEPS,
9 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//protocols/isis/api:onos-protocols-isis-api',
4 +]
5 +
6 +osgi_jar_with_tests (
7 + deps = COMPILE_DEPS,
8 +)
...@@ -2,6 +2,6 @@ COMPILE_DEPS = [ ...@@ -2,6 +2,6 @@ COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 ] 3 ]
4 4
5 -osgi_jar( 5 +osgi_jar_with_tests (
6 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
7 ) 7 )
......
...@@ -9,7 +9,6 @@ TEST_DEPS = [ ...@@ -9,7 +9,6 @@ TEST_DEPS = [
9 ] 9 ]
10 10
11 osgi_jar_with_tests ( 11 osgi_jar_with_tests (
12 - name = 'onos-of-api',
13 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
14 test_deps = TEST_DEPS, 13 test_deps = TEST_DEPS,
15 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-of-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:openflowj', 3 '//lib:openflowj',
9 - '//protocols/openflow/api:onos-of-api' 4 + '//protocols/openflow/api:onos-protocols-openflow-api'
10 ] 5 ]
11 6
12 TEST_DEPS = [ 7 TEST_DEPS = [
...@@ -14,18 +9,7 @@ TEST_DEPS = [ ...@@ -14,18 +9,7 @@ TEST_DEPS = [
14 '//core/api:onos-api-tests', 9 '//core/api:onos-api-tests',
15 ] 10 ]
16 11
17 -osgi_jar( 12 +osgi_jar_with_tests (
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'], 14 + test_deps = TEST_DEPS,
22 -)
23 -
24 -java_test(
25 - name = 'tests',
26 - srcs = glob([TEST + '/*.java']),
27 - deps = COMPILE_DEPS +
28 - TEST_DEPS +
29 - [CURRENT_TARGET],
30 - source_under_test = [CURRENT_TARGET],
31 ) 15 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-ospf-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 ] 3 ]
9 4
10 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
11 - '//lib:TEST',
12 -]
13 -
14 -osgi_jar(
15 - name = CURRENT_NAME,
16 - srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
18 - visibility = ['PUBLIC'],
19 ) 7 )
20 8
21 -java_test(
22 - name = 'tests',
23 - srcs = glob([TEST + '/*.java']),
24 - deps = COMPILE_DEPS +
25 - TEST_DEPS +
26 - [CURRENT_TARGET],
27 - source_under_test = [CURRENT_TARGET],
28 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-ospf-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 - '//protocols/ospf/api:onos-ospf-api', 3 + '//protocols/ospf/api:onos-protocols-ospf-api',
9 - '//protocols/ospf/protocol:onos-ospf-protocol', 4 + '//protocols/ospf/protocol:onos-protocols-ospf-protocol',
10 -]
11 -
12 -TEST_DEPS = [
13 - '//lib:TEST',
14 ] 5 ]
15 6
16 -osgi_jar( 7 +osgi_jar_with_tests (
17 - name = CURRENT_NAME,
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'],
21 ) 9 )
22 10
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-ospf-protocol'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 - '//protocols/ospf/api:onos-ospf-api', 3 + '//protocols/ospf/api:onos-protocols-ospf-api',
9 -]
10 -
11 -TEST_DEPS = [
12 - '//lib:TEST',
13 ] 4 ]
14 5
15 -osgi_jar( 6 +osgi_jar_with_tests (
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 7 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 -)
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 ) 8 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-ovsdb-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:netty-transport', 3 '//lib:netty-transport',
9 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
10 -]
11 -
12 -TEST_DEPS = [
13 - '//lib:TEST',
14 ] 5 ]
15 6
16 -osgi_jar( 7 +osgi_jar_with_tests (
17 - name = CURRENT_NAME,
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'],
21 ) 9 )
22 10
23 -java_test(
24 - name = 'onos-protocols-ovsdb-tests',
25 - srcs = glob([TEST + '/*.java']),
26 - deps = COMPILE_DEPS +
27 - TEST_DEPS +
28 - [CURRENT_TARGET],
29 - source_under_test = [CURRENT_TARGET],
30 - visibility = ['PUBLIC'],
31 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-ovsdb-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:netty-transport', 3 '//lib:netty-transport',
9 '//lib:netty-buffer', 4 '//lib:netty-buffer',
10 '//lib:netty-codec', 5 '//lib:netty-codec',
11 '//lib:netty-handler', 6 '//lib:netty-handler',
12 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 7 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
13 - '//protocols/ovsdb/api:onos-ovsdb-api', 8 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
14 -]
15 -
16 -TEST_DEPS = [
17 - '//lib:TEST',
18 ] 9 ]
19 10
20 -osgi_jar( 11 +osgi_jar_with_tests (
21 - name = CURRENT_NAME,
22 - srcs = glob([SRC + '/*.java']),
23 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
24 - visibility = ['PUBLIC'],
25 ) 13 )
26 14
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 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-ovsdb-rfc'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:netty-buffer', 3 '//lib:netty-buffer',
9 '//lib:netty-codec', 4 '//lib:netty-codec',
10 ] 5 ]
11 6
12 -osgi_jar( 7 +osgi_jar_with_tests (
13 - name = CURRENT_NAME,
14 - srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
16 - visibility = ['PUBLIC'],
17 ) 9 )
18 10
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-pcep-controller-api'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 - '//protocols/pcep/pcepio:onos-pcep-pcepio', 3 + '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
9 ] 4 ]
10 5
11 -osgi_jar( 6 +osgi_jar_with_tests (
12 - name = CURRENT_NAME,
13 - srcs = glob([SRC + '/*.java']),
14 deps = COMPILE_DEPS, 7 deps = COMPILE_DEPS,
15 - visibility = ['PUBLIC'],
16 ) 8 )
17 9
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-pcep-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 - '//protocols/pcep/pcepio:onos-pcep-pcepio', 3 + '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
9 - '//protocols/pcep/api:onos-pcep-controller-api', 4 + '//protocols/pcep/api:onos-protocols-pcep-api',
10 ] 5 ]
11 6
12 -osgi_jar( 7 +osgi_jar_with_tests (
13 - name = CURRENT_NAME,
14 - srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
16 - visibility = ['PUBLIC'],
17 ) 9 )
18 10
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-pcep-pcepio'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 ] 3 ]
9 4
10 -TEST_DEPS = [ 5 +osgi_jar_with_tests (
11 - '//lib:TEST',
12 -]
13 -
14 -osgi_jar(
15 - name = CURRENT_NAME,
16 - srcs = glob([SRC + '/*.java']),
17 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
18 - visibility = ['PUBLIC'],
19 ) 7 )
20 8
21 -java_test(
22 - name = 'tests',
23 - srcs = glob([TEST + '/*.java']),
24 - deps = COMPILE_DEPS +
25 - TEST_DEPS +
26 - [CURRENT_TARGET],
27 - source_under_test = [CURRENT_TARGET],
28 -)
......
...@@ -12,10 +12,6 @@ COMPILE_DEPS = [ ...@@ -12,10 +12,6 @@ COMPILE_DEPS = [
12 '//protocols/rest/api:onos-protocols-rest-api', 12 '//protocols/rest/api:onos-protocols-rest-api',
13 ] 13 ]
14 14
15 -TEST_DEPS = [
16 - '//lib:TEST',
17 -]
18 -
19 osgi_jar_with_tests ( 15 osgi_jar_with_tests (
20 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
21 ) 17 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-snmp-api'
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',
...@@ -13,9 +8,6 @@ COMPILE_DEPS = [ ...@@ -13,9 +8,6 @@ COMPILE_DEPS = [
13 '//lib:mibs-rfc', 8 '//lib:mibs-rfc',
14 ] 9 ]
15 10
16 -osgi_jar( 11 +osgi_jar_with_tests (
17 - name = CURRENT_NAME,
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 12 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'],
21 ) 13 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-snmp-ctl'
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',
9 - '//protocols/snmp/api:onos-snmp-api', 4 + '//protocols/snmp/api:onos-protocols-snmp-api',
10 '//lib:org.apache.servicemix.bundles.snmp4j', 5 '//lib:org.apache.servicemix.bundles.snmp4j',
11 '//lib:snmp-core', 6 '//lib:snmp-core',
12 '//lib:bti7000', 7 '//lib:bti7000',
...@@ -14,22 +9,7 @@ COMPILE_DEPS = [ ...@@ -14,22 +9,7 @@ COMPILE_DEPS = [
14 '//lib:mibs-rfc', 9 '//lib:mibs-rfc',
15 ] 10 ]
16 11
17 -TEST_DEPS = [ 12 +osgi_jar_with_tests (
18 - '//lib:TEST',
19 -]
20 -
21 -osgi_jar(
22 - name = CURRENT_NAME,
23 - srcs = glob([SRC + '/*.java']),
24 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
25 - visibility = ['PUBLIC'],
26 ) 14 )
27 15
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 -)
......
1 BUNDLES = [ 1 BUNDLES = [
2 '//providers/bgp/cfg:onos-providers-bgp-cfg', 2 '//providers/bgp/cfg:onos-providers-bgp-cfg',
3 - '//providers/bgp/flow:onos-providers-bgp-flow', 3 + #'//providers/bgp/flow:onos-providers-bgp-flow',
4 '//providers/bgp/topology:onos-providers-bgp-topology', 4 '//providers/bgp/topology:onos-providers-bgp-topology',
5 - '//protocols/bgp/api:onos-bgp-api', 5 + '//protocols/bgp/api:onos-protocols-bgp-api',
6 - '//protocols/bgp/ctl:onos-bgp-ctl', 6 + '//protocols/bgp/ctl:onos-protocols-bgp-ctl',
7 - '//protocols/bgp/bgpio:onos-bgpio', 7 + '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
8 ] 8 ]
9 9
10 onos_app ( 10 onos_app (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/bgp/api:onos-bgp-api', 3 + '//protocols/bgp/api:onos-protocols-bgp-api',
4 ] 4 ]
5 5
6 osgi_jar_with_tests ( 6 osgi_jar_with_tests (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/bgp/api:onos-bgp-api', 3 + '//protocols/bgp/api:onos-protocols-bgp-api',
4 - '//protocols/bgp/bgpio:onos-bgpio', 4 + '//protocols/bgp/bgpio:onos-protocols-bgp-bgpio',
5 '//incubator/store:onos-incubator-store', 5 '//incubator/store:onos-incubator-store',
6 ] 6 ]
7 7
......
1 -SRC = 'src/main/java/org/onosproject/**/' 1 +# FIXME - BGCEP got moved
2 2
3 -CURRENT_NAME = 'onos-bgpcep-provider-flow' 3 +#SRC = 'src/main/java/org/onosproject/**/'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 4
6 -COMPILE_DEPS = [ 5 +#CURRENT_NAME = 'onos-bgpcep-provider-flow'
7 - '//lib:CORE_DEPS', 6 +#CURRENT_TARGET = ':' + CURRENT_NAME
8 - '//protocols/bgp/api:onos-bgp-api',
9 -]
10 7
11 -osgi_jar( 8 +#COMPILE_DEPS = [
12 - name = CURRENT_NAME, 9 +# '//lib:CORE_DEPS',
13 - srcs = glob([SRC + '/*.java']), 10 +# '//protocols/bgp/api:onos-bgp-api',
14 - deps = COMPILE_DEPS, 11 +#]
15 - visibility = ['PUBLIC'], 12 +
16 -) 13 +#osgi_jar(
14 +# name = CURRENT_NAME,
15 +# srcs = glob([SRC + '/*.java']),
16 +# deps = COMPILE_DEPS,
17 +# visibility = ['PUBLIC'],
18 +#)
......
1 +BUNDLES = [
2 + '//protocols/isis/api:onos-protocols-isis-api',
3 + '//protocols/isis/ctl:onos-protocols-isis-ctl',
4 + '//protocols/isis/isisio:onos-protocols-isis-isisio',
5 + '//providers/isis/cfg:onos-providers-isis-cfg',
6 + '//providers/isis/device:onos-providers-isis-device',
7 +]
8 +
9 +onos_app (
10 + title = 'ISIS Provider',
11 + category = 'Provider',
12 + url = 'http://onosproject.org',
13 + description = 'ONOS ISIS protocol adapters.',
14 + included_bundles = BUNDLES,
15 +)
16 +
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//protocols/isis/api:onos-protocols-isis-api',
4 +]
5 +
6 +osgi_jar_with_tests (
7 + deps = COMPILE_DEPS,
8 +)
9 +
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//protocols/isis/api:onos-protocols-isis-api',
4 +]
5 +
6 +osgi_jar_with_tests (
7 + deps = COMPILE_DEPS,
8 +)
9 +
1 BUNDLES = [ 1 BUNDLES = [
2 '//lib:openflowj', 2 '//lib:openflowj',
3 - '//protocols/openflow/api:onos-of-api', 3 + '//protocols/openflow/api:onos-protocols-openflow-api',
4 - '//protocols/openflow/ctl:onos-of-ctl', 4 + '//protocols/openflow/ctl:onos-protocols-openflow-ctl',
5 '//providers/openflow/device:onos-providers-openflow-device', 5 '//providers/openflow/device:onos-providers-openflow-device',
6 '//providers/openflow/packet:onos-providers-openflow-packet', 6 '//providers/openflow/packet:onos-providers-openflow-packet',
7 '//providers/openflow/flow:onos-providers-openflow-flow', 7 '//providers/openflow/flow:onos-providers-openflow-flow',
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 ] 5 ]
6 6
7 TEST_DEPS = [ 7 TEST_DEPS = [
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 ] 5 ]
6 6
7 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 '//providers/openflow/flow:onos-providers-openflow-flow', 5 '//providers/openflow/flow:onos-providers-openflow-flow',
6 ] 6 ]
7 7
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 '//apps/cpman/api:onos-apps-cpman-api', 5 '//apps/cpman/api:onos-apps-cpman-api',
6 ] 6 ]
7 7
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 ] 5 ]
6 6
7 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 '//lib:openflowj', 3 '//lib:openflowj',
4 - '//protocols/openflow/api:onos-of-api', 4 + '//protocols/openflow/api:onos-protocols-openflow-api',
5 ] 5 ]
6 6
7 osgi_jar_with_tests ( 7 osgi_jar_with_tests (
......
...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 6
7 COMPILE_DEPS = [ 7 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 8 '//lib:CORE_DEPS',
9 - '//protocols/ovsdb/api:onos-ovsdb-api', 9 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
10 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 10 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
11 ] 11 ]
12 12
13 TEST_DEPS = [ 13 TEST_DEPS = [
......
...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 6
7 COMPILE_DEPS = [ 7 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 8 '//lib:CORE_DEPS',
9 - '//protocols/ovsdb/api:onos-ovsdb-api', 9 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
10 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 10 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
11 ] 11 ]
12 12
13 TEST_DEPS = [ 13 TEST_DEPS = [
......
...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,8 +6,8 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 6
7 COMPILE_DEPS = [ 7 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 8 '//lib:CORE_DEPS',
9 - '//protocols/ovsdb/api:onos-ovsdb-api', 9 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
10 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 10 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
11 '//incubator/api:onos-incubator-api', 11 '//incubator/api:onos-incubator-api',
12 ] 12 ]
13 13
......
1 BUNDLES = [ 1 BUNDLES = [
2 '//providers/pcep/topology:onos-providers-pcep-topology', 2 '//providers/pcep/topology:onos-providers-pcep-topology',
3 '//providers/pcep/tunnel:onos-providers-pcep-tunnel', 3 '//providers/pcep/tunnel:onos-providers-pcep-tunnel',
4 - '//protocols/pcep/api:onos-pcep-controller-api', 4 + '//protocols/pcep/api:onos-protocols-pcep-api',
5 - '//protocols/pcep/pcepio:onos-pcep-pcepio', 5 + '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
6 ] 6 ]
7 7
8 onos_app ( 8 onos_app (
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/ovsdb/api:onos-ovsdb-api', 3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
5 '//apps/pcep-api:onos-apps-pcep-api', 5 '//apps/pcep-api:onos-apps-pcep-api',
6 ] 6 ]
7 7
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/ovsdb/api:onos-ovsdb-api', 3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
5 '//apps/pcep-api:onos-apps-pcep-api', 5 '//apps/pcep-api:onos-apps-pcep-api',
6 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
7 - '//protocols/pcep/pcepio:onos-pcep-pcepio', 7 + '//protocols/pcep/pcepio:onos-protocols-pcep-pcepio',
8 - '//protocols/pcep/api:onos-pcep-controller-api', 8 + '//protocols/pcep/api:onos-protocols-pcep-api',
9 ] 9 ]
10 10
11 TEST_DEPS = [ 11 TEST_DEPS = [
......
1 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
2 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
3 - '//protocols/ovsdb/api:onos-ovsdb-api', 3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 - '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 4 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
5 '//apps/pcep-api:onos-apps-pcep-api', 5 '//apps/pcep-api:onos-apps-pcep-api',
6 '//incubator/api:onos-incubator-api', 6 '//incubator/api:onos-incubator-api',
7 '//protocols/rest/api:onos-protocols-rest-api', 7 '//protocols/rest/api:onos-protocols-rest-api',
......
...@@ -6,8 +6,8 @@ COMPILE_DEPS = [ ...@@ -6,8 +6,8 @@ COMPILE_DEPS = [
6 '//lib:mibs-net-snmp', 6 '//lib:mibs-net-snmp',
7 '//lib:mibs-rfc', 7 '//lib:mibs-rfc',
8 '//incubator/api:onos-incubator-api', 8 '//incubator/api:onos-incubator-api',
9 - '//protocols/snmp/api:onos-snmp-api', 9 + '//protocols/snmp/api:onos-protocols-snmp-api',
10 - '//protocols/snmp/ctl:onos-snmp-ctl', 10 + '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
11 ] 11 ]
12 12
13 osgi_jar_with_tests ( 13 osgi_jar_with_tests (
......