From f4abb26eb5694849324e74fe596bf403d7f2b685 Mon Sep 17 00:00:00 2001
From: thomashaw <thomashaw@gmail.com>
Date: Thu, 18 Mar 2021 15:31:48 +0000
Subject: [PATCH] CyBOK: scenario_schema.xsd update to include CyBOK elements,
 videos, and readings

---
 lib/schemas/scenario_schema.xsd      | 33 +++++++++++++++++++++++++++-
 scenarios/examples/cybok_example.xml |  1 -
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/lib/schemas/scenario_schema.xsd b/lib/schemas/scenario_schema.xsd
index f48d8f537..440a9bdab 100644
--- a/lib/schemas/scenario_schema.xsd
+++ b/lib/schemas/scenario_schema.xsd
@@ -12,8 +12,11 @@
         <xs:element name="description" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="type" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         <xs:element name="difficulty" type="xs:string" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="CyBOK" type="CyBOKType" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="video" type="VideoType" minOccurs="0" maxOccurs="unbounded" />
+        <xs:element name="reading" type="ReadingType" minOccurs="0" maxOccurs="unbounded" />
 
-        <xs:element name='system' type='SystemType' minOccurs='1' maxOccurs='unbounded' />
+        <xs:element name='system' type='SystemType' minOccurs='0' maxOccurs='unbounded' />
       </xs:sequence>
     </xs:complexType>
   </xs:element>
@@ -37,6 +40,34 @@
     <xs:attribute name='unique_module_list' type='xs:string'/>
 
   </xs:complexType>
+
+  <xs:complexType name="CyBOKType">
+    <xs:sequence>
+      <xs:element name="topic" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="keyword" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
+    </xs:sequence>
+    <xs:attribute name='KA' type='xs:string'/>
+  </xs:complexType>
+
+  <xs:complexType name="VideoType">
+    <xs:sequence>
+      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="description" type="xs:string" minOccurs="1" maxOccurs="unbounded"/>
+      <xs:element name="CyBOK" type="CyBOKType" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name='KA' type='xs:string'/>
+  </xs:complexType>
+
+  <xs:complexType name="ReadingType">
+    <xs:sequence>
+      <xs:element name="url" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="title" type="xs:string" minOccurs="1" maxOccurs="1"/>
+      <xs:element name="CyBOK" type="CyBOKType" minOccurs="0" maxOccurs="unbounded" />
+    </xs:sequence>
+    <xs:attribute name='KA' type='xs:string'/>
+  </xs:complexType>
+
   <xs:complexType name="SystemType">
     <xs:sequence>
       <xs:element name="system_name" minOccurs="1" maxOccurs="1">
diff --git a/scenarios/examples/cybok_example.xml b/scenarios/examples/cybok_example.xml
index fc6b1bda9..8fd05f159 100644
--- a/scenarios/examples/cybok_example.xml
+++ b/scenarios/examples/cybok_example.xml
@@ -14,7 +14,6 @@
 	<type>lab-sheet</type>
 	<difficulty>easy</difficulty>
 
-
 	<CyBOK KA="AAA">
 		<topic>Authorisation</topic>
 		<keyword>access control</keyword>