commit 8953445c86ff6e18ee35cf3f8d605f5eea9622d1
author Thomas Vachuska <tom@opennetworking.org> Fri Jul 28 10:20:12 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Fri Jul 28 19:49:29 2017 +0000
tree c762c7fdfae2367aa445631cccd4d2ef4202f11b
parent 288b273cf338c8bdda4874e5370f20e73347e5d6

Bumping ONOS to point to ONOS YANG Tools 2.2.0-b2

Change-Id: I23b2ed67ed0fb5ef4ec0731a37dcd8b058102298

bucklets/yang.bucklet

diff --git a/bucklets/yang.bucklet b/bucklets/yang.bucklet
index eb8cd31..64ff60b 100644
--- a/bucklets/yang.bucklet
+++ b/bucklets/yang.bucklet
@@ -17,6 +17,7 @@
 def yang_model(
     name = None,
     app_name = None,
+    model_id = None,
     title = 'YANG Model',
     url = 'http://onosproject.org',
     description = None,
@@ -27,6 +28,9 @@
     if name is None:
         name = _get_name()
 
+    if model_id is None:
+        model_id = app_name
+
     yang = name + '-yang'
     yangSrcs = yang + '#srcs'
     schema = name + '-schema'
@@ -35,6 +39,7 @@
     yang_library(
       name = yang,
       srcs = glob(['**/*.yang'], excludes=['**/target/**']),
+      model_id = model_id
     )
 
     genrule(
@@ -74,6 +79,7 @@
 def yang_osgi_jar(
     name = None,
     srcs = None,
+    model_id = None,
     group_id = ONOS_GROUP_ID,
     version = ONOS_VERSION,
     deps = [],
@@ -85,6 +91,8 @@
     if name is None:
         name = _get_name()
 
+    if model_id is None:
+        model_id = name
     yang_jar = name + '-yang'
     bnd_jar = name + '-bnd'
 
@@ -94,6 +102,7 @@
       deps = deps,
       name = yang_jar,
       srcs = srcs,
+      model_id = model_id,
       visibility = [ ],
     )