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,
+)