Skip to content

Commit 5876f4e

Browse files
mkgillmoremkgillmore
authored
Merge pull request OpenMobileAlliance#154 from OpenMobileAlliance/jpradocueva-patch-1
[TU] Submission of ObjeID 10300 on behalf of TU --- Group agrees to merge 6/6/2019
2 parents 11959e2 + 704c35b commit 5876f4e

File tree

2 files changed

+148
-4
lines changed

2 files changed

+148
-4
lines changed

‎10300.xml

+142
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<!--
4+
5+
Copyright 2019 Tampere University.
6+
7+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
8+
9+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
10+
11+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
12+
13+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14+
15+
For more information about this object, please contact [email protected]
16+
17+
-->
18+
19+
<LWM2M xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.openmobilealliance.org/tech/profiles/LWM2M.xsd">
20+
<Object ObjectType="MODefinition">
21+
<Name>LWM2M Meta Object</Name>
22+
<Description1>
23+
<![CDATA[
24+
Use this meta object to provide one or more locations hosting XML data
25+
model definitions for reusable or private and vendor-specific devices,
26+
such as those in the range 26241-42768.
27+
]]>
28+
</Description1>
29+
<ObjectID>10300</ObjectID>
30+
<ObjectURN>urn:oma:lwm2m:x:10300</ObjectURN>
31+
<LWM2MVersion>1.0</LWM2MVersion>
32+
<ObjectVersion>1.0</ObjectVersion>
33+
<MultipleInstances>Multiple</MultipleInstances>
34+
<Mandatory>Optional</Mandatory>
35+
<Resources>
36+
<Item ID="0">
37+
<Name>ObjectID</Name>
38+
<Operations>R</Operations>
39+
<MultipleInstances>Single</MultipleInstances>
40+
<Mandatory>Mandatory</Mandatory>
41+
<Type>Integer</Type>
42+
<RangeEnumeration></RangeEnumeration>
43+
<Units></Units>
44+
<Description>
45+
<![CDATA[
46+
Object ID of the vendor-specific object. If a finer granularity is
47+
needed to identify the object (for example, Object IDs in the range
48+
26241 - 32768), the optional ObjectInstanceHandle resource can also be
49+
used.
50+
]]>
51+
</Description>
52+
</Item>
53+
<Item ID="1">
54+
<Name>ObjectURN</Name>
55+
<Operations>R</Operations>
56+
<MultipleInstances>Single</MultipleInstances>
57+
<Mandatory>Mandatory</Mandatory>
58+
<Type>String</Type>
59+
<RangeEnumeration></RangeEnumeration>
60+
<Units></Units>
61+
<Description>
62+
<![CDATA[
63+
Object URN of the vendor-specific object. URN-equivalence resolution
64+
must conform to Section 3 of RFC 8141.
65+
]]>
66+
</Description>
67+
</Item>
68+
<Item ID="4000">
69+
<Name>ObjectInstanceHandle</Name>
70+
<Operations>R</Operations>
71+
<MultipleInstances>Single</MultipleInstances>
72+
<Mandatory>Optional</Mandatory>
73+
<Type>Objlnk</Type>
74+
<RangeEnumeration></RangeEnumeration>
75+
<Units></Units>
76+
<Description>
77+
<![CDATA[The object link is used to refer an Instance of a given Object. An Object link value is composed of two concatenated 16-bits unsigned integers following the Network Byte Order convention. The Most Significant Halfword is an ObjectID, the Least Significant Hafword is an ObjectInstance ID.An Object Link referencing no Object Instance will contain the concatenation of 2 MAX-ID values (null link. Test 5]]>
78+
</Description>
79+
</Item>
80+
<Item ID="2">
81+
<Name>URI</Name>
82+
<Operations>R</Operations>
83+
<MultipleInstances>Multiple</MultipleInstances>
84+
<Mandatory>Mandatory</Mandatory>
85+
<Type>String</Type>
86+
<RangeEnumeration></RangeEnumeration>
87+
<Units></Units>
88+
<Description>
89+
<![CDATA[
90+
The full URI of the XML file containing the object definition of the
91+
vendor-specfic object. The URI must contain the scheme and authority
92+
components, and the URI syntax must conform to RFC 3986. If several
93+
alternative locations exist for the XML definition, multiple instances
94+
can be used, with each instance containing a single URI. In such
95+
cases, the URI selection is implementation-specific.
96+
]]>
97+
</Description>
98+
</Item>
99+
<Item ID="3">
100+
<Name>SHAType</Name>
101+
<Operations>R</Operations>
102+
<MultipleInstances>Single</MultipleInstances>
103+
<Mandatory>Optional</Mandatory>
104+
<Type>Integer</Type>
105+
<RangeEnumeration>0..8</RangeEnumeration>
106+
<Units></Units>
107+
<Description>
108+
<![CDATA[
109+
The Secure Hash Algorithm used to compute the message digest for the
110+
XML file in the URL(s). Currently defined values are "0" (no checksum
111+
used), "1" (for SHA224), "2" (for SHA256), "3" (for SHA384), "4" (for
112+
SHA512), "5" (SHA3-224), "6" (for SHA3-256), "7" (for SHA3-384) and
113+
"8" (for SHA3-512).
114+
]]>
115+
</Description>
116+
</Item>
117+
<Item ID="4">
118+
<Name>ChecksumValue</Name>
119+
<Operations>R</Operations>
120+
<MultipleInstances>Single</MultipleInstances>
121+
<Mandatory>Optional</Mandatory>
122+
<Type>String</Type>
123+
<RangeEnumeration></RangeEnumeration>
124+
<Units></Units>
125+
<Description>
126+
<![CDATA[
127+
If the SHAType value is "0" then this string must be ignored. If the
128+
SHAType value is 1-8, this field contains a hexadecimal encoded
129+
checksum value based on the SHA function used. Valid characters for
130+
the string are: 0123456789abcdef. The length of the string must
131+
correspond exactly to the respective digest. Otherwise, the value must
132+
be ignored and no SHA computation should be performed. For instance, a
133+
file containing "foo" as its content would have the following value
134+
for SHAType 1 (SHA224) as a 56 character string representing 224 bits:
135+
e7d5e36e8d470c3e5103fedd2e4f2aa5c30ab27f6629bdc3286f9dd2
136+
]]>
137+
</Description>
138+
</Item>
139+
</Resources>
140+
<Description2 />
141+
</Object>
142+
</LWM2M>

‎DDF.xml

+6-4
Original file line numberDiff line numberDiff line change
@@ -2896,12 +2896,14 @@ These LwM2M Object Resources MUST only be changed by a LwM2M Bootstrap-Server or
28962896
<Item>
28972897
<ObjectID>10300</ObjectID>
28982898
<URN>urn:oma:lwm2m:x:10300</URN>
2899-
<Name>Reserved</Name>
2900-
<Description>TBC</Description>
2901-
<Owner>TBC</Owner>
2899+
<Name>LWM2M Meta Object</Name>
2900+
<Description>Use this meta object to provide one or more locations hosting XML data
2901+
model definitions for reusable or private and vendor-specific devices,
2902+
such as those in the range 26241-42768.</Description>
2903+
<Owner>TAU</Owner>
29022904
<Source>2</Source>
29032905
<Ver>1.0</Ver>
2904-
<DDF></DDF>
2906+
<DDF>10300.xml</DDF>
29052907
<Vorto></Vorto>
29062908
<DDFLink>0</DDFLink>
29072909
<TS></TS>

0 commit comments

Comments
 (0)