l3vpn and driver import changes

Change-Id: I7eec5b7387e7b69a8e3524ddf12e09f101da6fff
diff --git a/drivers/huawei/BUCK b/drivers/huawei/BUCK
index a98299b..ccbe21e 100644
--- a/drivers/huawei/BUCK
+++ b/drivers/huawei/BUCK
@@ -31,19 +31,18 @@
     '//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/**']),
-#)
+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
-#)
\ No newline at end of file
+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
+)
\ No newline at end of file