Committed by
Gerrit Code Review
Appify fault management and open stack node BUCK files
Change-Id: I9c1574a8360c377bdc1b52e30f136a46cded0abc
Showing
9 changed files
with
104 additions
and
96 deletions
... | @@ -82,6 +82,7 @@ CORE = [ | ... | @@ -82,6 +82,7 @@ CORE = [ |
82 | 82 | ||
83 | APPS = [ | 83 | APPS = [ |
84 | '//providers/pcep:onos-providers-pcep-oar', | 84 | '//providers/pcep:onos-providers-pcep-oar', |
85 | + '//providers/ovsdb:onos-providers-ovsdb-oar', | ||
85 | '//apps/dhcp:onos-apps-dhcp-oar', | 86 | '//apps/dhcp:onos-apps-dhcp-oar', |
86 | '//apps/fwd:onos-apps-fwd-oar', | 87 | '//apps/fwd:onos-apps-fwd-oar', |
87 | '//apps/aaa:onos-apps-aaa-oar', | 88 | '//apps/aaa:onos-apps-aaa-oar', |
... | @@ -114,6 +115,8 @@ APPS = [ | ... | @@ -114,6 +115,8 @@ APPS = [ |
114 | '//apps/vpls:onos-apps-vpls-oar', | 115 | '//apps/vpls:onos-apps-vpls-oar', |
115 | '//apps/vrouter:onos-apps-vrouter-oar', | 116 | '//apps/vrouter:onos-apps-vrouter-oar', |
116 | '//apps/vtn:onos-apps-vtn-oar', | 117 | '//apps/vtn:onos-apps-vtn-oar', |
118 | + '//apps/faultmanagement:onos-apps-faultmanagement-oar', | ||
119 | + '//apps/openstacknode:onos-apps-openstacknode-oar', | ||
117 | ] | 120 | ] |
118 | 121 | ||
119 | APP_JARS = [ | 122 | APP_JARS = [ |
... | @@ -125,7 +128,6 @@ APP_JARS = [ | ... | @@ -125,7 +128,6 @@ APP_JARS = [ |
125 | '//apps/dhcp/app:onos-apps-dhcp-app', | 128 | '//apps/dhcp/app:onos-apps-dhcp-app', |
126 | '//apps/drivermatrix:onos-app-drivermatrix', | 129 | '//apps/drivermatrix:onos-app-drivermatrix', |
127 | '//apps/events:onos-app-events', | 130 | '//apps/events:onos-app-events', |
128 | - '//apps/faultmanagement:onos-app-fm', | ||
129 | '//apps/flowanalyzer:onos-app-flowanalyzer', | 131 | '//apps/flowanalyzer:onos-app-flowanalyzer', |
130 | '//apps/fwd:onos-apps-fwd', | 132 | '//apps/fwd:onos-apps-fwd', |
131 | '//apps/olt:onos-apps-olt-api', | 133 | '//apps/olt:onos-apps-olt-api', | ... | ... |
1 | -SRC = 'src/main/java/org/onosproject/**/' | 1 | +BUNDLES = [ |
2 | -TEST = 'src/test/java/org/onosproject/**/' | 2 | + '//apps/faultmanagement/fmcli:onos-apps-faultmanagement-fmcli', |
3 | - | 3 | + '//apps/faultmanagement/fmgui:onos-apps-faultmanagement-fmgui', |
4 | -COMPILE_DEPS = [ | 4 | + '//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr', |
5 | - '//lib:CORE_DEPS', | 5 | + '//apps/faultmanagement/fmweb:onos-apps-faultmanagement-fmweb', |
6 | - '//lib:org.apache.karaf.shell.console', | ||
7 | - '//incubator/api:onos-incubator-api', | ||
8 | - '//cli:onos-cli', | ||
9 | - '//utils/rest:onlab-rest', | ||
10 | - '//lib:javax.ws.rs-api', | ||
11 | - '//utils/osgi:onlab-osgi', | ||
12 | - '//core/store/serializers:onos-core-serializers', | ||
13 | -] | ||
14 | - | ||
15 | -TEST_DEPS = [ | ||
16 | - '//lib:TEST_ADAPTERS', | ||
17 | - '//lib:jersey-test-framework-core', | ||
18 | - '//lib:jersey-test-framework-jetty', | ||
19 | - '//utils/osgi:onlab-osgi-tests', | ||
20 | - '//web/api:onos-rest-tests', | ||
21 | - '//incubator/api:onos-incubator-api-tests', | ||
22 | ] | 6 | ] |
23 | 7 | ||
24 | -java_library( | 8 | +onos_app ( |
25 | - name = 'onos-app-fm', | 9 | + title = 'Fault Management App', |
26 | - visibility = ['PUBLIC'], | 10 | + description = 'ONOS fault management application', |
27 | - deps = [':fmcli', ':fmgui', ':fmmgr', ':fmweb'], | 11 | + category = 'Monitoring', |
28 | -) | 12 | + url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management', |
29 | - | 13 | + included_bundles = BUNDLES, |
30 | -java_library( | ||
31 | - name = 'fmcli', | ||
32 | - srcs = glob(['fmcli/' + SRC + '*.java']), | ||
33 | - deps = COMPILE_DEPS, | ||
34 | - visibility = ['PUBLIC'], | ||
35 | - resources_root = 'fmcli/src/main/resources', | ||
36 | - resources = glob(['fmcli/src/main/resources/**']), | ||
37 | -) | ||
38 | - | ||
39 | -java_test( | ||
40 | - name = 'fmcli-tests', | ||
41 | - srcs = glob(['fmcli/' + TEST + '*.java']), | ||
42 | - deps = COMPILE_DEPS + | ||
43 | - TEST_DEPS + | ||
44 | - [':fmcli'], | ||
45 | - source_under_test = [':fmcli'], | ||
46 | -) | ||
47 | - | ||
48 | -java_library( | ||
49 | - name = 'fmgui', | ||
50 | - srcs = glob(['fmgui/' + SRC + '*.java']), | ||
51 | - deps = COMPILE_DEPS, | ||
52 | - visibility = ['PUBLIC'], | ||
53 | - resources_root = 'fmgui/src/main/resources', | ||
54 | - resources = glob(['fmgui/src/main/resources/**']), | ||
55 | -) | ||
56 | - | ||
57 | -java_test( | ||
58 | - name = 'fmgui-tests', | ||
59 | - srcs = glob(['fmgui/' + TEST + '*.java']), | ||
60 | - deps = COMPILE_DEPS + | ||
61 | - TEST_DEPS + | ||
62 | - [':fmgui'], | ||
63 | - source_under_test = [':fmgui'], | ||
64 | -) | ||
65 | - | ||
66 | -java_library( | ||
67 | - name = 'fmmgr', | ||
68 | - srcs = glob(['fmmgr/' + SRC + '*.java']), | ||
69 | - deps = COMPILE_DEPS, | ||
70 | - visibility = ['PUBLIC'], | ||
71 | -) | ||
72 | - | ||
73 | -java_test( | ||
74 | - name = 'fmmgr-tests', | ||
75 | - srcs = glob(['fmmgr/' + TEST + '*.java']), | ||
76 | - deps = COMPILE_DEPS + | ||
77 | - TEST_DEPS + | ||
78 | - [':fmmgr'], | ||
79 | - source_under_test = [':fmmgr'], | ||
80 | -) | ||
81 | - | ||
82 | -java_library( | ||
83 | - name = 'fmweb', | ||
84 | - srcs = glob(['fmweb/' + SRC + '*.java']), | ||
85 | - deps = COMPILE_DEPS, | ||
86 | - visibility = ['PUBLIC'], | ||
87 | -) | ||
88 | - | ||
89 | -java_test( | ||
90 | - name = 'fmweb-tests', | ||
91 | - srcs = glob(['fmweb/' + TEST + '*.java']), | ||
92 | - deps = COMPILE_DEPS + | ||
93 | - TEST_DEPS + | ||
94 | - [':fmweb'], | ||
95 | - source_under_test = [':fmweb'], | ||
96 | - resources_root = 'fmweb/src/test/resources', | ||
97 | - resources = glob(['fmweb/src/test/resources/**']), | ||
98 | ) | 14 | ) | ... | ... |
apps/faultmanagement/fmcli/BUCK
0 → 100644
1 | +COMPILE_DEPS = [ | ||
2 | + '//lib:CORE_DEPS', | ||
3 | + '//lib:org.apache.karaf.shell.console', | ||
4 | + '//incubator/api:onos-incubator-api', | ||
5 | + '//cli:onos-cli', | ||
6 | + '//utils/rest:onlab-rest', | ||
7 | + '//lib:javax.ws.rs-api', | ||
8 | + '//utils/osgi:onlab-osgi', | ||
9 | + '//core/store/serializers:onos-core-serializers', | ||
10 | +] | ||
11 | + | ||
12 | + | ||
13 | +osgi_jar_with_tests ( | ||
14 | + deps = COMPILE_DEPS, | ||
15 | + import_packages = '*,org.onosproject.cli.net', | ||
16 | +) |
apps/faultmanagement/fmgui/BUCK
0 → 100644
apps/faultmanagement/fmmgr/BUCK
0 → 100644
1 | +COMPILE_DEPS = [ | ||
2 | + '//lib:CORE_DEPS', | ||
3 | + '//incubator/api:onos-incubator-api', | ||
4 | + '//core/store/serializers:onos-core-serializers', | ||
5 | +] | ||
6 | + | ||
7 | +TEST_DEPS = [ | ||
8 | + '//lib:TEST_ADAPTERS', | ||
9 | + '//utils/osgi:onlab-osgi-tests', | ||
10 | + '//incubator/api:onos-incubator-api-tests', | ||
11 | +] | ||
12 | + | ||
13 | +osgi_jar_with_tests ( | ||
14 | + deps = COMPILE_DEPS, | ||
15 | + test_deps = TEST_DEPS, | ||
16 | +) |
apps/faultmanagement/fmweb/BUCK
0 → 100644
1 | +COMPILE_DEPS = [ | ||
2 | + '//lib:CORE_DEPS', | ||
3 | + '//incubator/api:onos-incubator-api', | ||
4 | + '//utils/rest:onlab-rest', | ||
5 | + '//lib:javax.ws.rs-api', | ||
6 | +] | ||
7 | + | ||
8 | +TEST_DEPS = [ | ||
9 | + '//lib:TEST_ADAPTERS', | ||
10 | + '//lib:jersey-test-framework-core', | ||
11 | + '//lib:jersey-test-framework-jetty', | ||
12 | + '//utils/osgi:onlab-osgi-tests', | ||
13 | + '//web/api:onos-rest-tests', | ||
14 | + '//incubator/api:onos-incubator-api-tests', | ||
15 | +] | ||
16 | + | ||
17 | +osgi_jar_with_tests ( | ||
18 | + deps = COMPILE_DEPS, | ||
19 | + test_deps = TEST_DEPS, | ||
20 | +) |
... | @@ -20,4 +20,5 @@ onos_app ( | ... | @@ -20,4 +20,5 @@ onos_app ( |
20 | category = 'Utility', | 20 | category = 'Utility', |
21 | url = 'http://onosproject.org', | 21 | url = 'http://onosproject.org', |
22 | description = 'OpenStack routing application.', | 22 | description = 'OpenStack routing application.', |
23 | + included_bundles = BUNDLES, | ||
23 | ) | 24 | ) | ... | ... |
... | @@ -8,3 +8,11 @@ COMPILE_DEPS = [ | ... | @@ -8,3 +8,11 @@ COMPILE_DEPS = [ |
8 | osgi_jar_with_tests ( | 8 | osgi_jar_with_tests ( |
9 | deps = COMPILE_DEPS, | 9 | deps = COMPILE_DEPS, |
10 | ) | 10 | ) |
11 | + | ||
12 | +onos_app ( | ||
13 | + title = 'OpenStack Node Bootstrap App', | ||
14 | + category = 'Utility', | ||
15 | + url = 'http://onosproject.org', | ||
16 | + description = 'SONA Openstack Node Bootstrap Application.', | ||
17 | + required_app = [ 'org.onosproject.ovsdb' ], | ||
18 | +) | ... | ... |
providers/ovsdb/BUCK
0 → 100644
1 | +BUNDLES = [ | ||
2 | + '//providers/ovsdb/device:onos-ovsdb-provider-device', | ||
3 | + '//providers/ovsdb/host:onos-ovsdb-provider-host', | ||
4 | + '//providers/ovsdb/tunnel:onos-ovsdb-provider-tunnel', | ||
5 | +] | ||
6 | + | ||
7 | +APPS = [ | ||
8 | + 'org.onosproject.ovsdb-base', | ||
9 | + 'org.onosproject.ovsdbhostprovider', | ||
10 | +] | ||
11 | + | ||
12 | +onos_app ( | ||
13 | + title = 'OVSDB Southbound Meta App', | ||
14 | + description = 'ONOS fault management application', | ||
15 | + category = 'Provider', | ||
16 | + url = 'https://wiki.onosproject.org/display/ONOS/Fault+Management', | ||
17 | + included_bundles = BUNDLES, | ||
18 | + required_apps = APPS, | ||
19 | +) |
-
Please register or login to post a comment