commit 86d1b0a92fba366014472aac38f34639ff8d191c
author Ray Milkey <ray@onlab.us> Tue May 16 15:15:08 2017 -0700
committer Thomas Vachuska <tom@onlab.us> Wed May 24 11:05:25 2017 -0700
tree 2f3674cf6dd924cd12025893c4034158ac17c9bf
parent 0b5b35ddc1be6b29948e4ed8b8397303564a5610

Bumping version of YANG Tools to 2.1; adding YANG smoke STC test.

Change-Id: I8bd719351a5dbe6af286779fdc3ac3105c2bbc62

tools/dev/bin/patch-yang-libs

diff --git a/tools/dev/bin/patch-yang-libs b/tools/dev/bin/patch-yang-libs
index d6ab3ea..fbf091c 100755
--- a/tools/dev/bin/patch-yang-libs
+++ b/tools/dev/bin/patch-yang-libs
@@ -3,8 +3,8 @@
 # Patches lib/BUCK file to use locally built YANG tools.
 # -----------------------------------------------------------------------------
 
-BVER=1.12.0-b7
-SVER=1.12-SNAPSHOT
+BVER=2.1
+SVER=2.2-SNAPSHOT
 
 YANG_TOOLS_ROOT=~/onos-yang-tools
 

tools/test/scenarios/smoke.xml

diff --git a/tools/test/scenarios/smoke.xml b/tools/test/scenarios/smoke.xml
index 5cb9e62..5b95e70 100644
--- a/tools/test/scenarios/smoke.xml
+++ b/tools/test/scenarios/smoke.xml
@@ -20,6 +20,7 @@
     <import file="${ONOS_SCENARIOS}/maps-cli.xml"/>
     <import file="${ONOS_SCENARIOS}/dist-test.xml"/>
     <import file="${ONOS_SCENARIOS}/smoke-internal.xml"/>
+    <import file="${ONOS_SCENARIOS}/yang-smoke.xml"/>
 
     <dependency name="Setup" requires="Prerequisites,Net-Prerequisites"/>
     <dependency name="Net-Smoke" requires="Setup"/>
@@ -28,7 +29,8 @@
     <dependency name="Meta-App" requires="Setup"/>
     <dependency name="Netcfg" requires="Setup"/>
     <dependency name="Distributed-Primitives" requires="Setup"/>
+    <dependency name="YANG-Smoke" requires="Setup,~Distributed-Primitives"/>
 
     <import file="${ONOS_SCENARIOS}/wrapup.xml"/>
-    <dependency name="Wrapup" requires="~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg"/>
+    <dependency name="Wrapup" requires="~Setup,~Net-Smoke,~Drivers-Test,~Meta-App,~Netcfg,~YANG-Smoke"/>
 </scenario>

tools/test/scenarios/yang-smoke.xml

diff --git a/tools/test/scenarios/yang-smoke.xml b/tools/test/scenarios/yang-smoke.xml
new file mode 100644
index 0000000..c55a0ba
--- /dev/null
+++ b/tools/test/scenarios/yang-smoke.xml
@@ -0,0 +1,28 @@
+<!--
+  ~ Copyright 2017-present Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="yang-smoke" description="Basic smoke test for YANG subsystem">
+    <group name="YANG-Smoke">
+        <step name="Activate-YANG-Apps"
+              exec="onos ${OC1} app activate org.onosproject.yang-gui org.onosproject.models.openroadm"/>
+        <group name="Check-YANG-Apps-Activated"
+               requires="Activate-YANG-Apps">
+            <parallel var="${OC#}">
+                <step name="Check-YANG-Apps-Activated-${#}"
+                      exec="onos-check-apps ${#} drivers,yang,yang-gui,models.openroadm includes"/>
+            </parallel>
+        </group>
+    </group>
+</scenario>