platform/upstream/iotivity.git
7 years agoImplemented MQ API for Android JNI
jihwan.seo [Thu, 4 Aug 2016 00:59:35 +0000 (09:59 +0900)]
Implemented MQ API for Android JNI

connected from Android JNI to C++ API of OcResource.

Change-Id: I377d786dfa2bf7f06fb43a82b6bb1955f19dbcb1
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10003
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoadded MQ callback listener for android JNI.
jihwan.seo [Thu, 4 Aug 2016 00:25:14 +0000 (09:25 +0900)]
added MQ callback listener for android JNI.

- subscribe callback listener.
- discoveryTopic/createTopic callback listener

Change-Id: I50959c54423c6bed0e9622c6c64ce1a1e91dc16c
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10001
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoUpdate unittest for remote opertion in scene manager
Jihun Ha [Sat, 13 Aug 2016 05:43:38 +0000 (14:43 +0900)]
Update unittest for remote opertion in scene manager

In some cases, unittest would produces unexpected results especially when
creation and deletion of scene objects are repeated in continuous unittests.
This patch fixes this issue.

Change-Id: I0294215e5f2578145b4398808146bee1c8199a73
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10451
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoNotification cpp-wrapper UnitTest
nikhil.a [Fri, 12 Aug 2016 11:46:19 +0000 (17:16 +0530)]
Notification cpp-wrapper UnitTest

1)Added ProviderService unittest
2)Added ConsumerService unittest

Change-Id: Ibb510f4e1e6407ca3ecab791ea4d2e76f03e669c
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10345
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplementation of JNI for deleting resource from RD
hyuna0213.jo [Tue, 2 Aug 2016 09:10:47 +0000 (18:10 +0900)]
Implementation of JNI for deleting resource from RD

Added JNI code for deleteResourceFromRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: I7fb825817db4fbfc4734087222162e3b022e1f51
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9925
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoImplementation of JNI for publishing resource to RD
hyuna0213.jo [Sun, 7 Aug 2016 23:44:12 +0000 (08:44 +0900)]
Implementation of JNI for publishing resource to RD

Added JNI code for publishResourceToRD() of OCPlatform for converting
from Java to C++ and vice versa.

Change-Id: Ieb941ab2ce37c1aa39f44c8e51bbf49e3025a273
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9911
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoRemove not required Function of Topic.
jaesick.shin [Tue, 16 Aug 2016 04:20:42 +0000 (13:20 +0900)]
Remove not required Function of Topic.

This function is not used.

Change-Id: I5d18bd0a1083446baf32f32aed1f865454f2e289
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10481
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
7 years agoBug fixes for initialize condition of TopicList.
jaesick.shin [Tue, 16 Aug 2016 01:50:14 +0000 (10:50 +0900)]
Bug fixes for initialize condition of TopicList.

Remove initialize condition variable for topiclist.
not required that variable.

Change-Id: Ia63540bbff0998729797e51019f5a288f9702641
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10475
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
7 years agoMerge "Merge branch 'cloud-interface'"
Jee Hyeok Kim [Mon, 15 Aug 2016 12:12:28 +0000 (12:12 +0000)]
Merge "Merge branch 'cloud-interface'"

7 years agoupdate simpleclient sample app to support test TCP.
jihwan.seo [Wed, 10 Aug 2016 04:34:19 +0000 (13:34 +0900)]
update simpleclient sample app to support test TCP.

Change-Id: I23feba350fb80fb625161ae28077010767a172ba
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10217
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoMerge branch 'cloud-interface'
Jee Hyeok Kim [Sat, 13 Aug 2016 04:52:48 +0000 (13:52 +0900)]
Merge branch 'cloud-interface'

Change-Id: If7c53ffecdbc4c9c4386ce996e7e746edb673b7c
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoMerge branch 'master' into notification-service
Hun-je Yeon [Sat, 13 Aug 2016 00:17:23 +0000 (09:17 +0900)]
Merge branch 'master' into notification-service

Change-Id: I8147d601975024dc986317b87e7eaec2d60e527a
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
7 years agoAdd logic for Topic Scenario.
jaesick.shin [Fri, 12 Aug 2016 08:27:33 +0000 (17:27 +0900)]
Add logic for Topic Scenario.

1. If the user cancels the selection,
delete cache about topic.

2. If the user the selection,
add cache about topic.

3.
add logic for NSProviderGetConsumerTopics function.

4.
Move related topic function to memoryCache.
Add NSProviderGetTopicsCacheData, NSProviderGetConsumerTopicsCacheData
function in NSProviderMemoryCache.
because of, this function logic is access cache.

5.
bug fixes about mutex unlock and Add null check.
bug fixes about mutext unlock(initMutex) in NSProviderInterface.c.
Addt null check in Function.

6.
Bug fixes for wrong data type.
TASK_SUBSCRIBE_TOPIC case in NSTopicSchedule,
Use the Wrong second parameter of NSStorageWrite.
re modify second parameter and remove not required freelogic.

Change-Id: I24458847640b8c47e22fd47c7162a01c5dcff412
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10339
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix keep-alive to filter correctly.
Jee Hyeok Kim [Tue, 9 Aug 2016 07:29:25 +0000 (16:29 +0900)]
Fix keep-alive to filter correctly.

1. Fix keep-alive to filter correctly.
2. Cleanup netty pipeline.

Change-Id: Id99916f22c62f43ace4ae1a605e4b8adf7a65c92
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10189
Reviewed-by: Minji Park <minjii.park@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
7 years agoUpdate Mediator code for more readable using const.
Heewon Park [Fri, 12 Aug 2016 05:44:50 +0000 (14:44 +0900)]
Update Mediator code for more readable using const.

Change-Id: I87f6222908c30e14f5c7963859a0310dd06ac03f
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10323
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAS unit test included
yeonghun.nam [Thu, 11 Aug 2016 07:44:12 +0000 (16:44 +0900)]
AS unit test included

Change-Id: I0a0e56f12817843d14f82f361ad0e52c5496045f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10137
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoadd logic related Topic List.
jaesick.shin [Thu, 11 Aug 2016 13:07:29 +0000 (22:07 +0900)]
add logic related Topic List.

this patch inlcuded
delete related topic in MemoryCache.

second patch included
bug fixes for wrong define value.

Change-Id: Iea1cb4b80d88fcdc8a1a7ab506c13d51f7de9814
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10285
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agorename function for NSStoreTopics and Add NSDeleteTopics Function.
jaesick.shin [Thu, 11 Aug 2016 12:30:51 +0000 (21:30 +0900)]
rename function for NSStoreTopics and Add NSDeleteTopics Function.

this patch included
change NSStoreTopics Function name to NSAddTopics.
add NSDeleteTopics Function(only function)
next commit, i will add logic.

second patch included
remove not required define for NSStoreTopics.

Change-Id: I3ab2a910de12a252a4fd82edd22bcdf0c65ca87a
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10281
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoCI unit test included
Jung Seungho [Wed, 10 Aug 2016 02:15:16 +0000 (11:15 +0900)]
CI unit test included

Change-Id: I68b655f2a07db01ea4fca4c580702eb4a10ae66f
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9913
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoImplement acl/invite resource in cloud account server.
Jung Seungho [Wed, 10 Aug 2016 09:52:35 +0000 (18:52 +0900)]
Implement acl/invite resource in cloud account server.

Add invite feature to invite user

Change-Id: I7a4c1922de4b312afda92423338092423fa573c7
Signed-off-by: Minji Park <minjii.park@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9975
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoUpdate Common data model's Constructor & change security '.dat' files.
Heewon Park [Fri, 12 Aug 2016 01:55:32 +0000 (10:55 +0900)]
Update Common data model's Constructor & change security '.dat' files.

Change-Id: I30a6aa0abe2b52b637fd86045bd0a81ababcb921
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10313
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoSVACE fixes for C++ wrapper for Notification Service.
abitha.s [Thu, 11 Aug 2016 13:35:29 +0000 (19:05 +0530)]
SVACE fixes for C++ wrapper for Notification Service.

Change-Id: I54d9508e5d79cb2579057d1346d1fd0b8be2c24a
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10287
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoRemove '/.well-known' from URI
Jaehong Jo [Thu, 11 Aug 2016 23:15:02 +0000 (08:15 +0900)]
Remove '/.well-known' from URI

According to a OCF spec

Change-Id: I54167589ba4fc03282944ecf4ba06e24d83b1de7
Signed-off-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10309
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hyuna Jo <hyuna0213.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdded Android java API for Cloud MQ Client.
jihwan.seo [Thu, 4 Aug 2016 00:13:08 +0000 (09:13 +0900)]
Added Android java API for Cloud MQ Client.

- added Native Caller for MQ API

Change-Id: I7a15877cd041b8321088c9f8ec530fe77b390b2f
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9999
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoClean up encodeAddressForRFC6874 routine
David Antler [Mon, 8 Aug 2016 12:25:39 +0000 (05:25 -0700)]
Clean up encodeAddressForRFC6874 routine

Change-Id: Ie4b816186dc7bb808f6fdb3a2836552bfdf32772
Signed-off-by: David Antler <david.a.antler@intel.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10151
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: Jon A. Cruz <jon@joncruz.org>
7 years agoMerge "Merge branch 'notification-service'"
Madan Lanka [Thu, 11 Aug 2016 15:57:54 +0000 (15:57 +0000)]
Merge "Merge branch 'notification-service'"

7 years agoremove NSTopic state in NSCacheTopicSubData.
jaesick.shin [Thu, 11 Aug 2016 12:24:22 +0000 (21:24 +0900)]
remove NSTopic state in NSCacheTopicSubData.

NSTopic state variable is not required in NSCacheTopicSubData.

Change-Id: Ifd76a6638604fab432215f7134e08adc051e1d1d
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10277
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoChange constant to define.
jaesick.shin [Thu, 11 Aug 2016 11:18:30 +0000 (20:18 +0900)]
Change constant to define.

change constant to NS_UUID_STRING_SIZE(define) in NSStruct.h

Change-Id: I6f401a61edbdc1fc4f39917bf2cd73be40c02ed6
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10273
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd logic for addTopic.
jaesick.shin [Thu, 11 Aug 2016 11:02:36 +0000 (20:02 +0900)]
Add logic for addTopic.

this patch included
Added topics store to cache.

Change-Id: I766f566b406d4697b99d01b1b859d54fcfd9ad03
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10269
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModified Scene UnitTest
ChaJiWon [Wed, 6 Jul 2016 04:23:24 +0000 (13:23 +0900)]
Modified Scene UnitTest

Scene container is changed to unordered_map in SceneCollection.
Apply the change to 'getAllSceneInstance' logic.

Change-Id: I48916883b115c7eb57cfe63d1ae55d6d2ee1c430
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f162cb2234428750943373d939415fb09fd103d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/10267
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'notification-service'
ch79.cho [Thu, 11 Aug 2016 11:24:15 +0000 (20:24 +0900)]
Merge branch 'notification-service'

Notification service feature is added newly.

Change-Id: I3ec6e84ea7ad9c247f0f444889bf7e326b6c8e11
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
7 years agoAdd structs for topic cache.
jaesick.shin [Thu, 11 Aug 2016 09:55:14 +0000 (18:55 +0900)]
Add structs for topic cache.

Add NSCacheTopicData struct, NSCacheTopicSubData struct.
structs will use memory cache.

Change-Id: I18dbaea45782f8910dbe0120182fa414b463b976
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10263
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate topic APIs
ch79.cho [Thu, 11 Aug 2016 08:10:55 +0000 (17:10 +0900)]
Update topic APIs

The APIs for topic are updated.
And the name of task attributes are upgraded regarding to the APIs.

Change-Id: Ia570afc768a9466019ac08013c817fa17cbe964a
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10259
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate topic subscription
ch79.cho [Thu, 11 Aug 2016 04:49:37 +0000 (13:49 +0900)]
Update topic subscription

Topic subscription function is added.
And registration feature and transmission of the topic array
are updated.
Plus, the name of NSTopic is changed to NSTopics.

Change-Id: I87d4102b461fe3ee471487a8574b7f32ca40e9d1
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10249
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMove the removeDeviceWithUuid method to OCSecure class as static method.
Chul Lee [Fri, 5 Aug 2016 01:15:12 +0000 (10:15 +0900)]
Move the removeDeviceWithUuid method to OCSecure class as static method.

Change-Id: Ic8a9904990b3bbd27c82e43f1b1105aa60b00087
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10059
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoMerge "Merge remote-tracking branch 'origin/extended-easysetup'"
Madan Lanka [Thu, 11 Aug 2016 05:11:55 +0000 (05:11 +0000)]
Merge "Merge remote-tracking branch 'origin/extended-easysetup'"

7 years ago[IOT-1204] Add zero terminator before logging
Dan Mihai [Wed, 27 Jul 2016 22:13:20 +0000 (15:13 -0700)]
[IOT-1204] Add zero terminator before logging

Change-Id: I8a8b94aad4b00e22a59a728a2f6802a3d18bff24
Signed-off-by: Dan Mihai <Daniel.Mihai@microsoft.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9851
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoModify Callback function in cpp wrapper for Notification Service.
abitha.s [Wed, 10 Aug 2016 13:34:24 +0000 (19:04 +0530)]
Modify Callback function in cpp wrapper for Notification Service.

1) changed Subscribe Accepted CB to Provider Changed CB.
2) Provider Changed CB is invoked when Provider status is changed.
3) enabled c++ wrapper

Change-Id: If07c8c71d764bd87d57f2aa519a09525bd5ef286
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10233
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge remote-tracking branch 'origin/extended-easysetup'
Jihun Ha [Thu, 11 Aug 2016 02:06:17 +0000 (11:06 +0900)]
Merge remote-tracking branch 'origin/extended-easysetup'

Change-Id: I9d846ee6afcfa18a53081c606401ffe4b8d4d18c
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
7 years agoImplement x509 certeficate resource in cloud account server.
Joonghwan Lee [Wed, 10 Aug 2016 09:52:35 +0000 (18:52 +0900)]
Implement x509 certeficate resource in cloud account server.
 - Certeficate builder modify.
 - Added Certeficate resource to account server.
 - Added Certrficate configuration.
 - TODO: Implement Certeficate storage.

Patch #7: Rebase with the latest branch

Signed-off-by: i.pazderskyy <i.pazderskyy@samsung.com>
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Change-Id: I4a350ff96bc4d4c3f086d0790715576026192ee3
Signed-off-by: Andrii Androsov <a.androsov@samsung.com>
Signed-off-by: Joonghwan Lee <jh05.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10075
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoremove consumerId field in NSTopicList struct.
jaesick.shin [Wed, 10 Aug 2016 13:28:23 +0000 (22:28 +0900)]
remove consumerId field in NSTopicList struct.

remove not required consumerId field.

Change-Id: I592aaf3056157f2eaa99eea38e88a07613ce5dab
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10231
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd list for registered topic.
jaesick.shin [Wed, 10 Aug 2016 13:02:53 +0000 (22:02 +0900)]
Add list for registered topic.

We manage the two lists on the topic.

Change-Id: I1aeed85d0d04fabb9e0e896e0988f96c0c73ecff
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10229
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd Topic List into the NSProvider to support topic Functionality
YounghyunJoo [Tue, 9 Aug 2016 08:11:40 +0000 (17:11 +0900)]
Add Topic List into the NSProvider to support topic Functionality

Conflicts:
        service/notification/src/consumer/NSConsumerCommon.h

Change-Id: I83d197f20bd33d063aa25416b9f0682dd56e6c83
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10185
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify related topiclist.
jaesick.shin [Tue, 9 Aug 2016 12:37:07 +0000 (21:37 +0900)]
Modify related topiclist.

first patch included
1. Rename function and variables related TopicList.
2. Destory TopicList.

second patch inlcuded
remove the white spaces.

third pacth included
remove duplicated initTopiList.

four patch updated commit message only.

Change-Id: Id13c4442546c0659eb4f8c73a4f2a7fc832d330e
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate Mediator sample App.
Jihun Ha [Wed, 10 Aug 2016 12:45:13 +0000 (21:45 +0900)]
Update Mediator sample App.

 - Add Cloud feature (using Iotivity Cloud)

Change-Id: I651121b8cd83e83178d3cfce6ff49e9f1dee0ec5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10227
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoResponse topic list for GET request
ch79.cho [Wed, 10 Aug 2016 04:48:20 +0000 (13:48 +0900)]
Response topic list for GET request

Response function is added for GET request of topic resource.

Change-Id: I846cd424aca475091182e9eece2bed9e1a359a0e
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10219
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplement APIs for topic notification.
jaesick.shin [Tue, 9 Aug 2016 12:03:21 +0000 (21:03 +0900)]
Implement APIs for topic notification.

The changes are about implementation of APIs for topic notification.
TODO tasks will be complete with next commits.

four patch included comment out about related Topic in Consumer Side.
because of, It has already been modified about NSTopic, NSTopicList.

Conflicts:
        service/notification/include/NSCommon.h

Change-Id: I6cea362cce5fbc0bf7623853fa4c87c7de854321
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10201
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoupdate mediator unittest and implement validation check logic.
Heewon Park [Wed, 10 Aug 2016 09:22:53 +0000 (18:22 +0900)]
update mediator unittest and implement validation check logic.

Change-Id: Ieb53eb1a659d7ddf2152ac2d3b8494a80943c62a
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10197
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoSend topic notification
ch79.cho [Wed, 10 Aug 2016 03:40:23 +0000 (12:40 +0900)]
Send topic notification

Change-Id: Iaa85682a09c2b99542191df0df063ac94584e98d
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10215
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoResolved tizen build issue regarding ip network
hyuna0213.jo [Wed, 10 Aug 2016 05:23:55 +0000 (14:23 +0900)]
Resolved tizen build issue regarding ip network

Resolved tizen build issue regarding ip network.

Change-Id: I8f18efd4fdeff40fdb5e6a3c13522be461ba8bd8
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10221
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agobug fixes for deallocate memory logic of "NotificationMessage".
jaesick.shin [Wed, 10 Aug 2016 01:13:50 +0000 (10:13 +0900)]
bug fixes for deallocate memory logic of "NotificationMessage".

added deallocate memory logic for
NotificationMessage when send notification failed.

Change-Id: I3feca075a06df9f6ba5cc90bdf9ff51cde279b60
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10211
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify Callback function.
YounghyunJoo [Wed, 10 Aug 2016 01:37:46 +0000 (10:37 +0900)]
Modify Callback function.

- change Subscribe Accepted CB to Provider Changed CB.
- Provider Changed CB is invoked when Provider status is changed.

Change-Id: Ifdbc68cd8e41898761739515cf9e6310e8ad23b2
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10183
Reviewed-by: JungYong KIM <jyong2.kim@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years ago[Enrollee] DeleteEasySetupResourcess() is fixed in resource handler.
sy01.youn [Wed, 10 Aug 2016 00:28:17 +0000 (09:28 +0900)]
[Enrollee] DeleteEasySetupResourcess() is fixed in resource handler.
   . Unbind logic is added
   . Check whether handle is NULL or not

Change-Id: I0b69d29735af06b75b4e775484cf835ca12007f0
Signed-off-by: sy01.youn <sy01.youn@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10207
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoadded start logic for NSTopicSchedule.
jaesick.shin [Tue, 9 Aug 2016 12:12:33 +0000 (21:12 +0900)]
added start logic for NSTopicSchedule.

1. pthread_create about NSTopicSchedule.
2. define extern function.

Change-Id: I3f4f23aa624f31ba698e959a39b8cee3d51c901c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10203
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix memory leak at thread termination.
KIM JungYong [Tue, 9 Aug 2016 07:17:11 +0000 (16:17 +0900)]
Fix memory leak at thread termination.

When push thread done one's works, thread handle does not deallocated.
So, push thread was detached from consumer thread,
and allocated push thread handle was deallocated.

This issue was found on valgrind.

Change-Id: Ia99f960adc8131f2f97f99aa455c19a021abf70f
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10187
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify Consumer to support Topic functionality
YounghyunJoo [Tue, 9 Aug 2016 10:07:09 +0000 (19:07 +0900)]
Modify Consumer to support Topic functionality

- Add 2 APIs for Topic
- Add Logic flow to support Topic

Change-Id: If44abf508a22aed6a70d4497eed214c4f610792d
Signed-off-by: YounghyunJoo <yh_.joo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10193
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoCode divide for cloud variable.
jaesick.shin [Wed, 10 Aug 2016 01:42:58 +0000 (10:42 +0900)]
Code divide for cloud variable.

add #ifdef WITH_CLOUD #endif for cloud variable.

Change-Id: I9368eb81be8131bf33fba4887a1c1d86bdef2727
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10213
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoImplement acl/group resource in cloud account server.
Glen Youngjin Kim [Fri, 29 Jul 2016 15:12:34 +0000 (18:12 +0300)]
Implement acl/group resource in cloud account server.

1. Account server restructured. (API design, naming)
2. Modify to use the tokens issued by OAuth2 providers.
3. Add group feature to share devices.

Change-Id: I1b15aadcb0b7715a41bce7a96363b8ab7f612d0a
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Signed-off-by: eunok.shin <eunok.shin@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: Glen Youngjin Kim <glen.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9665
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoadded APIs related to account in OCAccountManager
Jaewook Jung [Tue, 9 Aug 2016 07:39:08 +0000 (16:39 +0900)]
added APIs related to account in OCAccountManager

added 2 APIs related to account
: searchUser, deleteDevice

and modified signOut API due to the change of the specification
that signOut message has no more any payload but only login property.

Change-Id: Ida9abb953d1bed0dae0fb4f0cb2bed522bc8a3dd
Signed-off-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10171
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoCreate topic module running with scheduler
ch79.cho [Mon, 8 Aug 2016 12:41:12 +0000 (21:41 +0900)]
Create topic module running with scheduler

Add topic feature module that works with its scheduler.
Three tasks for topic notification are created.

Change-Id: Ie68595fe0d9a1c63a802aef64e94f61482b19286
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10153
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoNotification ProviderService Java API Updation
nikhil.a [Tue, 9 Aug 2016 07:36:14 +0000 (13:06 +0530)]
Notification ProviderService Java API Updation

1) Updated the JAVA API's for the NS ProviderService using C++ wrapper
2) Modified the JNI API's for NS ProviderService
3) Added the sample Android application for testing the Java API for Provider.

Change-Id: I1df1509e9f95d5c7df3d6711dadd0889d1997045
Signed-off-by: nikhil.a <nikhil.a7@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10031
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge "Merge remote-tracking branch 'origin/master' into notification-service" into...
Madan Lanka [Tue, 9 Aug 2016 06:47:16 +0000 (06:47 +0000)]
Merge "Merge remote-tracking branch 'origin/master' into notification-service" into notification-service

7 years agoAdd APIs for topic notification
ch79.cho [Mon, 8 Aug 2016 12:00:35 +0000 (21:00 +0900)]
Add APIs for topic notification

Three APIs for topic notification on provider service
are added.
1) get topic list
2) set topic list
3) recommend topics

Change-Id: Ic4b606af164495c2fc02a4a7a79c8fe4ee0e69f2
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10147
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd setting userInfo in Provider struct.
jaesick.shin [Mon, 8 Aug 2016 05:49:40 +0000 (14:49 +0900)]
Add setting userInfo in Provider struct.

initialize ProviderInfo about userinfo.

second patch included deallocate userinfo.
third patch included Add getUserInfo function.
this function will use compare queryparams
when received observer request.
Next patch included
i will add logic about compared queryparams.

Change-Id: Id69891156abd0f0bd4d0f04f873816f697819a46
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10113
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Hun-je Yeon <hunje.yeon@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoNotification Consumer Service Java API updation
Abitha Shankar [Thu, 4 Aug 2016 14:02:54 +0000 (19:32 +0530)]
Notification Consumer Service Java API updation

1) Updated the JAVA api's for the NS Consumer using C++ wrapper
2) Modified the JNI api's for NS Consumer
3) Added the sample Android application for testing the Java API for Consumer.

patch 1 : initial commit
patch 2 : renamed file for conflict
patch 3 : rebase to latest and removed nativeHandle direct APIs
patch 4 : removed Empty constructors

Change-Id: Icb83a959fa239f6bfee5ed1680e2b7e082b6890a
Signed-off-by: Abitha Shankar <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10023
Reviewed-by: Chihyun Cho <ch79.cho@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoDARWIN BUGFIX: [-Wreturn-type] error void fn returns 0
Gregg Reynolds [Wed, 15 Jun 2016 15:27:08 +0000 (10:27 -0500)]
DARWIN BUGFIX: [-Wreturn-type] error void fn returns 0

Two void functions have "return 0;", chg to "return;"

Change-Id: Icdbb91891f01e8d56427d952722da776d4a34f78
Signed-off-by: Gregg Reynolds <reynolds-gregg@norc.org>
Reviewed-on: https://gerrit.iotivity.org/gerrit/8667
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: George Nash <george.nash@intel.com>
Reviewed-by: Habib Virji <habib.virji@samsung.com>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoCleanup Maven build script
Jee Hyeok Kim [Tue, 2 Aug 2016 00:00:34 +0000 (09:00 +0900)]
Cleanup Maven build script

1. Cleanup Maven build script

Change-Id: Ibf455e52f064b7b0cc5e4cd00beda51d25c8950d
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9965
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
7 years agoFix error response and error code
Jee Hyeok Kim [Mon, 8 Aug 2016 07:07:32 +0000 (16:07 +0900)]
Fix error response and error code

1. Fix packet forawrding to client correctly
   when resource find receives error from account server,

2. Change response code to use CHANGED when POST method succeed.

Change-Id: Ibf7b1ba6996c2bcef086f3c4361f38036f4a8c71
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10119
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jung seungho <shonest.jung@samsung.com>
7 years agoupdated Readme.scons files for Message Queue(MQ)
jihwan.seo [Mon, 8 Aug 2016 11:02:02 +0000 (20:02 +0900)]
updated Readme.scons files for Message Queue(MQ)

Change-Id: I2143d908e7323acd8505a4024faf4f60ac009f43
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10141
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdd setLocation API for PUT response
Jee Hyeok Kim [Mon, 8 Aug 2016 08:03:42 +0000 (17:03 +0900)]
Add setLocation API for PUT response

1. Add setLocation for resource creator
2. Apply setLocation to MQ server

Change-Id: I143dd14471bb9b8055f7d3a60e9e58c22697d481
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10123
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Minji Park <minjii.park@samsung.com>
7 years agoMerge remote-tracking branch 'origin/master' into notification-service
Hun-je Yeon [Mon, 8 Aug 2016 23:41:11 +0000 (08:41 +0900)]
Merge remote-tracking branch 'origin/master' into notification-service

Change-Id: I3902e34d97aa063f3ef7714e4409f854766c21cd
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>
7 years agoAdd RD C++ API to supporting QoS in OCPlatform
hyuna0213.jo [Mon, 1 Aug 2016 22:51:39 +0000 (07:51 +0900)]
Add RD C++ API to supporting QoS in OCPlatform

- add publishResourceToRD() overload function
- add deleteResourceFromRD() overload function
- remove unnecessary code
- add null check logic for input parameter

Change-Id: Ib3ad9d196af4a1b1662a4fca0dce40e963dc78f5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9907
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaewook Jung <jw0213.jung@samsung.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
7 years agoModified the Provider Configuration.
abitha.s [Mon, 8 Aug 2016 09:36:37 +0000 (15:06 +0530)]
Modified the Provider Configuration.

1. modified NSStartProvider API arguments in proivder side.
2. Uncomments out about jni, unittest and Cpp wrapper in SConscript.
3. Added CreateMessage API in Provider Side

Change-Id: I8be29121901d21e13f137828329da59c4c8ef1b8
Signed-off-by: abitha.s <abitha.s@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10133
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoEnable gradle build for Easy setup app for Android with scons
Jihun Ha [Mon, 8 Aug 2016 09:25:09 +0000 (18:25 +0900)]
Enable gradle build for Easy setup app for Android with scons

Along with the patch 10093, this is for build easy setup
Android app with gradle build in scons.

Change-Id: Ib99cb63cfe8859766b8263e5669cb2cd9d9ddba9
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10095
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoEnabled IP CAGetNetworkInformation() API
hyuna0213.jo [Fri, 29 Jul 2016 08:43:52 +0000 (17:43 +0900)]
Enabled IP CAGetNetworkInformation() API

currently CAGetNetworkInformation is not working on linux platform.
because stack doesn't set the device address.

Change-Id: Ia80c9e61d4c9180f3abbe7234e512fa475132da5
Signed-off-by: hyuna0213.jo <hyuna0213.jo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9871
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoEnable gradle build of easy setup SDK for Android with scons
Jihun Ha [Mon, 8 Aug 2016 09:10:34 +0000 (18:10 +0900)]
Enable gradle build of easy setup SDK for Android with scons

For building SDK of easy setup for Android, this patch utilizes gradle
executed in scons build.

Change-Id: I0de946b2e95f00051248418148deaa7fbd77e8c3
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10093
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoFix OTM Unittest
Chul Lee [Fri, 5 Aug 2016 06:39:50 +0000 (15:39 +0900)]
Fix OTM Unittest

Fix OTM Unittest error

Patch #1-3: PT SVR DB modified to use x.org.iotivity.dpc
Patch #4-6: sample server's SVR DB modified to use x.org.iotivity.dpc.
           Also otmunittest.cpp updated to ignore the unknown server.
Patch #7: Updated to exit the unittest
          in case of two more devices are running on the subnet.

Change-Id: Ifd0c8c6043a6967f0e936da0086ee0fb7ed7e0b3
Signed-off-by: Jongmin Choi <jminl.choi@samsung.com>
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10061
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Randeep Singh <randeep.s@samsung.com>
7 years agoFix build issue of unittest.
KIM JungYong [Mon, 8 Aug 2016 08:51:03 +0000 (17:51 +0900)]
Fix build issue of unittest.

When notification service unittest build with '-Wl, --as-needed' LDFLAGS,
some build machine building fail.(this flag is default option.)
The default of passing --as-needed can be undone by passing --no-as-needed to the linker.
So, 'Wl, --no-as-needed' flag is added in notification unittest SConscript.

Change-Id: Ifb56d0af433b58fc3bcbbd8938c9c318a21035c4
Signed-off-by: KIM JungYong <jyong2.kim@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10127
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoCreate topic resource
ch79.cho [Mon, 8 Aug 2016 07:12:52 +0000 (16:12 +0900)]
Create topic resource

Topic resource is created in resource module with defined resource
attribute.

Change-Id: I1b4818f01349669f66503100c7edf28966e7eada
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9779
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agofixed library loading issue at Android(API23)
Heewon Park [Mon, 8 Aug 2016 07:31:37 +0000 (16:31 +0900)]
fixed library loading issue at Android(API23)

Change-Id: I055c3f3a2537346bc285ec8825350317156fe4e7
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10121
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'master' into cloud-interface
Jee Hyeok Kim [Mon, 8 Aug 2016 08:54:21 +0000 (17:54 +0900)]
Merge branch 'master' into cloud-interface

Change-Id: I9baa52a9dcff36aec179677400cb5a8ee985d410
Signed-off-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoAdd Unittest CancelObserves in ConsumerSimulator.
jaesick.shin [Mon, 1 Aug 2016 03:31:20 +0000 (12:31 +0900)]
Add Unittest CancelObserves in ConsumerSimulator.

Add test case about calling "Cancelobserve" at consumer side.

Change-Id: I3685d64894d490009456eadd22acf94a6fe4f9d7
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9879
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd specified response type into RM
jihwan.seo [Mon, 8 Aug 2016 04:19:38 +0000 (13:19 +0900)]
Add specified response type into RM

As 'dataType' has added in CAResponseInfo_t,
RM also applied it in its code

refer change : https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I1484c9967e5f902b20967c5a94c1e04ca14bfada
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10109
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jaehong Jo <jaehong.jo@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge branch 'master' into extended-easysetup
Heewon Park [Mon, 8 Aug 2016 06:08:10 +0000 (15:08 +0900)]
Merge branch 'master' into extended-easysetup

Change-Id: I300f1038ef9795499f328bf844939757702dcdeb
Signed-off-by: Heewon Park <h_w.park@samsung.com>
7 years agoFix a logic in linking child representation payload in batch interface
Jihun Ha [Sat, 6 Aug 2016 01:32:46 +0000 (10:32 +0900)]
Fix a logic in linking child representation payload in batch interface

If provisioning resource receives a GET request with BATCH interface and
cloud resource is not created by user's decision, device configuration
resource's representation will not delivered even if device configuration
resource exists. This patch fixes this issue.

Change-Id: I90a43e58cf12dab0732857418fae7f4a7ef9dc1a
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10091
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd specified response type
Chul Lee [Fri, 5 Aug 2016 01:09:27 +0000 (10:09 +0900)]
Add specified response type
according to https://gerrit.iotivity.org/gerrit/#/c/9255/.

Change-Id: I4b5a23f8c42084de369dbb5af7a64b7a8d0679c8
Signed-off-by: Chul Lee <chuls.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10057
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: jihwan seo <jihwan.seo@samsung.com>
Reviewed-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoModify about Provider Configuration.
jaesick.shin [Mon, 8 Aug 2016 00:51:43 +0000 (09:51 +0900)]
Modify about Provider Configuration.

1. NSStartProvider API modify arguments in proivder side.
2. comments out about jni, unittest in SConscript.

Change-Id: I5d890690f472c4ff9e1ffa22772ddf658d2dca4c
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10097
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd NSProviderConfig struct.
jaesick.shin [Mon, 8 Aug 2016 02:16:50 +0000 (11:16 +0900)]
Add NSProviderConfig struct.

this struct included
policy, subscribeRequestCallback, syncInfoCallback, user information.
next commit, i will modify startProvider API(NSProviderConfig).

Change-Id: Iab6dc04083b20719259599e36ca903c90489b148
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10107
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoAdd exception handling in MQ
Minji Park [Wed, 3 Aug 2016 05:39:04 +0000 (14:39 +0900)]
Add exception handling in MQ

exception handling added to give proper error responses in MQ

Change-Id: Idb6ba4c90707b490b854788a5f06120a46652d6f
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9977
Reviewed-by: jung seungho <shonest.jung@samsung.com>
Reviewed-by: Yeonghun Nam <yeonghun.nam@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoRD unit test included
yeonghun.nam [Wed, 3 Aug 2016 04:55:18 +0000 (13:55 +0900)]
RD unit test included

Change-Id: If8c2354aa3c32b628b6ec5dc5fbead1faca1e9aa
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Signed-off-by: Jung Seungho <shonest.jung@samsung.com>
Signed-off-by: yeonghun.nam <yeonghun.nam@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9719
Reviewed-by: Eunok Shin <eunok.shin@samsung.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Jee Hyeok Kim <jihyeok13.kim@samsung.com>
7 years agoFix defects detected by SVACE system in easy setup
Jihun Ha [Fri, 5 Aug 2016 07:40:09 +0000 (16:40 +0900)]
Fix defects detected by SVACE system in easy setup

SVACE which is one of static code analysis tools detects several defects
in easy setup. This patch fixes them.

Change-Id: Ie7e3eb692c58c586b6d0964cf6af24829c39eb11
Signed-off-by: Jihun Ha <jihun.ha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10021
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate common data class.
Heewon Park [Fri, 5 Aug 2016 02:26:38 +0000 (11:26 +0900)]
Update common data class.

 - implement move & copy constructor.

Change-Id: I8b27beb016e463db30142b80fe6e06aa282e76f5
Signed-off-by: Heewon Park <h_w.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10067
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoUpdate API comments
ch79.cho [Wed, 27 Jul 2016 04:32:40 +0000 (13:32 +0900)]
Update API comments

provider and consumer API comments are updated

Change-Id: Ie7f48010f4f26688aef99d5c8bfe5e4144713b4c
Signed-off-by: ch79.cho <ch79.cho@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9749
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoadded Testcase for MQ Client API
jihwan.seo [Thu, 21 Jul 2016 07:40:35 +0000 (16:40 +0900)]
added Testcase for MQ Client API

Change-Id: Iee8e98a922288f90a79e3fd006b797e5c745d107
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9539
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoModify folder path with sconscript about memorycache.
jaesick.shin [Wed, 3 Aug 2016 02:19:37 +0000 (11:19 +0900)]
Modify folder path with sconscript about memorycache.

our service use memorycache in service side only.
so, move related memorycache files to each of src folder.

second patch included
remove not required comment out in sconScript.

Change-Id: I20b85d824c6ecbd792ab961844d014053a3f4da0
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9961
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoMerge "Merge branch 'master' into notification-service" into notification-service
Madan Lanka [Fri, 5 Aug 2016 05:18:03 +0000 (05:18 +0000)]
Merge "Merge branch 'master' into notification-service" into notification-service

7 years agoAdd userInfo field in NSProviderInfo Struct.
jaesick.shin [Thu, 4 Aug 2016 08:23:22 +0000 (17:23 +0900)]
Add userInfo field in NSProviderInfo Struct.

This commit enables the UserInfo concept in notification provider
in which contains application layer information for filtering.
If application start notification provider with UserInfo set,
Notification provider could send the notification to the consumer which
has the same UserInfo, otherwise, set as NULL value, the provider operates
as before.

Change-Id: I5eb114cd615dabed6a63e1b0099e6c3306f77b2d
Signed-off-by: jaesick.shin <jaesick.shin@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/10017
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
7 years agoTo Enable MQ Cloud Client API for Android
jihwan.seo [Wed, 3 Aug 2016 23:45:49 +0000 (08:45 +0900)]
To Enable MQ Cloud Client API for Android

Change-Id: Ic785552ec5737849e9c7a18035de7d81e74303c9
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9997
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoReplace handling RM routeData
Abhishek Sharma [Fri, 29 Jul 2016 02:29:24 +0000 (11:29 +0900)]
Replace handling RM routeData

Change-Id: Iae81e35edb4988edb9701014ef2813751ff03a41
Signed-off-by: jihwan.seo <jihwan.seo@samsung.com>
Signed-off-by: Abhishek Sharma <ce.abhishek@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9853
Reviewed-by: Dave Thaler <dthaler@microsoft.com>
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ashok Babu Channa <ashok.channa@samsung.com>
7 years agoMerge branch 'master' into notification-service
Hun-je Yeon [Fri, 5 Aug 2016 02:18:20 +0000 (11:18 +0900)]
Merge branch 'master' into notification-service

Update latest master changes into notificaton-service branch

Change-Id: Icc7d996110d14508153dce8e7124573758e7fe09
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>