l3vpn and driver import changes

Change-Id: I7eec5b7387e7b69a8e3524ddf12e09f101da6fff
diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index b34eb4c..4e6aaf3 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -25,18 +25,17 @@
     'org.onosproject.models.l3vpn',
 ]
 
-#Removed until this app builds with onos-yang-tools 2.1
-#osgi_jar_with_tests(
-#    deps = COMPILE_DEPS,
-#    test_deps = TEST_DEPS,
-#)
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
+)
 
-#onos_app(
-#    app_name = 'org.onosproject.l3vpn',
-#    title = 'YANG L3VPN App',
-#    category = 'Traffic Steering',
-#    url = 'http://onosproject.org',
-#    description = 'L3VPN YANG Application',
-#    required_apps = APPS,
-#)
+onos_app(
+    app_name = 'org.onosproject.l3vpn',
+    title = 'YANG L3VPN App',
+    category = 'Traffic Steering',
+    url = 'http://onosproject.org',
+    description = 'L3VPN YANG Application',
+    required_apps = APPS,
+)