From 22d015c9c028cc73a61f1328fb94741102fc3116 Mon Sep 17 00:00:00 2001
From: "saerome.kim" <saerome.kim@samsung.com>
Date: Wed, 13 Dec 2017 19:21:19 +0900
Subject: [PATCH] Enable MOT test sample - Enabled MOT sampleserver_justworks's
 SVR DB - Make sampleserver_justworks self-owning - Make
 sampleserver_justworks use fixed UUID

Signed-off-by: saerome.kim <saerome.kim@samsung.com>
---
 packaging/d2d-manager.spec            |   2 +-
 test/oic_svr_db_server_justworks.dat  | Bin 919 -> 1133 bytes
 test/oic_svr_db_server_justworks.json | 161 +++++++++++++++++++---------------
 test/sampleserver_justworks.cpp       |  17 +++-
 4 files changed, 102 insertions(+), 78 deletions(-)

diff --git a/packaging/d2d-manager.spec b/packaging/d2d-manager.spec
index 455b07e..33baedb 100644
--- a/packaging/d2d-manager.spec
+++ b/packaging/d2d-manager.spec
@@ -109,7 +109,7 @@ cp test/oic_svr_db_client.dat oic_svr_db_subowner_client.dat
 
 %files devel
 %manifest %{name}-devel.manifest
-%defattr(-,root,root,-)
+%defattr(-,network_fw,network_fw,-)
 %{NETWORK_FW_DATADIR}/oic_amss_db.dat
 %{NETWORK_FW_DATADIR}/oic_svr_db_client_devowner.dat
 %{NETWORK_FW_DATADIR}/oic_svr_db_client_directpairing.dat
diff --git a/test/oic_svr_db_server_justworks.dat b/test/oic_svr_db_server_justworks.dat
index e02d4658de65d2d6ba18c6c84d19bb5657964067..d4e46c2c0e046d898f1127fce3fe3ed124349492 100644
GIT binary patch
delta 250
zcmbQv{+46IdB(}I%qo*VGx`B(Lohp#QAIx`CBGs!;@y4_RouiN`JW*T#7fNpvXYCF
zO9WH%%kxrGzGS7OmSrZVP8Mg@5-F<C%P&gT%gisyEXypZ)XUA!Wt_~%>;N{jh*_mR
zCAlayC1Tr>R1jU<xFiikXQnV_7ndewr6!k@mS(0TYGr^#ODYRe1+oi@GRqQ6Qd1I3
z5*KBp<|XH+Wag!p<Yy-96{jZa!36Y*63bISYCH^$j7>l|s|e(}B9M6%Dh5!XJ6Vlc
LdU7A5GUI;$wx(Nt

delta 276
zcmaFMF`a$Gc}8WkL~~PfV{;Q-b91vaU2`L|BwZ5|GgDo2GgDJ@Q!`656XVIB82v+u
zP-l=;lwY2gT2xw^nNp!bjE2d9j4BZ+Dftz-5m)zvsNzP3G!T`V!;oB@T*8<NGBD*!
hR!VAFW^yX=2Il}ZOpamJpB%-^OOzM8m{l470|4;dO??0W

diff --git a/test/oic_svr_db_server_justworks.json b/test/oic_svr_db_server_justworks.json
index 92b63cc..d86b341 100644
--- a/test/oic_svr_db_server_justworks.json
+++ b/test/oic_svr_db_server_justworks.json
@@ -1,73 +1,88 @@
-{
-    "acl": {
-        "aclist": {
-            "aces": [
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/res",
-                            "rel": "",
-                            "rt": ["oic.wk.res"],
-                            "if": ["oic.if.ll"]
-                        },{
-                            "href": "/oic/d",
-                            "rel": "",
-                            "rt": ["oic.wk.d"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        },{
-                            "href": "/oic/p",
-                            "rel": "",
-                            "rt": ["oic.wk.p"],
-                            "if": ["oic.if.baseline", "oic.if.r"]
-                        }
-                    ],
-                    "permission": 2
-                },
-                {
-                    "subjectuuid": "*",
-                    "resources": [
-                        {
-                            "href": "/oic/sec/doxm",
-                            "rel": "",
-                            "rt": ["oic.r.doxm"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/pstat",
-                            "rel": "",
-                            "rt": ["oic.r.pstat"],
-                            "if": ["oic.if.baseline"]
-                        },
-                        {
-                            "href": "/oic/sec/cred",
-                            "rel": "",
-                            "rt": ["oic.r.cred"],
-                            "if": ["oic.if.baseline"]
-                        }
-                    ],
-                    "permission": 6
-                }
-            ]
-        },
-        "rowneruuid" : "6A757374-776F-726B-4465-765575696430"
-    },
-    "pstat": {
-        "isop": false,
-        "deviceuuid": "6A757374-776F-726B-4465-765575696430",
-        "rowneruuid": "6A757374-776F-726B-4465-765575696430",
-        "cm": 2,
-        "tm": 0,
-        "om": 4,
-        "sm": 4
-        },
-    "doxm": {
-        "oxms": [0],
-        "oxmsel": 0,
-        "sct": 1,
-        "owned": false,
-        "deviceuuid": "6A757374-776F-726B-4465-765575696430",
-        "devowneruuid": "",
-        "rowneruuid": "6A757374-776F-726B-4465-765575696430"
-    }
-}
+{
+    "cred":{
+        "creds": [
+            {
+                "credid": 1,
+                "subjectuuid": "*",
+                "credtype": 16,
+                "privatedata": {
+                    "encoding": "oic.sec.encoding.raw",
+                    "data": "12341234"
+                }
+            }
+        ],
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
+    },
+    "acl": {
+        "aclist": {
+            "aces": [
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/res",
+                            "rel": "",
+                            "rt": ["oic.wk.res"],
+                            "if": ["oic.if.ll"]
+                        },{
+                            "href": "/oic/d",
+                            "rel": "",
+                            "rt": ["oic.wk.d"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        },{
+                            "href": "/oic/p",
+                            "rel": "",
+                            "rt": ["oic.wk.p"],
+                            "if": ["oic.if.baseline", "oic.if.r"]
+                        }
+                    ],
+                    "permission": 2
+                },
+                {
+                    "subjectuuid": "*",
+                    "resources": [
+                        {
+                            "href": "/oic/sec/doxm",
+                            "rel": "",
+                            "rt": ["oic.r.doxm"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/pstat",
+                            "rel": "",
+                            "rt": ["oic.r.pstat"],
+                            "if": ["oic.if.baseline"]
+                        },
+                        {
+                            "href": "/oic/sec/cred",
+                            "rel": "",
+                            "rt": ["oic.r.cred"],
+                            "if": ["oic.if.baseline"]
+                        }
+                    ],
+                    "permission": 6
+                }
+            ]
+        },
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
+    },
+    "pstat": {
+        "isop": false,
+        "deviceuuid": "00000000-0000-0000-0000-000000000000",
+        "rowneruuid": "00000000-0000-0000-0000-000000000000",
+        "cm": 2,
+        "tm": 0,
+        "om": 4,
+        "sm": 4
+     },
+    "doxm": {
+        "oxms": [0, 65280],
+        "oxmsel": 65280,
+        "sct": 17,
+        "owned": false,
+        "x.org.iotivity.mom": 1,
+        "deviceuuid": "00000000-0000-0000-0000-000000000000",
+        "devowneruuid": "",
+        "rowneruuid": "00000000-0000-0000-0000-000000000000"
+    }
+}
diff --git a/test/sampleserver_justworks.cpp b/test/sampleserver_justworks.cpp
index f242ee4..8f6e1d9 100644
--- a/test/sampleserver_justworks.cpp
+++ b/test/sampleserver_justworks.cpp
@@ -354,22 +354,22 @@ OCEntityHandlerCb (OCEntityHandlerFlag flag,
         {
             if (OC_REST_GET == entityHandlerRequest->method)
             {
-                D2D_LOGE ( "Received OC_REST_GET from client");
+                D2D_LOGE( "Received OC_REST_GET from client");
                 ehResult = ProcessGetRequest (entityHandlerRequest, &payload);
             }
             else if (OC_REST_PUT == entityHandlerRequest->method)
             {
-                D2D_LOGE ( "Received OC_REST_PUT from client");
+                D2D_LOGE( "Received OC_REST_PUT from client");
                 ehResult = ProcessPutRequest (entityHandlerRequest, &payload);
             }
             else if (OC_REST_POST == entityHandlerRequest->method)
             {
-                D2D_LOGE ( "Received OC_REST_POST from client");
+                D2D_LOGE( "Received OC_REST_POST from client");
                 ehResult = ProcessPostRequest (entityHandlerRequest, &response, &payload);
             }
             else
             {
-                D2D_LOGD ( "Received unsupported method %d from client",
+                D2D_LOGD( "Received unsupported method %d from client",
                         entityHandlerRequest->method);
                 ehResult = OC_EH_ERROR;
             }
@@ -420,6 +420,8 @@ FILE* server_fopen(const char *path, const char *mode)
 
 	(void)path;
 
+	D2D_LOGE("fopen %s", data_dir);
+
     return fopen(data_dir, mode);
 }
 
@@ -454,12 +456,17 @@ static void OtmEventHandler(void *ctx, const char *addr, uint16_t port,
     printf("--------------------------------------\n");
 }
 
+#include <ocprovisioningmanager.h>
+
 int main()
 {
+	const uint8_t seed[6] = {0x00, 0x12, 0x34, 0x11, 0x22, 0x33};
     struct timespec timeout;
 
     D2D_LOGE( "OCServer is starting...");
 
+	SetDeviceIdSeed(seed, 6);
+
     //This function should be invoked before invoke OCInit
     OCSetOtmEventHandler(NULL, OtmEventHandler);
 
@@ -474,6 +481,8 @@ int main()
         return 0;
     }
 
+	OCConfigSelfOwnership();
+
     /*
      * Declare and create the example resource: LED
      */
-- 
2.7.4