홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
aeb00797 1 parent 3fe1ed5f

Refactoring of provider buck builds. 

Change-Id: I9b5e2566b83c13a8b7b086005a08a8182305ffdb
Inline Side-by-side
Showing 28 changed files with 187 additions and 378 deletions
...@@ -26,8 +26,8 @@ CORE = [ ...@@ -26,8 +26,8 @@ CORE = [
26 '//protocols/bgp/bgpio:onos-bgpio', 26 '//protocols/bgp/bgpio:onos-bgpio',
27 '//protocols/bgp/api:onos-bgp-api', 27 '//protocols/bgp/api:onos-bgp-api',
28 '//protocols/bgp/ctl:onos-bgp-ctl', 28 '//protocols/bgp/ctl:onos-bgp-ctl',
29 - '//protocols/netconf/api:onos-netconf-api', 29 + '//protocols/netconf/api:onos-protocols-netconf-api',
30 - '//protocols/netconf/ctl:onos-netconf-ctl', 30 + '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
31 '//protocols/openflow/api:onos-of-api', 31 '//protocols/openflow/api:onos-of-api',
32 '//protocols/openflow/ctl:onos-of-ctl', 32 '//protocols/openflow/ctl:onos-of-ctl',
33 '//protocols/ospf/api:onos-ospf-api', 33 '//protocols/ospf/api:onos-ospf-api',
...@@ -54,24 +54,13 @@ CORE = [ ...@@ -54,24 +54,13 @@ CORE = [
54 '//drivers/netconf:onos-drivers-netconf', 54 '//drivers/netconf:onos-drivers-netconf',
55 '//drivers/ovsdb:onos-drivers-ovsdb', 55 '//drivers/ovsdb:onos-drivers-ovsdb',
56 56
57 - '//providers/bgp/cfg:onos-bgp-provider-cfg', 57 + '//providers/netconf/device:onos-providers-netconf-device',
58 - '//providers/bgp/flow:onos-bgp-provider-flow', 58 + '//providers/openflow/device:onos-providers-openflow-device',
59 - '//providers/bgp/topology:onos-bgp-provider-topology', 59 + '//providers/openflow/packet:onos-providers-openflow-packet',
60 - '//providers/host:onos-host-provider', 60 + '//providers/openflow/flow:onos-providers-openflow-flow',
61 - '//providers/lldpcommon:onos-lldp-provider-common', 61 + '//providers/openflow/group:onos-providers-openflow-group',
62 - '//providers/netcfglinks:onos-netcfg-links-provider', 62 + '//providers/openflow/meter:onos-providers-openflow-meter',
63 - '//providers/lldp:onos-lldp-provider',
64 - '//providers/netconf/device:onos-netconf-provider-device',
65 - '//providers/netcfghost:onos-netcfg-links-provider',
66 - '//providers/null:onos-null-providers',
67 - '//providers/openflow/device:onos-of-provider-device',
68 - '//providers/openflow/flow:onos-of-provider-flow',
69 - '//providers/openflow/group:onos-of-provider-group',
70 - '//providers/openflow/message:onos-of-provider-message',
71 - '//providers/openflow/meter:onos-of-provider-meter',
72 - '//providers/openflow/packet:onos-of-provider-packet',
73 '//providers/ovsdb/device:onos-ovsdb-provider-device', 63 '//providers/ovsdb/device:onos-ovsdb-provider-device',
74 - '//providers/ovsdb/host:onos-ovsdb-provider-host',
75 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', 64 '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
76 '//providers/rest/device:onos-restsb-provider-device', 65 '//providers/rest/device:onos-restsb-provider-device',
77 '//providers/snmp/device:onos-snmp-provider-device', 66 '//providers/snmp/device:onos-snmp-provider-device',
...@@ -81,8 +70,20 @@ CORE = [ ...@@ -81,8 +70,20 @@ CORE = [
81 ] 70 ]
82 71
83 APPS = [ 72 APPS = [
84 - '//providers/pcep:onos-providers-pcep-oar', 73 + # Providers
74 + '//providers/bgp:onos-providers-bgp-oar',
75 + '//providers/host:onos-providers-host-oar',
76 + '//providers/lldp:onos-providers-lldp-oar',
77 + '//providers/netcfghost:onos-providers-netcfghost-oar',
78 + '//providers/netcfglinks:onos-providers-netcfglinks-oar',
79 + '//providers/netconf:onos-providers-netconf-oar',
80 + '//providers/openflow/message:onos-providers-openflow-message-oar',
85 '//providers/ovsdb:onos-providers-ovsdb-oar', 81 '//providers/ovsdb:onos-providers-ovsdb-oar',
82 + '//providers/pcep:onos-providers-pcep-oar',
83 + '//providers/null:onos-providers-null-oar',
84 + '//providers/openflow/base:onos-providers-openflow-base-oar',
85 +
86 + # Apps
86 '//apps/dhcp:onos-apps-dhcp-oar', 87 '//apps/dhcp:onos-apps-dhcp-oar',
87 '//apps/fwd:onos-apps-fwd-oar', 88 '//apps/fwd:onos-apps-fwd-oar',
88 '//apps/aaa:onos-apps-aaa-oar', 89 '//apps/aaa:onos-apps-aaa-oar',
...@@ -117,11 +118,11 @@ APPS = [ ...@@ -117,11 +118,11 @@ APPS = [
117 '//apps/vtn:onos-apps-vtn-oar', 118 '//apps/vtn:onos-apps-vtn-oar',
118 '//apps/faultmanagement:onos-apps-faultmanagement-oar', 119 '//apps/faultmanagement:onos-apps-faultmanagement-oar',
119 '//apps/openstacknode:onos-apps-openstacknode-oar', 120 '//apps/openstacknode:onos-apps-openstacknode-oar',
121 + '//apps/cpman/app:onos-apps-cpman-app-oar',
120 ] 122 ]
121 123
122 APP_JARS = [ 124 APP_JARS = [
123 - '//apps/cpman/api:onos-app-cpman-api', 125 + '//apps/cpman/api:onos-apps-cpman-api',
124 - '//apps/cpman/app:onos-app-cpman-app',
125 '//apps/routing-api:onos-apps-routing-api', 126 '//apps/routing-api:onos-apps-routing-api',
126 '//apps/cip:onos-app-cip', 127 '//apps/cip:onos-app-cip',
127 '//apps/dhcp/api:onos-apps-dhcp-api', 128 '//apps/dhcp/api:onos-apps-dhcp-api',
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-app-cpman-api'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//core/store/serializers:onos-core-serializers', 3 '//core/store/serializers:onos-core-serializers',
...@@ -13,18 +7,8 @@ TEST_DEPS = [ ...@@ -13,18 +7,8 @@ TEST_DEPS = [
13 '//lib:TEST_ADAPTERS', 7 '//lib:TEST_ADAPTERS',
14 ] 8 ]
15 9
16 -java_library( 10 +osgi_jar_with_tests (
17 - name = CURRENT_NAME,
18 - srcs = glob([SRC + '/*.java']),
19 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'], 12 + test_deps = TEST_DEPS,
21 ) 13 )
22 14
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 -
4 -CURRENT_NAME = 'onos-app-cpman-app'
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 '//lib:javax.ws.rs-api', 4 '//lib:javax.ws.rs-api',
11 '//lib:rrd4j', 5 '//lib:rrd4j',
12 - '//apps/cpman/api:onos-app-cpman-api', 6 + '//apps/cpman/api:onos-apps-cpman-api',
13 '//utils/rest:onlab-rest', 7 '//utils/rest:onlab-rest',
14 '//cli:onos-cli', 8 '//cli:onos-cli',
15 '//core/store/serializers:onos-core-serializers', 9 '//core/store/serializers:onos-core-serializers',
...@@ -20,20 +14,24 @@ TEST_DEPS = [ ...@@ -20,20 +14,24 @@ TEST_DEPS = [
20 '//web/api:onos-rest-tests', 14 '//web/api:onos-rest-tests',
21 ] 15 ]
22 16
23 -java_library( 17 +BUNDLES = [
24 - name = CURRENT_NAME, 18 + '//apps/cpman/api:onos-apps-cpman-api',
25 - srcs = glob([SRC + '/*.java']), 19 +]
20 +
21 +EXCLUDED_BUNDLES = [
22 + '//lib:rrd4j', # FIXME - needs wrap
23 +]
24 +
25 +osgi_jar_with_tests (
26 deps = COMPILE_DEPS, 26 deps = COMPILE_DEPS,
27 - visibility = ['PUBLIC'], 27 + test_deps = TEST_DEPS,
28 ) 28 )
29 29
30 -java_test( 30 +onos_app (
31 - name = 'tests', 31 + title = 'Control Plane Manager REST API',
32 - srcs = glob([TEST + '/*.java']), 32 + category = 'Provider',
33 - deps = COMPILE_DEPS + 33 + url = 'http://onosproject.org',
34 - TEST_DEPS + 34 + description = 'APIs for interacting with the Control Plane Management application.',
35 - [CURRENT_TARGET], 35 + included_bundles = BUNDLES,
36 - source_under_test = [CURRENT_TARGET], 36 + excluded_bundles = EXCLUDED_BUNDLES,
37 - resources_root = 'src/test/resources',
38 - resources = glob(['src/test/resources/**']),
39 ) 37 )
......
...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 COMPILE_DEPS = [ 6 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 7 '//lib:CORE_DEPS',
8 '//drivers/utilities:onos-drivers-utilities', 8 '//drivers/utilities:onos-drivers-utilities',
9 - '//protocols/netconf/api:onos-netconf-api', 9 + '//protocols/netconf/api:onos-protocols-netconf-api',
10 ] 10 ]
11 11
12 osgi_jar( 12 osgi_jar(
......
...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 COMPILE_DEPS = [ 6 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 7 '//lib:CORE_DEPS',
8 '//drivers/utilities:onos-drivers-utilities', 8 '//drivers/utilities:onos-drivers-utilities',
9 - '//protocols/netconf/api:onos-netconf-api', 9 + '//protocols/netconf/api:onos-protocols-netconf-api',
10 ] 10 ]
11 11
12 osgi_jar( 12 osgi_jar(
......
...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME ...@@ -6,7 +6,7 @@ CURRENT_TARGET = ':' + CURRENT_NAME
6 COMPILE_DEPS = [ 6 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 7 '//lib:CORE_DEPS',
8 '//drivers/utilities:onos-drivers-utilities', 8 '//drivers/utilities:onos-drivers-utilities',
9 - '//protocols/netconf/api:onos-netconf-api', 9 + '//protocols/netconf/api:onos-protocols-netconf-api',
10 ] 10 ]
11 11
12 osgi_jar( 12 osgi_jar(
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-netconf-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 osgi_jar( 5 osgi_jar(
11 - name = CURRENT_NAME,
12 - srcs = glob([SRC + '/*.java']),
13 deps = COMPILE_DEPS, 6 deps = COMPILE_DEPS,
14 - visibility = ['PUBLIC'],
15 ) 7 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -CURRENT_NAME = 'onos-netconf-ctl'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//lib:ganymed-ssh2', 3 '//lib:ganymed-ssh2',
9 - '//protocols/netconf/api:onos-netconf-api' 4 + '//protocols/netconf/api:onos-protocols-netconf-api'
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 +BUNDLES = [
2 + '//providers/bgp/cfg:onos-providers-bgp-cfg',
3 + '//providers/bgp/flow:onos-providers-bgp-flow',
4 + '//providers/bgp/topology:onos-providers-bgp-topology',
5 + '//protocols/bgp/api:onos-bgp-api',
6 + '//protocols/bgp/ctl:onos-bgp-ctl',
7 + '//protocols/bgp/bgpio:onos-bgpio',
8 +]
9 +
10 +onos_app (
11 + title = 'BGP Provider',
12 + category = 'Provider',
13 + url = 'http://onosproject.org',
14 + included_bundles = BUNDLES,
15 + description = 'BGP protocol southbound providers.',
16 +)
17 +
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-bgp-provider-cfg'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//protocols/bgp/api:onos-bgp-api', 3 '//protocols/bgp/api:onos-bgp-api',
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 -
3 -CURRENT_NAME = 'onos-bgp-provider-flow'
4 -CURRENT_TARGET = ':' + CURRENT_NAME
5 -
6 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
7 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
8 '//protocols/bgp/api:onos-bgp-api', 3 '//protocols/bgp/api:onos-bgp-api',
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 -
4 -CURRENT_NAME = 'onos-bgp-provider-topology'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/bgp/api:onos-bgp-api', 3 '//protocols/bgp/api:onos-bgp-api',
...@@ -15,18 +9,7 @@ TEST_DEPS = [ ...@@ -15,18 +9,7 @@ TEST_DEPS = [
15 '//lib:TEST_ADAPTERS', 9 '//lib:TEST_ADAPTERS',
16 ] 10 ]
17 11
18 -osgi_jar( 12 +osgi_jar_with_tests (
19 - name = CURRENT_NAME,
20 - srcs = glob([SRC + '/*.java']),
21 deps = COMPILE_DEPS, 13 deps = COMPILE_DEPS,
22 - visibility = ['PUBLIC'], 14 + test_deps = TEST_DEPS,
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 ) 15 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-host-provider'
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 -osgi_jar( 5 +TEST_DEPS = [
11 - name = CURRENT_NAME, 6 + '//lib:TEST_ADAPTERS',
12 - srcs = glob([SRC + '/*.java']), 7 + '//utils/osgi:onlab-osgi-tests',
8 +]
9 +
10 +osgi_jar_with_tests (
13 deps = COMPILE_DEPS, 11 deps = COMPILE_DEPS,
14 - visibility = ['PUBLIC'], 12 + test_deps = TEST_DEPS,
13 +)
14 +
15 +onos_app (
16 + title = 'Host Location Provider',
17 + category = 'Provider',
18 + url = 'http://onosproject.org',
19 + description = 'ONOS host location provider.',
15 ) 20 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-lldp-provider'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 - '//providers/lldpcommon:onos-lldp-provider-common', 3 + '//providers/lldpcommon:onos-providers-lldpcommon',
10 ] 4 ]
11 5
12 TEST_DEPS = [ 6 TEST_DEPS = [
13 '//lib:TEST_ADAPTERS', 7 '//lib:TEST_ADAPTERS',
14 ] 8 ]
15 9
16 -osgi_jar( 10 +BUNDLES = [
17 - name = CURRENT_NAME, 11 + '//providers/lldpcommon:onos-providers-lldpcommon',
18 - srcs = glob([SRC + '/*.java']), 12 + '//providers/lldp:onos-providers-lldp',
13 +]
14 +
15 +osgi_jar_with_tests (
19 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'], 17 + test_deps = TEST_DEPS,
21 ) 18 )
22 19
23 -java_test( 20 +onos_app (
24 - name = 'tests', 21 + title = 'LLDP Link Provider',
25 - srcs = glob([TEST + '/*.java']), 22 + category = 'Provider',
26 - deps = COMPILE_DEPS + 23 + url = 'http://onosproject.org',
27 - TEST_DEPS + 24 + description = 'ONOS LLDP Link provider.',
28 - [CURRENT_TARGET], 25 + included_bundles = BUNDLES,
29 - source_under_test = [CURRENT_TARGET],
30 ) 26 )
27 +
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-lldp-provider-common'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 ] 3 ]
...@@ -12,18 +6,8 @@ TEST_DEPS = [ ...@@ -12,18 +6,8 @@ TEST_DEPS = [
12 '//lib:TEST', 6 '//lib:TEST',
13 ] 7 ]
14 8
15 -osgi_jar( 9 +osgi_jar_with_tests (
16 - name = CURRENT_NAME,
17 - srcs = glob([SRC + '/*.java']),
18 deps = COMPILE_DEPS, 10 deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'], 11 + test_deps = TEST_DEPS,
20 ) 12 )
21 13
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-netcfg-links-provider'
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 -osgi_jar(
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 = 'Network Config Host Provider',
24 - srcs = glob([TEST + '/*.java']), 11 + category = 'Provider',
25 - deps = COMPILE_DEPS + 12 + url = 'http://onosproject.org',
26 - TEST_DEPS + 13 + description = 'Host provider that uses network config service to discover hosts.',
27 - [CURRENT_TARGET],
28 - source_under_test = [CURRENT_TARGET],
29 ) 14 )
15 +
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-netcfg-links-provider'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 - '//providers/lldpcommon:onos-lldp-provider-common', 3 + '//providers/lldpcommon:onos-providers-lldpcommon',
10 ] 4 ]
11 5
12 TEST_DEPS = [ 6 TEST_DEPS = [
13 '//lib:TEST_ADAPTERS', 7 '//lib:TEST_ADAPTERS',
14 ] 8 ]
15 9
16 -osgi_jar( 10 +BUNDLES = [
17 - name = CURRENT_NAME, 11 + '//providers/lldpcommon:onos-providers-lldpcommon',
18 - srcs = glob([SRC + '/*.java']), 12 + '//providers/netcfglinks:onos-providers-netcfglinks',
13 +]
14 +
15 +osgi_jar_with_tests (
19 deps = COMPILE_DEPS, 16 deps = COMPILE_DEPS,
20 - visibility = ['PUBLIC'], 17 + test_deps = TEST_DEPS,
21 ) 18 )
22 19
23 -java_test( 20 +onos_app (
24 - name = 'tests', 21 + title = 'Network Config Link Provider',
25 - srcs = glob([TEST + '/*.java']), 22 + category = 'Provider',
26 - deps = COMPILE_DEPS + 23 + url = 'http://onosproject.org',
27 - TEST_DEPS + 24 + description = 'Links provider that uses network config service to predefine devices and links.',
28 - [CURRENT_TARGET], 25 + included_bundles = BUNDLES,
29 - source_under_test = [CURRENT_TARGET],
30 ) 26 )
......
1 +BUNDLES = [
2 + '//providers/netconf/device:onos-providers-netconf-device',
3 + '//protocols/netconf/api:onos-protocols-netconf-api',
4 + '//protocols/netconf/ctl:onos-protocols-netconf-ctl',
5 +]
6 +
7 +EXCLUDED_BUNDLES = [
8 + '//lib:ganymed-ssh2', # FIXME - Needs wrap
9 +]
10 +
11 +onos_app (
12 + title = 'NETCONF Provider',
13 + category = 'Provider',
14 + url = 'http://onosproject.org',
15 + included_bundles = BUNDLES,
16 + excluded_bundles = EXCLUDED_BUNDLES,
17 + description = 'NETCONF protocol southbound providers.',
18 +)
19 +
20 +
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -
3 -CURRENT_NAME = 'onos-netconf-provider-device'
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/netconf/api:onos-netconf-api', 4 + '//protocols/netconf/api:onos-protocols-netconf-api',
10 ] 5 ]
11 6
12 osgi_jar( 7 osgi_jar(
13 - name = CURRENT_NAME,
14 - srcs = glob([SRC + '/*.java']),
15 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
16 - visibility = ['PUBLIC'],
17 ) 9 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-null-providers'
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 -osgi_jar(
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'], 9 + resources_root = 'src/main/resources',
10 + resources = glob(['src/main/resources/**']),
11 + import_packages = '*,org.onosproject.cli.net',
22 ) 12 )
23 13
24 -java_test( 14 +onos_app (
25 - name = 'tests', 15 + title = 'Null Southbound Provider',
26 - srcs = glob([TEST + '/*.java']), 16 + category = 'Provider',
27 - deps = COMPILE_DEPS + 17 + url = 'http://onosproject.org',
28 - TEST_DEPS + 18 + description = 'ONOS null southbound provider.',
29 - [CURRENT_TARGET],
30 - source_under_test = [CURRENT_TARGET],
31 ) 19 )
......
1 +BUNDLES = [
2 + '//lib:openflowj',
3 + '//protocols/openflow/api:onos-of-api',
4 + '//protocols/openflow/ctl:onos-of-ctl',
5 + '//providers/openflow/device:onos-providers-openflow-device',
6 + '//providers/openflow/packet:onos-providers-openflow-packet',
7 + '//providers/openflow/flow:onos-providers-openflow-flow',
8 + '//providers/openflow/group:onos-providers-openflow-group',
9 + '//providers/openflow/meter:onos-providers-openflow-meter',
10 +]
11 +
12 +onos_app (
13 + title = 'OpenFlow Provider',
14 + category = 'Provider',
15 + url = 'http://onosproject.org',
16 + description = 'OpenFlow protocol southbound providers.',
17 + included_bundles = BUNDLES,
18 +)
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-of-provider-device'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
...@@ -14,18 +8,7 @@ TEST_DEPS = [ ...@@ -14,18 +8,7 @@ TEST_DEPS = [
14 '//lib:TEST_ADAPTERS', 8 '//lib:TEST_ADAPTERS',
15 ] 9 ]
16 10
17 -osgi_jar( 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 -)
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 ) 14 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-of-provider-flow'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
10 '//protocols/openflow/api:onos-of-api', 4 '//protocols/openflow/api:onos-of-api',
11 ] 5 ]
12 6
13 -TEST_DEPS = [ 7 +osgi_jar_with_tests (
14 - '//lib:TEST',
15 -]
16 -
17 -osgi_jar(
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(
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 -)
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-of-provider-group'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
10 '//protocols/openflow/api:onos-of-api', 4 '//protocols/openflow/api:onos-of-api',
11 - '//providers/openflow/flow:onos-of-provider-flow', 5 + '//providers/openflow/flow:onos-providers-openflow-flow',
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-of-provider-message'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
10 '//protocols/openflow/api:onos-of-api', 4 '//protocols/openflow/api:onos-of-api',
11 - '//apps/cpman/api:onos-app-cpman-api', 5 + '//apps/cpman/api:onos-apps-cpman-api',
12 ] 6 ]
13 7
14 -TEST_DEPS = [ 8 +BUNDLES = [
15 - '//lib:TEST', 9 + '//apps/cpman/api:onos-apps-cpman-api',
10 + ':onos-providers-openflow-message',
16 ] 11 ]
17 12
18 -osgi_jar( 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 = 'Control Message Stats Provider',
27 - srcs = glob([TEST + '/*.java']), 19 + category = 'Provider',
28 - deps = COMPILE_DEPS + 20 + url = 'http://onosproject.org',
29 - TEST_DEPS + 21 + description = 'ONOS OpenFlow control message provider.',
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-of-provider-meter'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
10 '//protocols/openflow/api:onos-of-api', 4 '//protocols/openflow/api:onos-of-api',
11 ] 5 ]
12 6
13 -TEST_DEPS = [ 7 +osgi_jar_with_tests (
14 - '//lib:TEST',
15 -]
16 -
17 -osgi_jar(
18 - name = CURRENT_NAME,
19 - srcs = glob([SRC + '/*.java']),
20 deps = COMPILE_DEPS, 8 deps = COMPILE_DEPS,
21 - visibility = ['PUBLIC'],
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 ) 9 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-of-provider-packet'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//lib:openflowj', 3 '//lib:openflowj',
10 '//protocols/openflow/api:onos-of-api', 4 '//protocols/openflow/api:onos-of-api',
11 ] 5 ]
12 6
13 -TEST_DEPS = [ 7 +osgi_jar_with_tests (
14 - '//lib:TEST',
15 -]
16 -
17 -osgi_jar(
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(
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 -)
......
...@@ -5,10 +5,6 @@ BUNDLES = [ ...@@ -5,10 +5,6 @@ BUNDLES = [
5 '//protocols/pcep/pcepio:onos-pcep-pcepio', 5 '//protocols/pcep/pcepio:onos-pcep-pcepio',
6 ] 6 ]
7 7
8 -COMPILE_DEPS = [
9 - '//lib:CORE_DEPS',
10 -]
11 -
12 onos_app ( 8 onos_app (
13 title = 'PCEP Provider', 9 title = 'PCEP Provider',
14 category = 'Provider', 10 category = 'Provider',
......