Fixed iot-es demo. Added auto-setup of name and model to slave.Removed mediator in...

diff --git a/demo/iot-es/scripts/gbs.conf b/demo/iot-es/scripts/gbs.conf
index 1d574ac..da18238 100644 (file)
--- a/demo/iot-es/scripts/gbs.conf
+++ b/demo/iot-es/scripts/gbs.conf
@@ -1,18 +1,44 @@
 [general]
-profile = profile.tzmb_3.0_TM2
+#profile = profile.Main2017_KantM
+profile = profile.tizen_phone_arm64_3_0
 
 [obs.tizen_org]
 url = https://api.tizen.org
 
+[obs.tizentv]
+url = https://168.219.241.169/api
+user = obs_viewer
+passwdx = QlpoOTFBWSZTWRLL1vsAAASLgCEgAACSIJmAIAAxA0DQKZMGnqnmfEjRAP8XckU4UJASy9b7
+
+#############################################z KantM
+
+[repo.base_Main2017]
+url=http://10.103.211.119/tizen-rsa/tizen-3.0-base-main2017/standard/latest/repos/base/armv7l/packages/
+[repo.srk_Main2017]
+url = http://106.125.46.44/repo/kantm/packages/
+[repo.local_Main2017]
+url=~/GBS_ROOT_3.0/local/repos/Main2017/armv7l
+[repo.product_Main2017_KantM]
+url=http://10.103.211.119/releases/tizen-3.0-product-main2017/product/KantM/latest/repos/product/armv7l/packages/
+url=http://10.103.211.119/releases/tizen-3.0-product-main2017/product/KantM/TIZEN-3.0-MAIN2017-KantM-RELEASE_20170419.1/repos/product/armv7l/packages/
+
+
+[profile.Main2017_KantM]
+obs = obs.tizentv
+repos = repo.product_Main2017_KantM, repo.srk_Main2017, repo.base_Main2017, repo.local_Main2017
+buildroot = ~/GBS_ROOT_3.0
+
 ############################################# Profile [profile.tzmb_3.0_TM2]
 
 [profile.tzmb_3.0_TM2]
 obs = obs.tizen_org
-repos = repo.tzmb_3.0_TM2_base, repo.tzmb_4.0_unified
+repos = repo.tzmb_3.0_TM2_base, repo.tzmb_3.0_TM2_srk, repo.tzmb_4.0_unified
 buildroot = ~/GBS_ROOT_3.0_TM2
 
 [repo.tzmb_3.0_TM2_base]
 url = http://download.tizen.org/snapshots/tizen/base/tizen-base_20170421.1/repos/arm64/packages/
+[repo.tzmb_3.0_TM2_srk]
+url = http://106.125.46.44/repo/tm2/packages/
 [repo.tzmb_4.0_unified]
 url = http://download.tizen.org/snapshots/tizen/unified/tizen-unified_20170421.1/repos/standard/packages/
 
@@ -21,10 +47,15 @@ url = http://download.tizen.org/snapshots/tizen/unified/tizen-unified_20170421.1
 
 [profile.tzmb_3.0_TM1]
 obs = obs.tizen_org
-repos = repo.tzmb_3.0_TM1_base, repo.tzmb_3.0_TM1
+repos = repo.tzmb_3.0_TM1_base, repo.tzmb_3.0_TM1_srk, repo.tzmb_3.0_TM1
 buildroot = ~/GBS_ROOT_3.0_TM1
 
 [repo.tzmb_3.0_TM1_base]
 url = http://download.tizen.org/snapshots/tizen/base/latest/repos/arm/packages/
+[repo.tzmb_3.0_TM1_srk]
+url = http://106.125.46.44/repo/tm1/packages/
 [repo.tzmb_3.0_TM1]
 url = http://download.tizen.org/snapshots/tizen/mobile/latest/repos/arm-wayland/packages/
+
+
+

diff --git a/demo/iot-es/src/CMakeLists.txt b/demo/iot-es/src/CMakeLists.txt
index 9bf3747..99920bc 100644 (file)
--- a/demo/iot-es/src/CMakeLists.txt
+++ b/demo/iot-es/src/CMakeLists.txt
@@ -75,7 +75,10 @@ message(STATUS "COMMON_CMAKE_C_FLAGS: " ${CMAKE_C_FLAGS})
 message(STATUS "COMMON_CMAKE_CXX_FLAGS: " ${CMAKE_CXX_FLAGS})
 
 
-add_subdirectory(master)
+IF(NOT "${FLAVOR}" STREQUAL "GBS")
+       add_subdirectory(master)
+endif()
+
 add_subdirectory(slave)
-add_subdirectory(simple)
+#add_subdirectory(simple)
 add_subdirectory(authcode)

diff --git a/demo/iot-es/src/authcode/samsungauthcodeprovider.cpp b/demo/iot-es/src/authcode/samsungauthcodeprovider.cpp
index 86c4145..98209c2 100644 (file)
--- a/demo/iot-es/src/authcode/samsungauthcodeprovider.cpp
+++ b/demo/iot-es/src/authcode/samsungauthcodeprovider.cpp
@@ -17,5 +17,5 @@ std::string SamsungAuthCodeProvider::getAuthCode(std::string login, std::string
 
 std::string SamsungAuthCodeProvider::getName()
 {
-    return "github";
+    return "samsung";
 }

diff --git a/demo/iot-es/src/master/mediator_cpp.cpp b/demo/iot-es/src/master/mediator_cpp.cpp
index b36e448..9863e59 100755 (executable)
--- a/demo/iot-es/src/master/mediator_cpp.cpp
+++ b/demo/iot-es/src/master/mediator_cpp.cpp
@@ -23,7 +23,7 @@
 
 #include "OCPlatform.h"
 #include "OCApi.h"
-#include "OCProvisioningManager.hpp"
+//#include "OCProvisioningManager.hpp"
 
 #include "EasySetup.hpp"
 #include "ESRichCommon.h"
@@ -47,14 +47,14 @@ static std::shared_ptr<OC::OCResource> curResource = nullptr;
 static std::mutex g_discoverymtx;
 static std::condition_variable g_cond;
 
-static std::string host("coap+tcp://106.125.33.185:5683");
+static std::string host("coap+tcp://106.125.46.44:5683");
 static std::string login("webappsjohn");
 static std::string password("rewg4321");
-static GithubAuthCodeProvider authProvider;
+static SamsungAuthCodeProvider authProvider;
 
 /* NOTE userId and accessToken can be empty */
-static std::string userId("a4faeb88-a105-438b-87c1-773adc461af8");
-static std::string accessToken("3fb2b6a6596f712becf4c41031cd141432d7e2c7");
+static std::string userId;//("a4faeb88-a105-438b-87c1-773adc461af8");
+static std::string accessToken;//("3fb2b6a6596f712becf4c41031cd141432d7e2c7");
 static std::string cloudId;
 
 
@@ -343,7 +343,7 @@ void foundES(std::shared_ptr<OC::OCResource> resource)
 
 
         auto remote = EasySetup::getInstance()->createRemoteEnrollee(resource);
-        //remote->getConfiguration(getConfigurationCallback);
+        remote->getConfiguration(getConfigurationCallback);
         provisionCloudProperty(remote);
     }
 }
@@ -405,25 +405,26 @@ int main()
 {
     try
     {
-        std::cout << "IoTivity configuring..." << std::endl;
-        std::flush(std::cout);
+        std::cout << "IoTivity configuring..." << std::endl << std::flush;
         OCPersistentStorage ps {client_open, fread, fwrite, fclose, unlink };
         PlatformConfig config { OC::ServiceType::InProc, ModeType::Both, "0.0.0.0", 0, OC::QualityOfService::HighQos, &ps };
         OCPlatform::Configure(config);
 
-        std::cout << "Construct Account Manager... " << std::endl;
-        std::flush(std::cout);
+        std::cout << "Construct Account Manager... " << std::endl << std::flush;
         OCAccountManager::Ptr accountMgr = OCPlatform::constructAccountManagerObject(host, CT_ADAPTER_TCP);
 
-        std::cout << "Self signin/signup... " << std::endl;
-        std::flush(std::cout);
+        std::cout << "Self signin/signup... " << std::endl << std::flush;
 
         mutex blocker;
         unique_lock<mutex> lock(blocker);
 
         if (userId.size() == 0 || accessToken.size() == 0)
         {
-            accountMgr->signUp(authProvider.getName(), authProvider.getAuthCode(login, password), &handleLoginoutCB);
+            std::string providerParam = authProvider.getName();
+            std::cout << "providerParam=" << providerParam << std::endl << std::flush;
+            std::string authcode = authProvider.getAuthCode(login, password);
+            std::cout << "authcode=" << authcode << std::endl << std::flush;
+            accountMgr->signUp(providerParam, authcode, &handleLoginoutCB);
             g_callbackLock.wait(lock);
         }
 

diff --git a/demo/iot-es/src/slave/easysetup_x.c b/demo/iot-es/src/slave/easysetup_x.c
index dbcc4b4..baa6dfe 100755 (executable)
--- a/demo/iot-es/src/slave/easysetup_x.c
+++ b/demo/iot-es/src/slave/easysetup_x.c
@@ -22,7 +22,7 @@
 #include "easysetup_x.h"
 #include "string.h"
 //#include "logger.h"
-#include "ocpayload.h"
+//#include "ocpayload.h"
 #include <stdlib.h>
 
 /**

diff --git a/demo/iot-es/src/slave/enrolleewifi.c b/demo/iot-es/src/slave/enrolleewifi.c
index fa18a2e..62e71b2 100755 (executable)
--- a/demo/iot-es/src/slave/enrolleewifi.c
+++ b/demo/iot-es/src/slave/enrolleewifi.c
@@ -25,6 +25,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <pthread.h>
 
 #define TAG "ENROLLEE_SAMPLE"
@@ -171,9 +172,16 @@ void SetDeviceInfo()
 
     ESDeviceProperty deviceProperty =
     {
-        {{WIFI_11G, WIFI_11N, WIFI_11AC, WiFi_EOF}, WIFI_5G}, {"Test Device", "Test Model Number"}
+        {{WIFI_11G, WIFI_11N, WIFI_11AC, WiFi_EOF}, WIFI_5G}
     };
 
+    sprintf(deviceProperty.DevConf.deviceName, "Console Device %d", rand()%1000000);
+    sprintf(deviceProperty.DevConf.modelNumber, "%d", rand()%100);
+
+    printf("\n\nDevice name: %s\nModel number: %s\n\n\n",
+           deviceProperty.DevConf.deviceName,
+           deviceProperty.DevConf.modelNumber);
+
     // Set user properties if needed
     char userValue_str[] = "user_str";
     g_userProperties.userValue_int = 0;
@@ -224,8 +232,8 @@ int main()
     PrintMenu();
     char option;
 
-    printf("Failed to read input data\n");
     StartEasySetup();
+    SetDeviceInfo();
 
     while(true)
     {