Merge branch 'RDM-2020-0026-SDT_4_0_–_Introducing_Referenced_SubDevices' into...

Merge branch 'RDM-2020-0026-SDT_4_0_–_Introducing_Referenced_SubDevices' into WI-0081-Smart_Device_Template_4_0

# Conflicts:
#	SDT/schema4.0/docs/SDT_UML.uxf
#	SDT/schema4.0/docs/images/SDT_UML_Basic_Elements.png
#	SDT/schema4.0/docs/images/SDT_simplified.png
#	SDT/schema4.0/docs/images/SubDevice.png

SDT/schema4.0/docs/SDT_UML.uxf

@@ -381,7 +381,7 @@ fontsize=12</panel_attributes>
       <x>72</x>
       <y>192</y>
       <w>184</w>
-      <h>128</h>
+      <h>144</h>
     </coordinates>
     <panel_attributes>Domain
 --
@@ -390,6 +390,7 @@ fontsize=12</panel_attributes>
 /- Doc : Doc/
 /* Imports/
 /* DataTypes : DataType/
+/* SubDevices : SubDevice/
 /* ModuleClasses : ModuleClass/
 /* DeviceClasses : DeviceClass/
 /* ProductClasses : ProductClass/
@@ -415,7 +416,7 @@ fontsize=12</panel_attributes>
       <x>336</x>
       <y>440</y>
       <w>176</w>
-      <h>120</h>
+      <h>128</h>
     </coordinates>
     <panel_attributes>SubDevice
 --
@@ -424,6 +425,7 @@ fontsize=12</panel_attributes>
 /@ minOccurs : text = "1"/
 /@ maxOccurs : text = "1"/
 /- Doc : Doc/
+/- Extend : Extend/
 /* Properties : Property/
 /* ModuleClasses : ModuleClass/
 fg=blue</panel_attributes>
@@ -1009,14 +1011,14 @@ fg=blue</panel_attributes>
     <id>Relation</id>
     <coordinates>
       <x>248</x>
-      <y>304</y>
+      <y>288</y>
       <w>104</w>
-      <h>56</h>
+      <h>72</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 m1=0..n
 fontsize=12</panel_attributes>
-    <additional_attributes>110.0;40.0;60.0;40.0;60.0;10.0;10.0;10.0</additional_attributes>
+    <additional_attributes>110.0;60.0;60.0;60.0;60.0;10.0;10.0;10.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
@@ -1046,4 +1048,17 @@ bg=gray
 lw=0.1</panel_attributes>
     <additional_attributes/>
   </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>248</x>
+      <y>304</y>
+      <w>104</w>
+      <h>168</h>
+    </coordinates>
+    <panel_attributes>lt=&lt;.
+m1=0..n
+fontsize=12</panel_attributes>
+    <additional_attributes>110.0;180.0;50.0;180.0;50.0;10.0;10.0;10.0</additional_attributes>
+  </element>
 </diagram>

SDT/schema4.0/etc/domain.rnc

@@ -17,6 +17,7 @@ Domain =
     element Imports { Domain+ }?,
     element DataTypes { DataTypeDef+ }?,
     ModuleClassesDef?,
+    SubDevicesRef?,
     DeviceClassesDef?,
     ProductClassesDef?
   }
@@ -112,6 +113,7 @@ SubDevicesRef =
       attribute minOccurs { text }?,
       attribute maxOccurs { text }?,
       DocDef,
+      ExtendDef?,
       PropertiesDef?,
       ModuleClassesDef?
     }+

SDT/schema4.0/src/domain.rng

@@ -51,6 +51,9 @@
 			<optional>
 				<ref name="ModuleClassesDef"/>
 			</optional>
+			<optional>
+				<ref name="SubDevicesRef" />
+			</optional>
 			<optional>
 				<ref name="DeviceClassesDef" />
 			</optional>
@@ -325,6 +328,9 @@
 						</attribute>
 					</optional>
 					<ref name="DocDef"/>
+					<optional>
+						<ref name="ExtendDef" />
+					</optional>
 					<optional>
 						<ref name="PropertiesDef"/>
 					</optional>

SDT/schema4.0/src/domain.xsd

@@ -23,6 +23,7 @@
             <xs:element minOccurs="0" ref="Imports"/>
             <xs:element minOccurs="0" ref="DataTypes"/>
             <xs:element minOccurs="0" ref="ModuleClasses"/>
+            <xs:element minOccurs="0" ref="SubDevices"/>
             <xs:element minOccurs="0" ref="DeviceClasses"/>
             <xs:element minOccurs="0" ref="ProductClasses"/>
           </xs:sequence>
@@ -242,6 +243,7 @@
       <xs:complexContent>
         <xs:extension base="DocDef">
           <xs:sequence>
+            <xs:element minOccurs="0" ref="Extend"/>
             <xs:element minOccurs="0" ref="Properties"/>
             <xs:element minOccurs="0" ref="ModuleClasses"/>
           </xs:sequence>

SDT/schema4.0/test/subdevices-test.xml

+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Test the data types references -->
+
+<Domain id="subdevices-test" xmlns="http://www.onem2m.org/xml/sdt/4.0" xmlns:xi="http://www.w3.org/2001/XInclude">
+	<SubDevices>
+		<SubDevice id="aSubDevice">
+			<ModuleClasses>
+				<ModuleClass name="aModuleClass">
+					<Data>
+						<DataPoint name="aDataPoint">
+							<DataType>
+								<SimpleType type="boolean" />
+							</DataType>
+						</DataPoint>
+					</Data>
+				</ModuleClass>
+			</ModuleClasses>
+		</SubDevice>
+	</SubDevices>
+
+	<DeviceClasses>
+		<DeviceClass id="aDeviceClass">
+			<SubDevices>
+				<SubDevice id="subDevice">
+					<Extend domain="subdevices-test" entity="aSubDevice" />
+				</SubDevice>
+			</SubDevices>
+		</DeviceClass>
+	</DeviceClasses>
+</Domain>
\ No newline at end of file