홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
bbac3549 1 parent 9818919b

Fixing drivers & providers Buck app builds 

Change-Id: I6a02a68568037eca0a0b82ad4f83ff18bfeada5f
Inline Side-by-side
Showing 13 changed files with 60 additions and 13 deletions
...@@ -12,6 +12,11 @@ TEST_DEPS = [ ...@@ -12,6 +12,11 @@ TEST_DEPS = [
12 '//core/api:onos-api-tests', 12 '//core/api:onos-api-tests',
13 ] 13 ]
14 14
15 +BUNDLES = [
16 + ':onos-drivers-arista',
17 + '//drivers/utilities:onos-drivers-utilities',
18 +]
19 +
15 osgi_jar_with_tests ( 20 osgi_jar_with_tests (
16 deps = COMPILE_DEPS, 21 deps = COMPILE_DEPS,
17 test_deps = TEST_DEPS, 22 test_deps = TEST_DEPS,
...@@ -20,9 +25,11 @@ osgi_jar_with_tests ( ...@@ -20,9 +25,11 @@ osgi_jar_with_tests (
20 ) 25 )
21 26
22 onos_app ( 27 onos_app (
28 + app_name = 'org.onosproject.drivers.arista',
23 title = 'Arista Device Drivers', 29 title = 'Arista Device Drivers',
24 category = 'Drivers', 30 category = 'Drivers',
25 url = 'http://onosproject.org', 31 url = 'http://onosproject.org',
26 description = 'ONOS Arista Device Drivers application.', 32 description = 'ONOS Arista Device Drivers application.',
33 + included_bundles = BUNDLES,
27 required_apps = [ 'org.onosproject.restsb' ], 34 required_apps = [ 'org.onosproject.restsb' ],
28 -)
...\ No newline at end of file ...\ No newline at end of file
35 +)
......
...@@ -21,6 +21,7 @@ osgi_jar_with_tests ( ...@@ -21,6 +21,7 @@ osgi_jar_with_tests (
21 ) 21 )
22 22
23 onos_app ( 23 onos_app (
24 + app_name = 'org.onosproject.drivers.bti',
24 title = 'Bti Device Drivers', 25 title = 'Bti Device Drivers',
25 category = 'Drivers', 26 category = 'Drivers',
26 url = 'http://onosproject.org', 27 url = 'http://onosproject.org',
......
...@@ -11,6 +11,11 @@ TEST_DEPS = [ ...@@ -11,6 +11,11 @@ TEST_DEPS = [
11 '//core/api:onos-api-tests', 11 '//core/api:onos-api-tests',
12 ] 12 ]
13 13
14 +BUNDLES = [
15 + ':onos-drivers-ciena',
16 + '//drivers/utilities:onos-drivers-utilities',
17 +]
18 +
14 osgi_jar_with_tests ( 19 osgi_jar_with_tests (
15 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
16 test_deps = TEST_DEPS, 21 test_deps = TEST_DEPS,
...@@ -19,9 +24,11 @@ osgi_jar_with_tests ( ...@@ -19,9 +24,11 @@ osgi_jar_with_tests (
19 ) 24 )
20 25
21 onos_app ( 26 onos_app (
27 + app_name = 'org.onosproject.drivers.ciena',
22 title = 'Ciena Device Drivers', 28 title = 'Ciena Device Drivers',
23 category = 'Drivers', 29 category = 'Drivers',
24 url = 'http://onosproject.org', 30 url = 'http://onosproject.org',
25 description = 'ONOS Ciena Device Drivers application.', 31 description = 'ONOS Ciena Device Drivers application.',
32 + included_bundles = BUNDLES,
26 required_apps = [ 'org.onosproject.restsb' ], 33 required_apps = [ 'org.onosproject.restsb' ],
27 ) 34 )
......
...@@ -9,6 +9,11 @@ TEST_DEPS = [ ...@@ -9,6 +9,11 @@ TEST_DEPS = [
9 '//core/api:onos-api-tests', 9 '//core/api:onos-api-tests',
10 ] 10 ]
11 11
12 +BUNDLES = [
13 + ':onos-drivers-cisco',
14 + '//drivers/utilities:onos-drivers-utilities',
15 +]
16 +
12 osgi_jar_with_tests ( 17 osgi_jar_with_tests (
13 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
14 test_deps = TEST_DEPS, 19 test_deps = TEST_DEPS,
...@@ -17,9 +22,11 @@ osgi_jar_with_tests ( ...@@ -17,9 +22,11 @@ osgi_jar_with_tests (
17 ) 22 )
18 23
19 onos_app ( 24 onos_app (
25 + app_name = 'org.onosproject.drivers.cisco',
20 title = 'Cisco device drivers', 26 title = 'Cisco device drivers',
21 category = 'Drivers', 27 category = 'Drivers',
22 url = 'http://onosproject.org', 28 url = 'http://onosproject.org',
23 description = 'ONOS Cisco device drivers application.', 29 description = 'ONOS Cisco device drivers application.',
24 - required_apps = [ 'org.onosproject.netconf' ], 30 + included_bundles = BUNDLES,
31 + required_apps = [ 'org.onosproject.netconf', 'org.onosproject.drivers.netconf' ],
25 ) 32 )
......
...@@ -11,6 +11,11 @@ TEST_DEPS = [ ...@@ -11,6 +11,11 @@ TEST_DEPS = [
11 '//core/api:onos-api-tests', 11 '//core/api:onos-api-tests',
12 ] 12 ]
13 13
14 +BUNDLES = [
15 + ':onos-drivers-fujitsu',
16 + '//drivers/utilities:onos-drivers-utilities',
17 +]
18 +
14 osgi_jar_with_tests ( 19 osgi_jar_with_tests (
15 deps = COMPILE_DEPS, 20 deps = COMPILE_DEPS,
16 test_deps = TEST_DEPS, 21 test_deps = TEST_DEPS,
...@@ -19,9 +24,11 @@ osgi_jar_with_tests ( ...@@ -19,9 +24,11 @@ osgi_jar_with_tests (
19 ) 24 )
20 25
21 onos_app ( 26 onos_app (
27 + app_name = 'org.onosproject.drivers.fujitsu',
22 title = 'Fujitsu device drivers', 28 title = 'Fujitsu device drivers',
23 category = 'Drivers', 29 category = 'Drivers',
24 url = 'http://onosproject.org', 30 url = 'http://onosproject.org',
25 description = 'ONOS Fujitsu device drivers application.', 31 description = 'ONOS Fujitsu device drivers application.',
32 + included_bundles = BUNDLES,
26 required_apps = [ 'org.onosproject.netconf' ], 33 required_apps = [ 'org.onosproject.netconf' ],
27 ) 34 )
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
17 package org.onosproject.drivers.fujitsu; 17 package org.onosproject.drivers.fujitsu;
18 18
19 import org.apache.felix.scr.annotations.Component; 19 import org.apache.felix.scr.annotations.Component;
20 +import org.onosproject.cli.net.DeviceIdCompleter;
20 import org.onosproject.net.driver.AbstractDriverLoader; 21 import org.onosproject.net.driver.AbstractDriverLoader;
21 import org.onosproject.net.optical.OpticalDevice; 22 import org.onosproject.net.optical.OpticalDevice;
22 23
...@@ -29,6 +30,8 @@ public class FujitsuDriversLoader extends AbstractDriverLoader { ...@@ -29,6 +30,8 @@ public class FujitsuDriversLoader extends AbstractDriverLoader {
29 // OSGI: help bundle plugin discover runtime package dependency. 30 // OSGI: help bundle plugin discover runtime package dependency.
30 @SuppressWarnings("unused") 31 @SuppressWarnings("unused")
31 private OpticalDevice optical; 32 private OpticalDevice optical;
33 + @SuppressWarnings("unused")
34 + private DeviceIdCompleter deviceIdCompleter;
32 35
33 public FujitsuDriversLoader() { 36 public FujitsuDriversLoader() {
34 super("/fujitsu-drivers.xml"); 37 super("/fujitsu-drivers.xml");
......
...@@ -19,6 +19,7 @@ osgi_jar_with_tests ( ...@@ -19,6 +19,7 @@ osgi_jar_with_tests (
19 ) 19 )
20 20
21 onos_app ( 21 onos_app (
22 + app_name = 'org.onosproject.drivers.lumentum',
22 title = 'Lumentum Device Drivers', 23 title = 'Lumentum Device Drivers',
23 category = 'Drivers', 24 category = 'Drivers',
24 url = 'http://onosproject.org', 25 url = 'http://onosproject.org',
......
...@@ -9,6 +9,11 @@ TEST_DEPS = [ ...@@ -9,6 +9,11 @@ TEST_DEPS = [
9 '//core/api:onos-api-tests', 9 '//core/api:onos-api-tests',
10 ] 10 ]
11 11
12 +BUNDLES = [
13 + ':onos-drivers-netconf',
14 + '//drivers/utilities:onos-drivers-utilities',
15 +]
16 +
12 osgi_jar_with_tests ( 17 osgi_jar_with_tests (
13 deps = COMPILE_DEPS, 18 deps = COMPILE_DEPS,
14 test_deps = TEST_DEPS, 19 test_deps = TEST_DEPS,
...@@ -17,8 +22,11 @@ osgi_jar_with_tests ( ...@@ -17,8 +22,11 @@ osgi_jar_with_tests (
17 ) 22 )
18 23
19 onos_app ( 24 onos_app (
25 + app_name = 'org.onosproject.drivers.netconf',
20 title = 'NETCONF Device Drivers', 26 title = 'NETCONF Device Drivers',
21 category = 'Drivers', 27 category = 'Drivers',
22 url = 'http://onosproject.org', 28 url = 'http://onosproject.org',
23 description = 'ONOS NETCONF Device Drivers application.', 29 description = 'ONOS NETCONF Device Drivers application.',
30 + included_bundles = BUNDLES,
31 + required_apps = [ 'org.onosproject.netconf' ],
24 ) 32 )
......
...@@ -18,6 +18,7 @@ osgi_jar_with_tests ( ...@@ -18,6 +18,7 @@ osgi_jar_with_tests (
18 ) 18 )
19 19
20 onos_app ( 20 onos_app (
21 + app_name = 'org.onosproject.drivers.optical',
21 title = 'Other optical Device Drivers', 22 title = 'Other optical Device Drivers',
22 category = 'Drivers', 23 category = 'Drivers',
23 url = 'http://onosproject.org', 24 url = 'http://onosproject.org',
......
...@@ -23,4 +23,5 @@ onos_app ( ...@@ -23,4 +23,5 @@ onos_app (
23 category = 'Drivers', 23 category = 'Drivers',
24 url = 'http://onosproject.org', 24 url = 'http://onosproject.org',
25 description = 'ONOS OVSDB Device Drivers application.', 25 description = 'ONOS OVSDB Device Drivers application.',
26 + required_apps = [ 'org.onosproject.ovsdb' ],
26 ) 27 )
......
...@@ -46,16 +46,6 @@ CORE = [ ...@@ -46,16 +46,6 @@ CORE = [
46 '//protocols/isis/isisio:onos-protocols-isis-isisio', 46 '//protocols/isis/isisio:onos-protocols-isis-isisio',
47 47
48 '//drivers/utilities:onos-drivers-utilities', 48 '//drivers/utilities:onos-drivers-utilities',
49 - '//drivers/bti:onos-drivers-bti-oar',
50 - '//drivers/ciena:onos-drivers-ciena-oar',
51 - '//drivers/cisco:onos-drivers-cisco-oar',
52 - '//drivers/default:onos-drivers-default-oar',
53 - '//drivers/fujitsu:onos-drivers-fujitsu-oar',
54 - '//drivers/lumentum:onos-drivers-lumentum-oar',
55 - '//drivers/netconf:onos-drivers-netconf-oar',
56 - '//drivers/ovsdb:onos-drivers-ovsdb-oar',
57 - '//drivers/optical:onos-drivers-optical-oar',
58 - '//drivers/arista:onos-drivers-arista-oar',
59 49
60 '//providers/netconf/device:onos-providers-netconf-device', 50 '//providers/netconf/device:onos-providers-netconf-device',
61 '//providers/openflow/device:onos-providers-openflow-device', 51 '//providers/openflow/device:onos-providers-openflow-device',
...@@ -77,7 +67,15 @@ CORE = [ ...@@ -77,7 +67,15 @@ CORE = [
77 ONOS_DRIVERS = [ 67 ONOS_DRIVERS = [
78 # Drivers 68 # Drivers
79 '//drivers/default:onos-drivers-default-oar', 69 '//drivers/default:onos-drivers-default-oar',
70 + '//drivers/arista:onos-drivers-arista-oar',
71 + '//drivers/bti:onos-drivers-bti-oar',
72 + '//drivers/ciena:onos-drivers-ciena-oar',
73 + '//drivers/cisco:onos-drivers-cisco-oar',
80 '//drivers/corsa:onos-drivers-corsa-oar', 74 '//drivers/corsa:onos-drivers-corsa-oar',
75 + '//drivers/fujitsu:onos-drivers-fujitsu-oar',
76 + '//drivers/lumentum:onos-drivers-lumentum-oar',
77 + '//drivers/netconf:onos-drivers-netconf-oar',
78 + '//drivers/optical:onos-drivers-optical-oar',
81 '//drivers/ovsdb:onos-drivers-ovsdb-oar', 79 '//drivers/ovsdb:onos-drivers-ovsdb-oar',
82 ] 80 ]
83 81
......
...@@ -9,7 +9,8 @@ BUNDLES = [ ...@@ -9,7 +9,8 @@ BUNDLES = [
9 ] 9 ]
10 10
11 onos_app ( 11 onos_app (
12 - title = 'PCEP Provider', 12 + app_name = 'org.onosproject.restsb',
13 + title = 'REST Provider',
13 category = 'Provider', 14 category = 'Provider',
14 url = 'http://onosproject.org', 15 url = 'http://onosproject.org',
15 included_bundles = BUNDLES, 16 included_bundles = BUNDLES,
......
...@@ -2,9 +2,14 @@ BUNDLES = [ ...@@ -2,9 +2,14 @@ BUNDLES = [
2 '//providers/snmp/device:onos-providers-snmp-device', 2 '//providers/snmp/device:onos-providers-snmp-device',
3 '//protocols/snmp/api:onos-protocols-snmp-api', 3 '//protocols/snmp/api:onos-protocols-snmp-api',
4 '//protocols/snmp/ctl:onos-protocols-snmp-ctl', 4 '//protocols/snmp/ctl:onos-protocols-snmp-ctl',
5 + '//lib:org.apache.servicemix.bundles.snmp4j',
6 + '//lib:snmp-core',
7 + '//lib:bti7000',
8 + '//lib:mibs-net-snmp',
5 ] 9 ]
6 10
7 onos_app ( 11 onos_app (
12 + app_name = 'org.onosproject.snmp',
8 title = 'SNMP Provider', 13 title = 'SNMP Provider',
9 category = 'Provider', 14 category = 'Provider',
10 url = 'http://onosproject.org', 15 url = 'http://onosproject.org',
......