l3vpn and driver import changes
Change-Id: I7eec5b7387e7b69a8e3524ddf12e09f101da6fff
diff --git a/drivers/huawei/BUCK b/drivers/huawei/BUCK
index 1cd1efc..d7836d2 100644
--- a/drivers/huawei/BUCK
+++ b/drivers/huawei/BUCK
@@ -1,41 +1,16 @@
BUNDLES = [
- '//drivers/huawei/yangmodel:onos-drivers-huawei-yangmodel',
- '//drivers/huawei/driver:onos-drivers-huawei-driver',
+ '//drivers/huawei/yangmodel:onos-drivers-huawei-yangmodel',
+ '//drivers/huawei/driver:onos-drivers-huawei-driver',
]
-APPS = [
- 'org.onosproject.yang',
- 'org.onosproject.yang-gui',
- 'org.onosproject.config',
- 'org.onosproject.restconf',
- 'org.onosproject.yms',
- 'org.onosproject.protocols.restconfserver',
- 'org.onosproject.netconf',
- 'org.onosproject.netconfsb',
- 'org.onosproject.models.l3vpn',
- 'org.onosproject.l3vpn',
- 'org.onosproject.models.huawei',
-]
-
-TEST_DEPS = [
- '//lib:TEST_ADAPTERS',
- '//utils/osgi:onlab-osgi-tests',
-]
-
-#Removed until this app builds with onos-yang-tools 2.1
-#osgi_jar_with_tests(
-# deps = COMPILE_DEPS,
-# test_deps = TEST_DEPS,
-# resources_root = 'src/main/resources',
-# resources = glob(['src/main/resources/**']),
-#)
-
-#onos_app(
-# app_name = 'org.onosproject.drivers.huawei',
-# title = 'Huawei Device Drivers',
-# category = 'Drivers',
-# url = 'http://onosproject.org',
-# description = 'ONOS Huawei Device Drivers application.',
-# required_apps = APPS
-#)
-
+onos_app(
+ app_name = 'org.onosproject.drivers.huawei',
+ title = 'Huawei Device Drivers',
+ category = 'Drivers',
+ url = 'http://onosproject.org',
+ description = 'ONOS Huawei Device Drivers application.',
+ included_bundles = BUNDLES,
+ required_apps = [
+ 'org.onosproject.netconf'
+ ],
+)