홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
43702bf4 1 parent a68e6f98

Fix up buck build for OVSDB apps 

Change-Id: I57b69574ad7989795ba81fbeecb7e084c3165203
Inline Side-by-side
Showing 7 changed files with 36 additions and 74 deletions
...@@ -61,8 +61,8 @@ CORE = [ ...@@ -61,8 +61,8 @@ CORE = [
61 '//providers/openflow/flow:onos-providers-openflow-flow', 61 '//providers/openflow/flow:onos-providers-openflow-flow',
62 '//providers/openflow/group:onos-providers-openflow-group', 62 '//providers/openflow/group:onos-providers-openflow-group',
63 '//providers/openflow/meter:onos-providers-openflow-meter', 63 '//providers/openflow/meter:onos-providers-openflow-meter',
64 - '//providers/ovsdb/device:onos-ovsdb-provider-device', 64 + '//providers/ovsdb/device:onos-providers-ovsdb-device',
65 - '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', 65 + '//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel',
66 '//providers/rest/device:onos-providers-rest-device', 66 '//providers/rest/device:onos-providers-rest-device',
67 '//providers/snmp/device:onos-providers-snmp-device', 67 '//providers/snmp/device:onos-providers-snmp-device',
68 '//providers/isis/cfg:onos-providers-isis-cfg', 68 '//providers/isis/cfg:onos-providers-isis-cfg',
...@@ -85,6 +85,8 @@ APPS = [ ...@@ -85,6 +85,8 @@ APPS = [
85 '//providers/netconf:onos-providers-netconf-oar', 85 '//providers/netconf:onos-providers-netconf-oar',
86 '//providers/openflow/message:onos-providers-openflow-message-oar', 86 '//providers/openflow/message:onos-providers-openflow-message-oar',
87 '//providers/ovsdb:onos-providers-ovsdb-oar', 87 '//providers/ovsdb:onos-providers-ovsdb-oar',
88 + '//providers/ovsdb/host:onos-providers-ovsdb-host-oar',
89 + '//providers/ovsdb/base:onos-providers-ovsdb-base-oar',
88 '//providers/pcep:onos-providers-pcep-oar', 90 '//providers/pcep:onos-providers-pcep-oar',
89 '//providers/null:onos-providers-null-oar', 91 '//providers/null:onos-providers-null-oar',
90 '//providers/openflow/base:onos-providers-openflow-base-oar', 92 '//providers/openflow/base:onos-providers-openflow-base-oar',
......
1 BUNDLES = [ 1 BUNDLES = [
2 - '//providers/ovsdb/device:onos-ovsdb-provider-device', 2 + '//providers/ovsdb/device:onos-providers-ovsdb-device',
3 - '//providers/ovsdb/host:onos-ovsdb-provider-host', 3 + '//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel',
4 - '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel',
5 ] 4 ]
6 5
7 APPS = [ 6 APPS = [
...@@ -11,9 +10,8 @@ APPS = [ ...@@ -11,9 +10,8 @@ APPS = [
11 10
12 onos_app ( 11 onos_app (
13 title = 'OVSDB Southbound Meta App', 12 title = 'OVSDB Southbound Meta App',
14 - description = 'ONOS fault management application', 13 + description = 'ONOS OVSDB southbound meta application',
15 category = 'Provider', 14 category = 'Provider',
16 - url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management',
17 included_bundles = BUNDLES, 15 included_bundles = BUNDLES,
18 required_apps = APPS, 16 required_apps = APPS,
19 ) 17 )
......
1 +BUNDLES = [
2 + '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
3 + '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
4 + '//protocols/ovsdb/ctl:onos-protocols-ovsdb-ctl',
5 +
6 + '//providers/ovsdb/tunnel:onos-providers-ovsdb-tunnel',
7 + '//providers/ovsdb/device:onos-providers-ovsdb-device',
8 +]
9 +
10 +onos_app (
11 + app_name = 'org.onosproject.ovsdb-base',
12 + title = 'OVSDB Provider',
13 + category = 'Provider',
14 + url = 'http://onosproject.org',
15 + description = 'ONOS OVSDB provider.',
16 + included_bundles = BUNDLES,
17 +)
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-ovsdb-provider-device'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-protocols-ovsdb-api', 3 '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
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-ovsdb-provider-host'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-protocols-ovsdb-api', 3 '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
10 '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc', 4 '//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
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( 11 +onos_app (
25 - name = 'tests', 12 + app_name = 'org.onosproject.ovsdbhostprovider',
26 - srcs = glob([TEST + '/*.java']), 13 + title = 'OVSDB host Provider',
27 - deps = COMPILE_DEPS + 14 + category = 'Provider',
28 - TEST_DEPS + 15 + url = 'http://onosproject.org',
29 - [CURRENT_TARGET], 16 + description = 'OVSDB Host provider.',
30 - source_under_test = [CURRENT_TARGET],
31 ) 17 )
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -CURRENT_NAME = 'onos-ovsdb-provider-tunnel'
5 -CURRENT_TARGET = ':' + CURRENT_NAME
6 -
7 COMPILE_DEPS = [ 1 COMPILE_DEPS = [
8 '//lib:CORE_DEPS', 2 '//lib:CORE_DEPS',
9 '//protocols/ovsdb/api:onos-protocols-ovsdb-api', 3 '//protocols/ovsdb/api:onos-protocols-ovsdb-api',
...@@ -11,22 +5,6 @@ COMPILE_DEPS = [ ...@@ -11,22 +5,6 @@ COMPILE_DEPS = [
11 '//incubator/api:onos-incubator-api', 5 '//incubator/api:onos-incubator-api',
12 ] 6 ]
13 7
14 -TEST_DEPS = [ 8 +osgi_jar_with_tests (
15 - '//lib:TEST',
16 -]
17 -
18 -osgi_jar(
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 )
......
...@@ -33,6 +33,8 @@ APPS = [ ...@@ -33,6 +33,8 @@ APPS = [
33 '//providers/openflow/app:onos-providers-openflow-app-oar', 33 '//providers/openflow/app:onos-providers-openflow-app-oar',
34 '//providers/rest:onos-providers-rest-oar', 34 '//providers/rest:onos-providers-rest-oar',
35 '//providers/isis:onos-providers-isis-oar', 35 '//providers/isis:onos-providers-isis-oar',
36 + '//providers/ovsdb/host:onos-providers-ovsdb-host-oar',
37 + '//providers/ovsdb/base:onos-providers-ovsdb-base-oar',
36 38
37 # Apps 39 # Apps
38 '//apps/dhcp:onos-apps-dhcp-oar', 40 '//apps/dhcp:onos-apps-dhcp-oar',
...@@ -103,4 +105,4 @@ genrule( ...@@ -103,4 +105,4 @@ genrule(
103 out = 'onos.tar.gz', 105 out = 'onos.tar.gz',
104 bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources), 106 bash = '$(exe //buck-tools:onos-stage) $OUT $(location :onos-karaf) ' + ' '.join(sources),
105 visibility = [ 'PUBLIC' ], 107 visibility = [ 'PUBLIC' ],
106 -)
...\ No newline at end of file ...\ No newline at end of file
108 +)
......