BUCK changes in TE topology and RESTCONF
1. BUCK file fixes in RESTCONF
2. Changed tenbi/yangmodel bundle to feature. This is required for YMS
schema registration.
3. Added TE topology, TE tunnel, tenbi, restconf server, and TE provider to modules.defs.
Change-Id: I5bc3208c7fe823352500a63f87bfd990cb3037b4
diff --git a/apps/tenbi/BUCK b/apps/tenbi/BUCK
index 461fddd..5a63e3b 100644
--- a/apps/tenbi/BUCK
+++ b/apps/tenbi/BUCK
@@ -1,16 +1,21 @@
BUNDLES = [
- '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel',
+ '//incubator/api:onos-incubator-api',
+ '//apps/yms/api:onos-apps-yms-api',
+ '//apps/tetopology/api:onos-apps-tetopology-api',
+ '//apps/tetunnel/api:onos-apps-tetunnel-api',
'//apps/tenbi/utils:onos-apps-tenbi-utils',
'//apps/tenbi/tunnel:onos-apps-tenbi-tunnel',
'//apps/tenbi/topology:onos-apps-tenbi-topology',
]
onos_app (
+ app_name = 'org.onosproject.tenbi',
title = 'TE NBI',
category = 'ACTN APP',
url = 'http://onosproject.org',
included_bundles = BUNDLES,
- description = 'TE YANG NBI.',
+ description = 'The northbound interface of TE topology and TE tunnel.',
+ required_features = [ 'onos-apps-tenbi-yangmodel' ],
required_apps = [ 'org.onosproject.tetopology',
'org.onosproject.tetunnel',
'org.onosproject.yms' ],
diff --git a/apps/tenbi/yangmodel/BUCK b/apps/tenbi/yangmodel/BUCK
index 3ee4e7d..78b4cf4 100644
--- a/apps/tenbi/yangmodel/BUCK
+++ b/apps/tenbi/yangmodel/BUCK
@@ -1,5 +1,5 @@
COMPILE_DEPS = [
- '//lib:CORE_DEPS'
+ '//lib:CORE_DEPS',
]
yang_osgi_jar(
@@ -8,3 +8,14 @@
srcs = glob(['src/main/**/*.yang']),
visibility = [ 'PUBLIC' ],
)
+
+osgi_feature (
+ name='onos-apps-tenbi-yangmodel',
+ title='ONOS TE YANG model',
+ included_bundles = [
+ '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel',
+ ],
+ generate_file = True,
+ visibility = [ 'PUBLIC' ],
+ stage_repo = False,
+)
diff --git a/modules.defs b/modules.defs
index b6c71d9..61565a9 100644
--- a/modules.defs
+++ b/modules.defs
@@ -54,6 +54,8 @@
'//protocols/lisp/msg:onos-protocols-lisp-msg',
'//protocols/tl1/api:onos-protocols-tl1-api',
'//protocols/tl1/ctl:onos-protocols-tl1-ctl',
+ '//protocols/restconf/client/api:onos-protocols-restconf-client-api',
+ '//protocols/restconf/client/ctl:onos-protocols-restconf-client-ctl',
'//drivers/utilities:onos-drivers-utilities',
@@ -117,6 +119,7 @@
'//providers/link:onos-providers-link-oar',
'//providers/lisp:onos-providers-lisp-oar',
'//providers/tl1:onos-providers-tl1-oar',
+ '//providers/ietfte:onos-providers-ietfte-oar',
]
ONOS_APPS = [
@@ -177,8 +180,12 @@
'//apps/ofagent:onos-apps-ofagent-oar',
'//apps/mappingmanagement:onos-apps-mappingmanagement-oar',
'//apps/config:onos-apps-config-oar',
- '//apps/netconf:onos-apps-netconf-oar'
-
+ '//apps/netconf:onos-apps-netconf-oar',
+ '//apps/tetopology:onos-apps-tetopology-oar',
+ '//apps/tetunnel:onos-apps-tetunnel-oar',
+ '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature',
+ '//apps/tenbi:onos-apps-tenbi-oar',
+ '//protocols/restconf/server:onos-protocols-restconf-server-oar',
]
APP_JARS = [
diff --git a/protocols/restconf/server/BUCK b/protocols/restconf/server/BUCK
index c1383b6..e08b996 100644
--- a/protocols/restconf/server/BUCK
+++ b/protocols/restconf/server/BUCK
@@ -6,6 +6,7 @@
]
onos_app (
+ app_name = 'org.onosproject.protocols.restconfserver',
title = 'RESTCONF Server Module',
category = 'Utility',
url = 'http://onosproject.org',
diff --git a/protocols/restconf/server/rpp/BUCK b/protocols/restconf/server/rpp/BUCK
index b4cb4a0..20d2d45 100644
--- a/protocols/restconf/server/rpp/BUCK
+++ b/protocols/restconf/server/rpp/BUCK
@@ -10,4 +10,5 @@
osgi_jar_with_tests (
deps = COMPILE_DEPS,
+ web_context = '/onos/restconf',
)
diff --git a/providers/ietfte/BUCK b/providers/ietfte/BUCK
index 9df8f9c..df37518 100644
--- a/providers/ietfte/BUCK
+++ b/providers/ietfte/BUCK
@@ -2,7 +2,6 @@
'//protocols/restconf/server/utils:onos-protocols-restconf-server-utils',
'//apps/yms/api:onos-apps-yms-api',
'//apps/tenbi/utils:onos-apps-tenbi-utils',
- '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel',
'//lib:httpclient-osgi',
'//lib:httpcore-osgi',
'//protocols/rest/api:onos-protocols-rest-api',
@@ -14,11 +13,14 @@
]
onos_app (
+ app_name = 'org.onosproject.teprovider',
title = 'IETF TE Provider',
category = 'Provider',
url = 'http://onosproject.org',
included_bundles = BUNDLES,
description = 'IETF TE southbound providers.',
- required_apps = [ 'org.onosproject.tetunnel', 'org.onosproject.tetopology',
- 'org.onosproject.yms'],
-)
\ No newline at end of file
+ required_features = [ 'onos-apps-tenbi-yangmodel' ],
+ required_apps = [ 'org.onosproject.tetunnel',
+ 'org.onosproject.tetopology',
+ 'org.onosproject.yms'],
+)