홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Ray Milkey
Committed by Gerrit Code Review
a5ff8a7e 1 parent 9970265c

Appify buck build for openstack and VTN apps 

Change-Id: I6cc23cd567954daaee59271123a07040853e695b
Inline Side-by-side
Showing 16 changed files with 187 additions and 232 deletions
...@@ -99,6 +99,9 @@ APPS = [ ...@@ -99,6 +99,9 @@ APPS = [
99 '//apps/mfwd:onos-apps-mfwd-oar', 99 '//apps/mfwd:onos-apps-mfwd-oar',
100 '//apps/mlb:onos-apps-mlb-oar', 100 '//apps/mlb:onos-apps-mlb-oar',
101 '//apps/openstackinterface:onos-apps-openstackinterface-oar', 101 '//apps/openstackinterface:onos-apps-openstackinterface-oar',
102 + '//apps/openstacknetworking:onos-apps-openstacknetworking-oar',
103 + '//apps/openstacknetworking/openstackrouting:onos-apps-openstacknetworking-openstackrouting-oar',
104 + '//apps/openstacknetworking/openstackswitching:onos-apps-openstacknetworking-openstackswitching-oar',
102 '//apps/mobility:onos-apps-mobility-oar', 105 '//apps/mobility:onos-apps-mobility-oar',
103 '//apps/optical:onos-apps-optical-oar', 106 '//apps/optical:onos-apps-optical-oar',
104 '//apps/pathpainter:onos-apps-pathpainter-oar', 107 '//apps/pathpainter:onos-apps-pathpainter-oar',
...@@ -110,6 +113,7 @@ APPS = [ ...@@ -110,6 +113,7 @@ APPS = [
110 '//apps/cordvtn:onos-apps-cordvtn-oar', 113 '//apps/cordvtn:onos-apps-cordvtn-oar',
111 '//apps/vpls:onos-apps-vpls-oar', 114 '//apps/vpls:onos-apps-vpls-oar',
112 '//apps/vrouter:onos-apps-vrouter-oar', 115 '//apps/vrouter:onos-apps-vrouter-oar',
116 + '//apps/vtn:onos-apps-vtn-oar',
113 ] 117 ]
114 118
115 APP_JARS = [ 119 APP_JARS = [
...@@ -126,12 +130,13 @@ APP_JARS = [ ...@@ -126,12 +130,13 @@ APP_JARS = [
126 '//apps/fwd:onos-apps-fwd', 130 '//apps/fwd:onos-apps-fwd',
127 '//apps/olt:onos-apps-olt-api', 131 '//apps/olt:onos-apps-olt-api',
128 '//apps/iptopology-api:onos-apps-iptopology-api', 132 '//apps/iptopology-api:onos-apps-iptopology-api',
129 - '//apps/openstackinterface:onos-apps-openstackinterface-api',
130 - '//apps/openstacknetworking:onos-app-openstacknetworking',
131 '//apps/openstacknode:onos-apps-openstacknode', 133 '//apps/openstacknode:onos-apps-openstacknode',
132 '//apps/routing:onos-apps-routing', 134 '//apps/routing:onos-apps-routing',
133 '//apps/test:onos-app-test', 135 '//apps/test:onos-app-test',
134 - '//apps/vtn:onos-app-vtn', 136 + '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
137 + '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
138 + '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
139 + '//apps/vtn/vtnweb:onos-apps-vtn-vtnweb',
135 ] 140 ]
136 141
137 java_library( 142 java_library(
......
...@@ -9,14 +9,14 @@ COMPILE_DEPS = [ ...@@ -9,14 +9,14 @@ COMPILE_DEPS = [
9 '//utils/rest:onlab-rest', 9 '//utils/rest:onlab-rest',
10 '//cli:onos-cli', 10 '//cli:onos-cli',
11 '//core/store/serializers:onos-core-serializers', 11 '//core/store/serializers:onos-core-serializers',
12 - '//apps/openstackinterface:onos-apps-openstackinterface-api', 12 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
13 '//apps/dhcp/api:onos-apps-dhcp-api', 13 '//apps/dhcp/api:onos-apps-dhcp-api',
14 '//protocols/ovsdb/api:onos-ovsdb-api', 14 '//protocols/ovsdb/api:onos-ovsdb-api',
15 '//protocols/ovsdb/rfc:onos-ovsdb-rfc', 15 '//protocols/ovsdb/rfc:onos-ovsdb-rfc',
16 ] 16 ]
17 17
18 BUNDLES = [ 18 BUNDLES = [
19 - '//apps/openstackinterface:onos-apps-openstackinterface-api', 19 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
20 '//apps/cordvtn:onos-apps-cordvtn', 20 '//apps/cordvtn:onos-apps-cordvtn',
21 ] 21 ]
22 22
......
...@@ -10,6 +10,7 @@ COMPILE_DEPS = [ ...@@ -10,6 +10,7 @@ COMPILE_DEPS = [
10 '//lib:javax.ws.rs-api', 10 '//lib:javax.ws.rs-api',
11 '//core/store/serializers:onos-core-serializers', 11 '//core/store/serializers:onos-core-serializers',
12 '//utils/osgi:onlab-osgi', 12 '//utils/osgi:onlab-osgi',
13 + '//core/store/serializers:onos-core-serializers',
13 ] 14 ]
14 15
15 TEST_DEPS = [ 16 TEST_DEPS = [
......
1 -SRC = 'src/main/java/org/onosproject/**/'
2 -TEST = 'src/test/java/org/onosproject/**/'
3 -
4 -COMPILE_DEPS = [
5 - '//lib:CORE_DEPS',
6 - '//lib:jersey-client',
7 - '//lib:javax.ws.rs-api',
8 -]
9 -
10 BUNDLES = [ 1 BUNDLES = [
11 - '//apps/openstackinterface:onos-apps-openstackinterface-api', 2 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
12 - # TODO - this doesn't actually work now, have to refactor the BUCK files into each sub directory 3 + '//apps/openstackinterface/app:onos-apps-openstackinterface-app',
13 ] 4 ]
14 5
15 -osgi_jar_with_tests (
16 - name = 'onos-apps-openstackinterface-api',
17 - srcs = glob(['api/' + SRC + '*.java']),
18 - deps = COMPILE_DEPS,
19 - visibility = ['PUBLIC'],
20 -)
21 -
22 -osgi_jar_with_tests (
23 - deps = COMPILE_DEPS,
24 -)
25 -
26 onos_app ( 6 onos_app (
27 - title = 'Authentication App', 7 + title = 'OpenStack Interface App',
28 - category = 'Security', 8 + category = 'Utility',
29 url = 'http://onosproject.org', 9 url = 'http://onosproject.org',
30 - description = 'ONOS authentication application.', 10 + description = 'Openstack Interface Application.',
31 included_bundles = BUNDLES, 11 included_bundles = BUNDLES,
32 ) 12 )
......
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:jersey-client',
4 + '//lib:javax.ws.rs-api',
5 +]
6 +
7 +osgi_jar_with_tests (
8 + deps = COMPILE_DEPS,
9 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:jersey-client',
4 + '//lib:javax.ws.rs-api',
5 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
6 +]
7 +
8 +osgi_jar_with_tests (
9 + deps = COMPILE_DEPS,
10 +)
11 +
1 -SRC = 'src/main/java/org/onosproject/**/' 1 +BUNDLES = [
2 -TEST = 'src/test/java/org/onosproject/**/' 2 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
3 - 3 + '//apps/openstacknetworking/web:onos-apps-openstacknetworking-web',
4 -COMPILE_DEPS = [
5 - '//lib:CORE_DEPS',
6 - '//lib:jersey-client',
7 - '//lib:javax.ws.rs-api',
8 - '//apps/openstackinterface:onos-apps-openstackinterface-api',
9 - '//core/store/serializers:onos-core-serializers',
10 -]
11 -
12 -java_library(
13 - name = 'onos-app-openstacknetworking',
14 - visibility = ['PUBLIC'],
15 - deps = [
16 - ':onos-app-openstacknetworking-api',
17 - ':onos-app-openstacknetworking-app',
18 - ':onos-app-openstackrouting',
19 - ':onos-app-openstackswitching',
20 - ':onos-app-openstacknetworking-web',
21 - ]
22 -)
23 -
24 -TEST_DEPS = [
25 - '//lib:TEST',
26 - ':onos-app-openstacknetworking',
27 ] 4 ]
28 5
29 -java_library( 6 +onos_app (
30 - name = 'onos-app-openstacknetworking-api', 7 + title = 'OpenStack Networking App',
31 - srcs = glob(['api/' + SRC + '*.java']), 8 + category = 'Utility',
32 - deps = COMPILE_DEPS, 9 + url = 'http://onosproject.org',
33 - visibility = ['PUBLIC'], 10 + included_bundles = BUNDLES,
34 -) 11 + required_apps = [ 'org.onosproject.openstackinterface' ],
35 -
36 -java_test(
37 - name = 'onos-app-openstacknetworking-api-tests',
38 - srcs = glob([TEST + 'api/*.java']),
39 - deps = COMPILE_DEPS +
40 - TEST_DEPS,
41 - source_under_test = [':onos-app-openstacknetworking-api'],
42 -)
43 -
44 -java_library(
45 - name = 'onos-app-openstacknetworking-app',
46 - srcs = glob(['app/' + SRC + '*.java']),
47 - deps = COMPILE_DEPS + [':onos-app-openstacknetworking-api'],
48 - visibility = ['PUBLIC'],
49 -)
50 -
51 -java_test(
52 - name = 'onos-app-openstacknetworking-app-tests',
53 - srcs = glob([TEST + 'app/*.java']),
54 - deps = COMPILE_DEPS +
55 - TEST_DEPS,
56 - source_under_test = [':onos-app-openstacknetworking-app'],
57 -)
58 -
59 -java_library(
60 - name = 'onos-app-openstackrouting',
61 - srcs = glob(['openstackrouting/' + SRC + '*.java']),
62 - deps = COMPILE_DEPS + [':onos-app-openstacknetworking-api'],
63 - visibility = ['PUBLIC'],
64 -)
65 -
66 -java_test(
67 - name = 'onos-app-openstackrouting-tests',
68 - srcs = glob([TEST + 'openstackrouting/*.java']),
69 - deps = COMPILE_DEPS +
70 - TEST_DEPS,
71 - source_under_test = [':onos-app-openstackrouting'],
72 -)
73 -
74 -java_library(
75 - name = 'onos-app-openstackswitching',
76 - srcs = glob(['openstgackswitching/' + SRC + '*.java']),
77 - deps = COMPILE_DEPS + [':onos-app-openstacknetworking-api'],
78 - visibility = ['PUBLIC'],
79 -)
80 -
81 -java_test(
82 - name = 'onos-app-openstackswitching-tests',
83 - srcs = glob([TEST + 'openstackswitching/*.java']),
84 - deps = COMPILE_DEPS +
85 - TEST_DEPS,
86 - source_under_test = [':onos-app-openstackswitching'],
87 -)
88 -
89 -java_library(
90 - name = 'onos-app-openstacknetworking-web',
91 - srcs = glob(['openstgacknetworking/' + SRC + '*.java']),
92 - deps = COMPILE_DEPS + [':onos-app-openstacknetworking-api'],
93 - visibility = ['PUBLIC'],
94 -)
95 -
96 -java_test(
97 - name = 'onos-app-openstacknetworking-web-tests',
98 - srcs = glob([TEST + 'openstackswitching/*.java']),
99 - deps = COMPILE_DEPS +
100 - TEST_DEPS,
101 - source_under_test = [':onos-app-openstacknetworking-web'],
102 ) 12 )
......
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:jersey-client',
4 + '//lib:javax.ws.rs-api',
5 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
6 +]
7 +
8 +osgi_jar_with_tests (
9 + deps = COMPILE_DEPS,
10 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//core/store/serializers:onos-core-serializers',
4 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
5 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
6 +]
7 +
8 +BUNDLES = [
9 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
10 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
11 + '//apps/openstacknetworking/openstackrouting:onos-apps-openstacknetworking-openstackrouting',
12 + #'//apps/dhcp/api:onos-apps-dhcp-api',
13 +]
14 +
15 +osgi_jar_with_tests (
16 + deps = COMPILE_DEPS,
17 +)
18 +
19 +onos_app (
20 + title = 'OpenStack Routing App',
21 + category = 'Utility',
22 + url = 'http://onosproject.org',
23 + description = 'OpenStack routing application.',
24 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//core/store/serializers:onos-core-serializers',
4 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
5 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
6 + '//apps/dhcp/api:onos-apps-dhcp-api',
7 +]
8 +
9 +BUNDLES = [
10 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
11 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
12 + '//apps/openstacknetworking/openstackswitching:onos-apps-openstacknetworking-openstackswitching',
13 + '//apps/dhcp/api:onos-apps-dhcp-api',
14 +]
15 +
16 +osgi_jar_with_tests (
17 + deps = COMPILE_DEPS,
18 +)
19 +
20 +onos_app (
21 + title = 'OpenStack Switching App',
22 + category = 'Utility',
23 + url = 'http://onosproject.org',
24 + description = 'OpenStack Switching application.',
25 + included_bundles = BUNDLES,
26 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:jersey-client',
4 + '//lib:javax.ws.rs-api',
5 + '//utils/rest:onlab-rest',
6 + '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
7 + '//apps/openstackinterface/app:onos-apps-openstackinterface-app',
8 + '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
9 +]
10 +
11 +osgi_jar_with_tests (
12 + deps = COMPILE_DEPS,
13 +)
1 -SRC = 'src/main/java/org/onosproject/**/' 1 +BUNDLES = [
2 -TEST = 'src/test/java/org/onosproject/**/' 2 + '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
3 - 3 + '//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr',
4 -COMPILE_DEPS = [ 4 + '//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr',
5 - '//lib:CORE_DEPS', 5 + '//apps/vtn/vtnweb:onos-apps-vtn-vtnweb',
6 - '//lib:org.apache.karaf.shell.console',
7 - '//cli:onos-cli',
8 - '//utils/rest:onlab-rest',
9 - '//lib:javax.ws.rs-api',
10 - '//core/store/serializers:onos-core-serializers',
11 - '//incubator/api:onos-incubator-api',
12 -]
13 -
14 -TEST_DEPS = [
15 - '//lib:TEST_REST',
16 - '//utils/osgi:onlab-osgi-tests',
17 - '//web/api:onos-rest-tests',
18 ] 6 ]
19 7
20 -java_library( 8 +onos_app (
21 - name = 'onos-app-vtn', 9 + title = 'OPNFV App',
22 - visibility = ['PUBLIC'], 10 + url = 'http://onosproject.org',
23 - deps = [':onos-app-sfc-mgr', 11 + included_bundles = BUNDLES,
24 - ':onos-app-vtn-mgr', 12 + description = 'ONOS framework applications',
25 - ':onos-app-vtn-rsc',
26 - ':onos-app-vtn-web',
27 - ],
28 -)
29 -
30 -# sfcmgr
31 -
32 -java_library(
33 - name = 'onos-app-sfc-mgr',
34 - srcs = glob(['sfcmgr/' + SRC + '*.java']),
35 - deps = COMPILE_DEPS + [':onos-app-vtn-rsc'],
36 - visibility = ['PUBLIC'],
37 -)
38 -
39 -java_test(
40 - name = 'onos-app-sfc-mgr-tests',
41 - srcs = glob(['sfcmgr/' + TEST + '*.java']),
42 - deps = COMPILE_DEPS +
43 - TEST_DEPS +
44 - [':onos-app-sfc-mgr', ':onos-app-vtn-rsc'],
45 - source_under_test = [':onos-app-sfc-mgr'],
46 -)
47 -
48 -# vtnmgr
49 -
50 -java_library(
51 - name = 'onos-app-vtn-mgr',
52 - srcs = glob(['vtnmgr/' + SRC + '*.java']),
53 - deps = COMPILE_DEPS + [':onos-app-vtn-rsc'],
54 - visibility = ['PUBLIC'],
55 - resources_root = 'vtnmgr/src/main/resources',
56 - resources = glob(['vtnmgr/src/main/resources/**']),
57 -)
58 -
59 -java_test(
60 - name = 'onos-app-vtn-mgr-tests',
61 - srcs = glob(['vtnmgr/' + TEST + '*.java']),
62 - deps = COMPILE_DEPS +
63 - TEST_DEPS +
64 - [':onos-app-vtn-mgr', ':onos-app-vtn-rsc'],
65 - source_under_test = [':onos-app-vtn-mgr'],
66 -)
67 -
68 -# vtnrsc
69 -
70 -java_library(
71 - name = 'onos-app-vtn-rsc',
72 - srcs = glob(['vtnrsc/' + SRC + '*.java']),
73 - deps = COMPILE_DEPS,
74 - visibility = ['PUBLIC'],
75 - resources_root = 'vtnrsc/src/main/resources',
76 - resources = glob(['vtnrsc/src/main/resources/**']),
77 -)
78 -
79 -java_test(
80 - name = 'onos-app-vtn-rsc-tests',
81 - srcs = glob(['vtnrsc/' + TEST + '*.java']),
82 - deps = COMPILE_DEPS +
83 - TEST_DEPS +
84 - [':onos-app-vtn-rsc'],
85 - source_under_test = [':onos-app-vtn-rsc'],
86 -)
87 -
88 -# vtnweb
89 -
90 -java_library(
91 - name = 'onos-app-vtn-web',
92 - srcs = glob(['vtnweb/' + SRC + '*.java']),
93 - deps = COMPILE_DEPS + [':onos-app-vtn-rsc'],
94 - visibility = ['PUBLIC'],
95 -)
96 -
97 -java_test(
98 - name = 'onos-app-vtn-web-tests',
99 - srcs = glob(['vtnweb/' + TEST + '*.java']),
100 - deps = COMPILE_DEPS +
101 - TEST_DEPS +
102 - [':onos-app-vtn-web', ':onos-app-vtn-rsc'],
103 - source_under_test = [':onos-app-vtn-web'],
104 - resources_root = 'vtnweb/src/test/resources',
105 - resources = glob(['vtnweb/src/test/resources/**']),
106 ) 13 )
......
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//core/store/serializers:onos-core-serializers',
4 + '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
5 +]
6 +
7 +TEST_DEPS = [
8 + '//lib:TEST_ADAPTERS',
9 +]
10 +
11 +osgi_jar_with_tests (
12 + deps = COMPILE_DEPS,
13 + test_deps = TEST_DEPS,
14 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//core/store/serializers:onos-core-serializers',
5 + '//cli:onos-cli',
6 + '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
7 +]
8 +
9 +osgi_jar_with_tests (
10 + deps = COMPILE_DEPS,
11 + resources_root = 'src/main/resources',
12 + resources = glob(['src/main/resources/**']),
13 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:org.apache.karaf.shell.console',
4 + '//cli:onos-cli',
5 + '//core/store/serializers:onos-core-serializers',
6 +]
7 +
8 +TEST_DEPS = [
9 + '//lib:TEST_REST',
10 +]
11 +
12 +osgi_jar_with_tests (
13 + deps = COMPILE_DEPS,
14 + test_deps = TEST_DEPS,
15 +)
1 +COMPILE_DEPS = [
2 + '//lib:CORE_DEPS',
3 + '//lib:javax.ws.rs-api',
4 + '//utils/rest:onlab-rest',
5 + '//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc',
6 +]
7 +
8 +TEST_DEPS = [
9 + '//lib:TEST_REST',
10 + '//utils/osgi:onlab-osgi-tests',
11 + '//web/api:onos-rest-tests',
12 +]
13 +
14 +osgi_jar_with_tests (
15 + deps = COMPILE_DEPS,
16 + test_deps = TEST_DEPS,
17 +)