Refactoring OpenROADM app to distribute the model as a separate app

and to locate the YANG models under /models tree.

Change-Id: Iff36569d7880e7930b4a1c24a6b36a7ea3760f20
This commit is contained in:
Thomas Vachuska 2017-05-10 15:24:47 -07:00 committed by Ray Milkey
parent c927a06fe9
commit c1732fd020
48 changed files with 10 additions and 11 deletions

View File

@ -7,10 +7,10 @@ APPS = [
'org.onosproject.protocols.restconfserver',
'org.onosproject.netconf',
'org.onosproject.netconfsb',
'org.onosproject.models.openroadm',
]
BUNDLES = [
'//apps/openroadm/yangmodel:onos-apps-openroadm-yangmodel',
'//apps/openroadm/service:onos-apps-openroadm-service',
'//apps/openroadm/network:onos-apps-openroadm-network',
]

View File

@ -1,6 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//apps/openroadm/yangmodel:onos-apps-openroadm-yangmodel',
'//models/openroadm:onos-models-openroadm',
'//core/store/serializers:onos-core-serializers',
] + YANG_TOOLS

View File

@ -1,6 +1,6 @@
COMPILE_DEPS = [
'//lib:CORE_DEPS',
'//apps/openroadm/yangmodel:onos-apps-openroadm-yangmodel',
'//models/openroadm:onos-models-openroadm',
'//core/store/serializers:onos-core-serializers',
] + YANG_TOOLS

View File

@ -1,8 +0,0 @@
yang_osgi_jar(
deps = YANG_TOOLS,
name = 'onos-apps-openroadm-yangmodel',
srcs = glob(['src/main/**/*.yang']),
visibility = [
'PUBLIC'
],
)

5
models/openroadm/BUCK Normal file
View File

@ -0,0 +1,5 @@
yang_model(
app_name = 'org.onosproject.models.openroadm',
title = 'OpenROADM YANG Model',
)

View File

@ -197,10 +197,12 @@ ONOS_APPS = [
'//apps/cord-support:onos-apps-cord-support-oar',
'//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar',
'//apps/l3vpn:onos-apps-l3vpn-oar',
'//apps/openroadm:onos-apps-openroadm-oar',
]
MODELS = [
'//models/demo:onos-models-demo-oar',
'//models/openroadm:onos-models-openroadm-oar',
]
APP_JARS = [