Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
150 commits
Select commit Hold shift + click to select a range
63401cf
Add the raml and json-schema files from the oic core spec.
stephanesan Feb 12, 2016
a34483c
dos2unix.
stephanesan Feb 12, 2016
e635f68
Changed the '©' in the JSON to 'Copyright (c)'.
stephanesan Feb 12, 2016
dfda502
Changed the '©' in the JSON to 'Copyright (c)'.
stephanesan Feb 12, 2016
63c40e4
oic.core resolve $ref.
stephanesan Feb 13, 2016
857e804
Merge pull request #1 from stephanesan/api_core
stephanesan Feb 13, 2016
0c13ff8
Refactoring work for adding directory structure to schemas.
stephanesan Mar 7, 2016
8c73c87
Refactor: continued teh rename *.json -> *-schema.json
stephanesan Mar 7, 2016
dd79a69
Also refactor id's that were not terminated with .json
stephanesan Mar 7, 2016
27c2fbb
Fix dual documentation declaration in rdpublish.raml.
stephanesan Mar 7, 2016
3f099d7
include legal notice from external file.
stephanesan Mar 8, 2016
7ba5cf3
repair rdpublish which was messed up with previous commit.
stephanesan Mar 8, 2016
e28a9e0
Test splitting legal content in seperate files.
stephanesan Mar 18, 2016
4b7c073
Implemented ocf lawyer's recommendation.
stephanesan Mar 22, 2016
c903c1e
Replace all OIC occurences by OCF in legal content.
stephanesan Mar 22, 2016
66b9872
All schemas id's include the 'schemas' folder and same document ref.
stephanesan Mar 24, 2016
424db30
Merge pull request #1 from stephanesan/refactor
stephanesan Mar 24, 2016
64fd9f0
Align schemas to OIC v1.1 changes
rabardini May 2, 2016
cd51efe
Merge pull request #2 from rabardini/refactor
stephanesan May 2, 2016
afe245e
Merge pull request #1 from openconnectivityfoundation/refactor
rabardini May 2, 2016
d70b817
Merge pull request #2 from rabardini/refactor
rabardini May 2, 2016
c74dc11
Merge pull request #3 from rabardini/master
stephanesan May 2, 2016
03ce288
v1.1.0
rabardini Jun 23, 2016
7d25b44
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Jun 23, 2016
aeff95d
Merge pull request #4 from rabardini/master
stephanesan Jun 23, 2016
7134324
v1.1.0 - Added Pattern
rabardini Jul 8, 2016
add7b4c
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Jul 8, 2016
6a02007
Merge pull request #5 from rabardini/master
rabardini Jul 8, 2016
df3b50f
v1.1.0 - Fixed pattern syntax for mndt property. Added format for all…
rabardini Jul 12, 2016
26780a7
v1.1.0 - Fixed pattern syntax for mndt property. Added format for all…
rabardini Jul 12, 2016
22d1117
Merge pull request #6 from rabardini/master
rabardini Jul 12, 2016
59f96f1
Add readOnly property where appropriate in the json schema's.
stephanesan Jul 22, 2016
4b100b4
Change the id to comply with the OCF API design guidelines.
stephanesan Aug 4, 2016
30ce83c
The json schema format uuid is not a valid schema definition.
stephanesan Aug 5, 2016
4f8354c
Fix validator issue with the bm definition.
stephanesan Aug 5, 2016
bccda4e
Merge pull request #7 from stephanesan/ro
stephanesan Sep 1, 2016
8fc6527
Merge pull request #9 from stephanesan/refactor
stephanesan Sep 1, 2016
c49904c
Merge branch 'fix_uuid_format_issue' of https://github.com/stephanesa…
stephanesan Sep 1, 2016
3ec63de
Merge branch 'stephanesan-fix_uuid_format_issue'
stephanesan Sep 1, 2016
01f205c
Merge pull request #11 from stephanesan/fix_bm_error
stephanesan Sep 1, 2016
579e7cb
Fix for excluding mndt format
SiMet Sep 7, 2016
a370b8b
Add some missing readOnly properties.
stephanesan Sep 12, 2016
ff804fc
Remove ReadOnly from the description.
stephanesan Sep 12, 2016
23f27a7
Add some missing readOnly properties.
stephanesan Sep 12, 2016
cb2c1f1
Update oic.wk.p-schema.json
SiMet Sep 14, 2016
eafd608
Move the date definition into the oic.types file.
stephanesan Sep 14, 2016
c8b403f
Merge pull request #13 from stephanesan/fix_missing_ro_properties
rabardini Sep 23, 2016
ded74de
Removed ReadOnly from Description
rabardini Sep 23, 2016
af20365
Merge branch 'master' of github.com:stephanesan/core into fix_date_fo…
stephanesan Sep 23, 2016
02346f4
Fix for not resolved merge
SiMet Sep 27, 2016
df24d6c
Merge pull request #16 from SiMet/patch-2
stephanesan Sep 27, 2016
0dd2b65
Merge pull request #15 from stephanesan/fix_date_format
rabardini Sep 28, 2016
9f20da5
Merge remote-tracking branch 'refs/remotes/openconnectivityfoundation…
rabardini Sep 28, 2016
e7193cb
Merge remote-tracking branch 'refs/remotes/origin/master' into openco…
rabardini Sep 29, 2016
4f1c1b5
v1.1.1
rabardini Sep 29, 2016
c9e7994
v1.1.1
rabardini Sep 29, 2016
01794be
Merge pull request #17 from rabardini/master
rabardini Sep 29, 2016
17a8ef7
Editoral fix to v1.1.1
rabardini Sep 30, 2016
240e869
Merge pull request #18 from rabardini/master
rabardini Sep 30, 2016
88134ba
Fix validation errors in examples of oic.wk.col.raml
stephanesan Oct 3, 2016
7ae50fd
Remove files that will not be part of the OIC 1.1 release.
stephanesan Oct 7, 2016
cc61e7d
Update oic.wk.p-schema.json
marktrayer Oct 11, 2016
6c4e123
Merge pull request #19 from stephanesan/fix_collections
rabardini Oct 11, 2016
af4292e
Merge pull request #24 from marktrayer/patch-2
rabardini Oct 11, 2016
f1ad1c8
Merge pull request #21 from stephanesan/CR58
rabardini Oct 11, 2016
4d300a0
Merge pull request #2 from openconnectivityfoundation/master
rabardini Oct 11, 2016
ad4cc12
Fix date format and collection syntax errrors
rabardini Oct 11, 2016
016eb70
Syntx error in examples corrected
rabardini Oct 11, 2016
75a9782
Merge pull request #25 from rabardini/master
rabardini Oct 11, 2016
4aaa3f7
Removed the link tag and added "rep" keyword
mjkoster Oct 24, 2016
5ac587f
Make "rel" an array
mjkoster Oct 24, 2016
80067a5
updated di and ins UUID
mjkoster Oct 30, 2016
b6a0105
fix typo in JSON
mjkoster Oct 30, 2016
23470b0
remove readonly json property from link parameter definitions
mjkoster Oct 31, 2016
d7a2f64
Merge pull request #26 from mjkoster/master
rabardini Nov 9, 2016
08f9a6d
Fix for invalid json schema
SiMet Nov 10, 2016
f69485f
Fix allOf section in oic.collection-schema.json
SiMet Nov 10, 2016
5b1d3a0
Merge pull request #27 from SiMet/patch-3
rabardini Nov 10, 2016
19ef394
Merge pull request #28 from SiMet/patch-4
rabardini Nov 10, 2016
9004b6e
Merge remote-tracking branch 'openconnectivityfoundation/master'
mjkoster Nov 15, 2016
f9d3f33
Update oic.oic-link schema
mjkoster Nov 15, 2016
e37baa3
change the batch update payload to match the batch retrieve payload
mjkoster Nov 15, 2016
d87fb8b
set additionalproperties to true
mjkoster Nov 15, 2016
7003176
Merge pull request #29 from mjkoster/master
rabardini Nov 16, 2016
e644e54
fix the example in oic.wk.col.raml
mjkoster Nov 17, 2016
864f38b
Fix for invalid json of oic.oic-link-schema.json
SiMet Nov 17, 2016
2350ee1
remove bp from link attributes
mjkoster Nov 17, 2016
9cbf77b
update oic.if.ll schema for OIC 1.1
mjkoster Nov 28, 2016
84e48ae
update the example in oic.wk.col.raml
mjkoster Nov 29, 2016
74780cf
Merge pull request #30 from SiMet/patch-5
rabardini Nov 29, 2016
a7f0c0a
Merge pull request #31 from mjkoster/master
rabardini Nov 29, 2016
857ea0e
Merge remote-tracking branch 'openconnectivityfoundation/master'
mjkoster Nov 30, 2016
183c0de
Merge remote-tracking branch 'openconnectivityfoundation/master'
mjkoster Nov 30, 2016
c806461
update /oic/res definition
mjkoster Dec 2, 2016
663e0c2
fix oic.if.ll to align with test conditions
mjkoster Dec 3, 2016
1b73f8f
Merge pull request #35 from mjkoster/master
rabardini Dec 5, 2016
5580607
Update oic.wk.ping.raml
dwarkadayama Jan 13, 2017
44dbf09
OCF 1.0 Updates
rabardini Feb 15, 2017
9cc7936
Bugzilla1456-InterfaceSupportfor-/oic/mnt
marktrayer Feb 17, 2017
2f26684
Update oic.wk.mnt-schema.json
marktrayer Feb 17, 2017
d75c2d6
Update oic.wk.mnt-schema.json
marktrayer Feb 17, 2017
d7e4fe2
Update oic.wk.mnt.raml
marktrayer Feb 17, 2017
55d5041
Update oic.wk.mnt.raml
marktrayer Feb 20, 2017
2126a73
Update oic.wk.mnt.raml
marktrayer Feb 21, 2017
41b237c
Merge pull request #37 from dwarkadayama/patch-1
rabardini Feb 22, 2017
5c29375
Merge pull request #38 from rabardini/master
rabardini Feb 22, 2017
cd314dd
Merge pull request #39 from openconnectivityfoundation/Bugzilla1456
rabardini Feb 22, 2017
2ed7eba
Merge pull request #1 from openconnectivityfoundation/master
rabardini Feb 27, 2017
7c76b06
Updates for Pull Request #38
rabardini Feb 27, 2017
36e825a
Merge pull request #40 from rabardini/master
rabardini Feb 27, 2017
b4c7f92
Merge pull request #41 from rabardini/master
rabardini Feb 28, 2017
37a04af
Update oic.core-schema.json
marktrayer Feb 28, 2017
f758e6a
Update oic.wk.con.raml
marktrayer Feb 28, 2017
56286e5
Rework of name Common Property to be updatable via baseline.
marktrayer Mar 1, 2017
7aee791
Remove erroneous schema
marktrayer Mar 2, 2017
0f229a3
Use oic.if.rw for Common Property UPDATE.
marktrayer Mar 3, 2017
ddc243c
Fixes bugs #1187, #1211, #1463, #1483
rabardini Mar 6, 2017
a8809eb
Merge pull request #43 from openconnectivityfoundation/Bugzilla-1456-…
rabardini Mar 7, 2017
37c9252
Merge pull request #44 from rabardini/master
rabardini Mar 7, 2017
fd85fa9
Merge pull request #2 from openconnectivityfoundation/master
rabardini Mar 7, 2017
c4b8d4b
Add new icon Resource, Increase "dmv" string length
rabardini Mar 10, 2017
472ada3
Merge pull request #45 from rabardini/master
rabardini Mar 10, 2017
44e7f7a
Update the copyright for icon.raml
rabardini Mar 10, 2017
44a6e54
Merge pull request #46 from rabardini/master
rabardini Mar 10, 2017
51fe173
Change icon mediaType property name to mediatype
rabardini Mar 10, 2017
7ba62c7
Merge pull request #47 from rabardini/master
rabardini Mar 10, 2017
7b86878
Cleanup of schema errors identified by raml2doc
marktrayer Mar 15, 2017
1bdf488
Updates to align language support to the specification text
rabardini Mar 16, 2017
f474188
Merge branch 'IPR-Review-Cleanup' into master
marktrayer Mar 16, 2017
1d9ef9a
Merge pull request #50 from rabardini/master
marktrayer Mar 16, 2017
92b6d67
Fixed /oic/res resource files to align with specification text
rabardini Mar 16, 2017
ff26ae1
Revert "Fixed /oic/res resource files to align with specification text"
rabardini Mar 16, 2017
ad0a1ec
Revert "Revert "Fixed /oic/res resource files to align with specifica…
rabardini Mar 16, 2017
515584f
Merge pull request #52 from rabardini/master
marktrayer Mar 16, 2017
dbb602b
Cleanup of RAML and JSON to address errors identified by raml2doc
marktrayer Mar 16, 2017
69a92d9
Including changes from Richard.
marktrayer Mar 16, 2017
4cdff99
Correct the id in the schema for oic.r.icon
marktrayer Mar 17, 2017
3507cef
Adding introspection JSON and RAML (after cleanup)
marktrayer Mar 17, 2017
118232d
Adding JSON and RAML for introspection
marktrayer Mar 17, 2017
38085c8
Merge pull request #3 from openconnectivityfoundation/IPR-Review-Cleanup
rabardini Mar 17, 2017
e06e1c6
Correct errors in scene.raml
marktrayer Mar 18, 2017
5953675
Merge pull request #4 from openconnectivityfoundation/IPR-Review-Cleanup
rabardini Mar 18, 2017
f3e8966
Fix for bug #1548 [Editorial]
rabardini Mar 23, 2017
fc16453
Revert "Fix for bug #1548 [Editorial]"
rabardini Mar 23, 2017
9d37275
Fixed bug #1548 [Editorial]
rabardini Mar 23, 2017
ef9d686
Fixed Bug #1548 [Editorial]
rabardini Mar 23, 2017
8a9f1d0
Merge pull request #54 from rabardini/master
rabardini Mar 23, 2017
d0fde8b
Merge pull request #48 from openconnectivityfoundation/IPR-Review-Cle…
marktrayer Mar 23, 2017
359e5a5
Update introspection-resource.raml
WAvdBeek Mar 23, 2017
77d1a32
Update introspection-resource.raml
WAvdBeek Mar 24, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DISCLAIMER.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
THIS SOFTWARE IS PROVIDED BY THE OPEN CONNECTIVITY FOUNDATION, INC. "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR WARRANTIES OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE OPEN CONNECTIVITY FOUNDATION, INC. 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.
3 changes: 3 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
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.
43 changes: 43 additions & 0 deletions icon.raml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
#%RAML 0.8
title: OICIcon
version: v1.1.0-20161107
documentation:
- title: OCF Copyright
content: Copyright (c) 2016, 2017 Open Connectivity Foundation, Inc. All rights reserved.
- title: OCF License
content: !include LICENSE.md
- title: OCF Disclaimer
content: !include DISCLAIMER.md
schemas:
- Icon: !include schemas/oic.r.icon-schema.json

traits:
- interface:
queryParameters:
if:
enum: ["oic.if.r","oic.if.baseline"]

/IconResURI:
description: |
This resource describes the attributes associated with an Icon.

displayName: Icon
is: [ interface ] # valid for all methods

get:
description: |
Retrieves the current icon properties.
responses:
200:
body:
application/json:
schema: Icon
example: |
{
"rt": ["oic.r.icon"],
"id": "unique_example_id",
"mimetype": "image/png",
"width": 256,
"height": 256,
"media": "http://findbetter.ru/public/uploads/1481662800/2043.png"
}
290 changes: 290 additions & 0 deletions introspection-resource.raml
Original file line number Diff line number Diff line change
@@ -0,0 +1,290 @@
#%RAML 0.8
title: OICIntrospection
version: v1.0.0-20160707
documentation:
- title: Copyright (c) 2016 Open Connectivity Foundation, Inc. All rights reserved.
content: |
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
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.

THIS SOFTWARE IS PROVIDED BY THE OPEN INTERCONNECT CONSORTIUM, INC. "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE OR WARRANTIES OF NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE OPEN INTERCONNECT CONSORTIUM, INC. 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.

traits:
- interface:
queryParameters:
if:
enum: [ "oic.if.r", "oic.if.baseline"]

schemas:
- oic.wk.introspectionInfo: !include schemas/oic.wk.introspectionInfo.json

/IntrospectionResURI:
description: |
This resource provides the means to get the device introspection data specifiying all the endpoints of the device.
The url hosted by this resource is either a local or an external url.

displayName: Introspection Resource
is: [ interface ] # valid for all methods

get:
responses:
200:
body:
application/json:
schema: oic.wk.introspectionInfo
example: |
{
"rt" : ["oic.wk.introspection"],
"urlInfo" : [
{
"content-type" : "application/cbor",
"protocol" : "coap",
"url" : "/IntrospectionExampleURI"
}
]
}


/IntrospectionExampleURL:
description: |
The example is an actual Swagger 2.0 file that would be hosted by the endpoint.

displayName: Introspection URL Example Swagger 2.0 File

get:
responses:
200:
body:
application/json:
example: |
{
"swagger": "2.0",
"info": {
"title": "my_example_device",
"version": "my device version"
},
"schemes": [
"http"
],
"consumes": [
"application/json"
],
"produces": [
"application/json"
],
"paths": {
"/switch": {
"get": {
"parameters": [
{
"name": "if",
"in": "query",
"description": "",
"enum": [ "oic.if.a","oic.if.baseline" ],
"type": "string"
}
],
"responses": {
"200" : {
"description" : "",
"schema" : {
"$ref": "#/definitions/BinarySwitch"
}
}
}
},
"post": {
"parameters": [
{
"name": "if",
"in": "query",
"description": "",
"enum": [ "oic.if.a","oic.if.baseline" ],
"type": "string"
},
{
"name": "body",
"in": "body",
"required": false,
"schema" : {
"$ref": "#/definitions/BinarySwitch"
}
}
],
"responses": {
"200" : {
"description" : "",
"schema" : {
"$ref": "#/definitions/BinarySwitch"
}
}
}
}
},
"/brightness": {
"get": {
"parameters": [
{
"name": "if",
"in": "query",
"description": "",
"enum": [ "oic.if.a","oic.if.baseline" ],
"type": "string"
}
],
"responses": {
"200" : {
"description" : "",
"schema" : {
"$ref": "#/definitions/Brightness"
}
}
}
},
"post": {
"parameters": [
{
"name": "if",
"in": "query",
"description": "",
"enum": [ "oic.if.a","oic.if.baseline" ],
"type": "string"
},
{
"name": "body",
"in": "body",
"required": false,
"schema" : {
"$ref": "#/definitions/Brightness"
}
}
],
"responses": {
"200" : {
"description" : "",
"schema" : {
"$ref": "#/definitions/Brightness"
}
}
}
}
}
},
"definitions": {
"BinarySwitch": {
"type": "object",
"required": ["id"],
"properties": {
"value": {
"type": "boolean",
"description": "Status of the switch"
},
"rt": {
"type": "array",
"items" : [
{
"type" : "string",
"maxLength": 64
}
],
"minItems" : 1,
"description": "Resource Type",
"readOnly" : true,
"default" : [ "oic.r.switch.binary" ]
},
"if": {
"type": "array",
"description": "The interface set supported by this resource",
"readOnly" : true,
"items": {
"type": "string",
"enum": ["oic.if.baseline","oic.if.a"]
}
},
"p": {
"type": "integer",
"description": "Bitmap indicating observable and discoverable",
"readOnly" : true
},
"n": {
"type": "string",
"description": "Friendly name of the resource",
"readOnly" : true
},
"id": {
"type": "string",
"description": "Instance ID of this specific resource",
"readOnly" : true
},
"range": {
"type": "array",
"description": "The valid range for the value Property",
"readOnly" : true,
"minItems": 2,
"maxItems": 2,
"items": {
"type": "number"
}
}
}
},
"Brightness": {
"type": "object",
"required": ["id"],
"properties": {
"brighness": {
"type": "integer",
"description": "Current sensed or set value for Brightness"
},
"rt": {
"type": "array",
"items" : [
{
"type" : "string",
"maxLength": 64
}
],
"minItems" : 1,
"description": "Resource Type",
"readOnly" : true,
"default" : [ "oic.r.light.brightness" ]
},
"if": {
"type": "array",
"description": "The interface set supported by this resource",
"readOnly" : true,
"items": {
"type": "string",
"enum": ["oic.if.baseline","oic.if.a"]
}
},
"p": {
"type": "integer",
"description": "Bitmap indicating observable and discoverable",
"readOnly" : true
},
"n": {
"type": "string",
"description": "Friendly name of the resource",
"readOnly" : true
},
"id": {
"type": "string",
"description": "Instance ID of this specific resource",
"readOnly" : true
},
"range": {
"type": "array",
"description": "The valid range for the value Property",
"readOnly" : true,
"minItems": 2,
"maxItems": 2,
"items": {
"type": "number"
}
}
}
}
}
}
Loading