RAML v1.1 sync-up in SVR DB

[platform/upstream/iotivity.git] / resource / csdk / stack / samples / linux / secure / oic_svr_db_server.json

diff --git a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
index 01b18f2..63228b6 100644 (file)
--- a/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
+++ b/resource/csdk/stack/samples/linux/secure/oic_svr_db_server.json
@@ -1,113 +1,105 @@
 {
-    "acl": [
-        {
-            "subject": "Kg==",
-            "resources": [
-                "/oic/res",
-                "/oic/d",
-                "/oic/p",
-                "/oic/res/types/d",
-                "/oic/ad",
-                "/oic/sec/acl",
-                "/oic/sec/amacl"
-                       ],
-                       "permission": 2,
-                       "rowners" : ["MTExMTExMTExMTExMTExMQ=="]
-               },
-        {
-            "subject": "Kg==",
-            "resources": [
-                "/oic/sec/doxm",
-                "/oic/sec/pstat"
-             ],
-             "permission": 2,
-             "rowners" : ["MTExMTExMTExMTExMTExMQ=="]
-        },
-        {
-            "subject": "MjIyMjIyMjIyMjIyMjIyMg==",
-            "resources": ["/oic/sec/acl",
-                      "/oic/sec/cred"],
-            "permission": 8,
-            "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-        },
-        {
-            "subject": "MjIyMjIyMjIyMjIyMjIyMg==",
-            "resources": ["/a/led"],
-            "permission": 6,
-            "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-        },
-        {
-            "subject": "MTExMTIyMjIzMzMzNDQ0NA==",
-            "resources": ["/a/led"],
-            "permission": 6,
-            "periods" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],
-            "recurrence" : ["FREQ=DAILY; BYDAY=MO, WE, FR", "FREQ=DAILY; BYDAY=TU, TH; UNTIL=20160630"],
-            "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-        },
-        {
-            "subject": "Nzc3Nzc3Nzc3Nzc3Nzc3Nw==",
-            "resources": ["/a/led"],
-            "permission": 6,
-            "periods" : ["20150630T060000/20150630T220000"],
-            "recurrence" : ["FREQ=DAILY; UNTIL=20150630"],
-            "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-        }
-       ],
-       "amacl": [{
-               "resources" : ["/a/led"],
-               "amss" : ["MTkxOTE5MTkxOTE5MTkxOQ=="],
-               "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       }],
-       "pstat":        {
-               "isop": true,
-               "deviceid":     "ZGV2aWNlaWQAAAAAABhanw==",
-               "ch": 0,
-               "cm":   0,
-               "tm":   0,
-               "om":   3,
-               "sm":   [3]
-       },
-       "doxm": {
-               "oxm":  [0],
-               "oxmsel": 0,
-               "sct": 1,
-               "owned": true,
-               "deviceid":     "MTExMTExMTExMTExMTExMQ==",
-               "devowner":     "YWRtaW5EZXZpY2VVVUlEAA=="
-       },
-    "cred":    [{
-               "credid": 1,
-               "subjectid": "MjIyMjIyMjIyMjIyMjIyMg==",
-               "credtype": 1,
-               "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
-        "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       },
-       {
-           "credid": 2,
-           "subjectid": "MTExMTIyMjIzMzMzNDQ0NA==",
-           "credtype": 1,
-           "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
-        "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       },
+       "acl": 
        {
-           "credid": 3,
-           "subjectid": "Nzc3Nzc3Nzc3Nzc3Nzc3Nw==",
-           "credtype": 1,
-           "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
-        "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       },
+               "aclist": 
+               {
+                       "aces": 
+                       [
+                               {
+                                       "subject": "*", 
+                                       "resources": 
+                                       [
+                                               {"href": "/oic/res", "rt": "", "if": ""},
+                                               {"href": "/oic/res/d", "rt": "", "if": ""}, 
+                                               {"href": "/oic/res/types/d", "rt": "", "if": ""}, 
+                                               {"href": "/oic/ad", "rt": "", "if": ""}, 
+                                               {"href": "/oic/sec/acl", "rt": "", "if": ""}, 
+                                               {"href": "/oic/sec/amacl", "rt": "", "if": ""}
+                                       ], 
+                                       "permission": 2
+                               }, 
+                               {
+                                       "subject": "*", 
+                                       "resources": 
+                                       [
+                                               {"href": "/oic/sec/doxm", "rt": "", "if": ""}, 
+                                               {"href": "/oic/sec/pstat", "rt": "", "if": ""}
+                                       ], 
+                                       "permission": 2
+                               },
+                               {
+                                       "subject": "32323232-3232-3232-3232-323232323232", 
+                                       "resources": 
+                                       [
+                                               {"href": "/oic/sec/acl", "rt": "", "if": ""}, 
+                                               {"href": "/oic/sec/cred", "rt": "", "if": ""}
+                                       ], 
+                                       "permission": 8
+                               },
+                               {
+                                       "subject": "31313131-3232-3232-3333-333334343434", 
+                                       "resources": 
+                                       [
+                                               {"href": "/a/led", "rt": "", "if": ""}
+                                       ], 
+                                       "permission": 6,
+          "period" : ["20150630T060000/20150630T220000", "20150630T060000/20150630T200000"],
+          "recurrence" : ["FREQ=DAILY; BYDAY=MO, WE, FR", "FREQ=DAILY; BYDAY=TU, TH; UNTIL=20160630"]
+                               },
+                               {
+                                       "subject": "37373737-3737-3737-3737-373737373737", 
+                                       "resources": 
+                                       [
+                                               {"href": "/a/led", "rt": "", "if": ""}
+                                       ], 
+                                       "permission": 6,
+          "period" : ["20150630T060000/20150630T220000"],
+          "recurrence" : ["FREQ=DAILY; UNTIL=20150630"]
+                               }
+                       ]
+               }, 
+               "rownerid": "31313131-3131-3131-3131-313131313131"
+       }, 
+
+       "pstat": 
        {
-           "credid": 4,
-           "subjectid": "NDQ0NDMzMzMyMjIyMTExMQ==",
-           "credtype": 1,
-           "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
-        "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       },
+               "isop": true, 
+               "deviceid": "31313131-3131-3131-3131-313131313131", 
+               "cm": 0, 
+               "tm": 0, 
+               "om": 3, 
+               "sm": [3], 
+               "rownerid": "31313131-3131-3131-3131-313131313131"
+       }, 
+       
+       "doxm":
        {
-           "credid": 5,
-           "subjectid": "MTkxOTE5MTkxOTE5MTkxOQ==",
-           "credtype": 1,
-           "privatedata": "QkJCQkJCQkJCQkJCQkJCQg==",
-        "rowners" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
-       }]
-}
+               "oxms": [0], 
+               "oxmsel": 0, 
+               "sct": 1, 
+               "owned": true, 
+               "didformat": 0, 
+               "deviceid": "31313131-3131-3131-3131-313131313131", 
+               "devownerid": "32323232-3232-3232-3232-323232323232", 
+               "rownerid": "31313131-3131-3131-3131-313131313131"
+       }, 
+       "cred": 
+       [
+               {
+                       "credid": 1,
+                       "subject": "MjIyMjIyMjIyMjIyMjIyMg==",
+                       "credtype": 1,
+                       "period": "20150630T060000/20990920T220000",
+                       "privatedata": "QUFBQUFBQUFBQUFBQUFBQQ==",
+      "ownrs" : ["MjIyMjIyMjIyMjIyMjIyMg=="]
+               },
+               {
+                       "credid": 2,
+                       "subject": "MTkxOTE5MTkxOTE5MTkxOQ==",
+                       "credtype": 1,
+                       "period": "20150630T060000/20990920T220000",
+                       "privatedata": "QkJCQkJCQkJCQkJCQkJCQg==",
+      "ownrs" : ["MTkxOTE5MTkxOTE5MTkxOQ=="]
+               }
+       ]
+}
\ No newline at end of file