Topology schema

- fix Honeycomb part of the topology schema
- add topology file checking using pykwalify before tests are started

Change-Id: I907d41b66f5660a2ab4de8857312e9277052bae6
Signed-off-by: Tibor Frank <tifrank@cisco.com>

diff --git a/bootstrap.sh b/bootstrap.sh
index 17d9e17..349e4b6 100755 (executable)
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -148,6 +148,17 @@ virtualenv env
 echo pip install
 pip install -r requirements.txt
 
+pykwalify -s resources/topology_schemas/3_node_topology.sch.yaml \
+          -s resources/topology_schemas/topology.sch.yaml \
+          -d topologies/enabled/topology.yaml \
+          -vvv
+
+result=$?
+if [ "${result}" -ne "0" ]; then
+    echo "Topology schema validation failed."
+    echo "However, the tests will start."
+fi
+
 PYTHONPATH=`pwd` pybot -L TRACE \
     -v TOPOLOGY_PATH:topologies/enabled/topology.yaml \
     --include vm_envAND3_node_single_link_topo \

diff --git a/resources/topology_schemas/topology.sch.yaml b/resources/topology_schemas/topology.sch.yaml
index 1c20055..1b16616 100644 (file)
--- a/resources/topology_schemas/topology.sch.yaml
+++ b/resources/topology_schemas/topology.sch.yaml
@@ -124,10 +124,12 @@ schema;type_dut:
   type: map
   mapping:
     <<: *type_node_mapping
-    honeycomb:
-      <<: *type_honeycomb_mapping
     type:
       <<: *type_node_mapping_type
       enum: [DUT]
+    honeycomb:
+      type: map
+      mapping:
+        <<: *type_honeycomb_mapping
 
 # vim: sw=2:sts=2