Network manager to control app API unowned devices discovery implemented.

diff --git a/network-manager/nmlib/IoT/inc/iotdevice_impl.h b/network-manager/nmlib/IoT/inc/iotdevice_impl.h
index 6d9cc8f..d4f6001 100644 (file)
--- a/network-manager/nmlib/IoT/inc/iotdevice_impl.h
+++ b/network-manager/nmlib/IoT/inc/iotdevice_impl.h
@@ -15,7 +15,9 @@ namespace NetworkManager {
 
 class IoTDevice_impl: public IoTDevice
 {
-public:    
+public:
+    const unsigned CALLBACK_WAIT_TIMEOUT_S = 1;
+
     IoTDevice_impl(std::shared_ptr<OC::OCResource> device_resource);
     ~IoTDevice_impl() override;
 
@@ -27,6 +29,8 @@ public:
     
     const std::string& getType() override;
 
+    const std::string& getHost() override;
+
     bool isOnline() override;
     
     void ownDevice() override;
@@ -41,6 +45,8 @@ private:
     std::string spec_ver;
     std::mutex mtx;
     std::condition_variable cond_var;
+
+    static const std::string dev_info_uri;
 };
 
 }

diff --git a/network-manager/nmlib/IoT/src/IOT_DeviceFinder.cpp b/network-manager/nmlib/IoT/src/IOT_DeviceFinder.cpp
index 629475b..b895f6f 100644 (file)
--- a/network-manager/nmlib/IoT/src/IOT_DeviceFinder.cpp
+++ b/network-manager/nmlib/IoT/src/IOT_DeviceFinder.cpp
@@ -19,14 +19,14 @@ std::vector<std::shared_ptr<OC::OCResource>> IOT_DeviceFinder::operator()(  cons
                                                                             OC::QualityOfService _QoS /*= OC::QualityOfService::LowQos*/,
                                                                             int _wait_for_sec /*= 3*/   )
 {
-//    OC::OCPlatform::findResourceList(   _host,
-//                                        _request_uri,
-//                                        _connectivity_type,
-//                                        [this](std::vector<std::shared_ptr<OC::OCResource>> _resources)
-//                                        {
-//                                            std::copy(_resources.begin(), _resources.end(), std::back_inserter(this->m_devices));
-//                                        },
-//                                        _QoS    );
-//    std::this_thread::sleep_for(std::chrono::seconds(_wait_for_sec));
+    OC::OCPlatform::findResourceList(   _host,
+                                        _request_uri,
+                                        _connectivity_type,
+                                        [this](std::vector<std::shared_ptr<OC::OCResource>> _resources)
+                                        {
+                                            std::copy(_resources.begin(), _resources.end(), std::back_inserter(this->m_devices));
+                                        },
+                                        _QoS    );
+    std::this_thread::sleep_for(std::chrono::seconds(_wait_for_sec));
     return m_devices;
 }

diff --git a/network-manager/nmlib/IoT/src/iotdevice_impl.cpp b/network-manager/nmlib/IoT/src/iotdevice_impl.cpp
index 2043801..987f127 100644 (file)
--- a/network-manager/nmlib/IoT/src/iotdevice_impl.cpp
+++ b/network-manager/nmlib/IoT/src/iotdevice_impl.cpp
@@ -1,53 +1,46 @@
 #include "iotdevice_impl.h"
+#include <chrono>
 
 using namespace OC;
 
 namespace NetworkManager {
 
+const std::string IoTDevice_impl::dev_info_uri{"/oic/d"};
 
 IoTDevice_impl::IoTDevice_impl(std::shared_ptr<OCResource> device_resource)
     : dev(device_resource), name("unknown"), model("unknown"), type("unknown"), uuid("unknown"), spec_ver("unknown")
 {
     OCPlatform::getDeviceInfo(device_resource->host(),
-                              device_resource->uri(),
+                              dev_info_uri,
                               device_resource->connectivityType(),
                               [this](const OCRepresentation& rep){
         std::string value;
-        std::cout << "In get device info callback" << std::endl;
 
         if(rep.getValue("di", value))
         {
-            std::cout << "uid: " << value << std::endl;
             this->uuid = std::move(value);
         }
 
         if(rep.getValue("n", value))
         {
-            std::cout << "Name: " << value << std::endl;
             this->name = std::move(value);
         }
 
         if(rep.getValue("lcv", value))
         {
-            std::cout << "lcv: " << value << std::endl;
             this->spec_ver = std::move(value);
         }
 
         if(rep.getValue("dmv", value))
         {
-            std::cout << "dmv: " << value << std::endl;
             this->model = std::move(value);
         }
 
-        std::cout << "Notify done" << std::endl;
         this->cond_var.notify_all();
     });
 
-    std::cout << "Lock until device info callback call" << std::endl;
     std::unique_lock<std::mutex> lock(mtx);
-
-    cond_var.wait(lock);
-    std::cout << "unlocked" << std::endl;
+    cond_var.wait_for(lock, std::chrono::seconds(CALLBACK_WAIT_TIMEOUT_S));
 }
 
 IoTDevice_impl::~IoTDevice_impl() 
@@ -75,6 +68,11 @@ const std::string& IoTDevice_impl::getType()
     return type;
 }
 
+const std::string& IoTDevice_impl::getHost()
+{
+    return dev->host();
+}
+
 bool IoTDevice_impl::isOnline()
 {
     // TODO: add implementation

diff --git a/network-manager/nmlib/IoT/src/iotivity.cpp b/network-manager/nmlib/IoT/src/iotivity.cpp
index f7f8eca..6b4b95a 100644 (file)
--- a/network-manager/nmlib/IoT/src/iotivity.cpp
+++ b/network-manager/nmlib/IoT/src/iotivity.cpp
@@ -8,6 +8,7 @@
 #include <OCPlatform.h>
 #pragma GCC diagnostic pop
 #include <unistd.h>
+#include "nmexceptions.h"
 
 namespace NetworkManager {
 
@@ -23,10 +24,10 @@ IoTivity::IoTivity()
 
 }
 
-static FILE *open_ps(const char * /*path*/, const char *mode)
-{
-    return fopen("/tmp/ps.dat", mode);
-}
+//static FILE *open_ps(const char * /*path*/, const char *mode)
+//{
+//    return fopen("/tmp/ps.dat", mode);
+//}
 
 IoTivity* IoTivity::getInstance()
 {
@@ -39,12 +40,10 @@ IoTivity* IoTivity::getInstance()
                 "0.0.0.0",
                 0,
                 OC::QualityOfService::HighQos
-            },
-        {open_ps, fread, fwrite, fclose, unlink}
+            }
+            //,{open_ps, fread, fwrite, fclose, unlink}
         };
-        std::cout << "IoTivity init start" << std::endl;
         OC::OCPlatform::Configure(instance->params->config);
-        std::cout << "IoTivity init ok" << std::endl;
     }
     return instance;
 }
@@ -78,16 +77,25 @@ IoTDevicesMap IoTivity::getUnOwnedDevices()
 {
     IoTDevicesMap map{};
     IOT_DeviceFinder dev_finder;
-    std::cout << "Search for IoT devices" << std::endl;
+
     auto devs = dev_finder();
-    std::cout << "Found " << devs.size() << " devices" << std::endl;
-    for (auto d : devs) {
-        std::cout << "insert" << std::endl;
+
+    for (auto d : devs)
+    {
         std::shared_ptr<IoTDevice> dev(new IoTDevice_impl(d));
-        auto res = map.emplace(dev->getName(), dev);
+        auto it = map.find(dev->getUUID());
+
+        if (it != map.end())
+        {
+            // TODO: implement selection of most preferable protocol
+        }
+        else
+        {
+            auto res = map.emplace(dev->getUUID(), dev);
 
-        if (!res.second) {
-            std::cerr << "IoTDevicesMap insertion failed" << std::endl;
+            if (!res.second) {
+                throw IoTInternalError("Out of memory");
+            }
         }
     }
     return map;

diff --git a/network-manager/nmlib/ctrl_app/src/iot_dev_manager.cpp b/network-manager/nmlib/ctrl_app/src/iot_dev_manager.cpp
index 337e737..71564fe 100644 (file)
--- a/network-manager/nmlib/ctrl_app/src/iot_dev_manager.cpp
+++ b/network-manager/nmlib/ctrl_app/src/iot_dev_manager.cpp
@@ -101,13 +101,12 @@ const char* NM_deviceListEnum(NM_hDeviceList dev_list)
 
 NM_ErrorCode NM_deviceListForEach(NM_hDeviceList dev_list, NM_deviceEnumerationCb callback, void* user_defined)
 {
-    std::cout << "in for each " << dev_list->map.size() << std::endl;
+    if (dev_list == nullptr || callback == nullptr) return EC_NULL_POINTER;
+
     for (auto dev: dev_list->map)
     {
-        std::cout << "cb call" << std::endl;
         callback(dev_list, dev.first.c_str(), user_defined);
     }
-    std::cout << "out for each" << std::endl;
     return EC_OK;
 }
 

diff --git a/network-manager/nmlib/include/iotdevice.h b/network-manager/nmlib/include/iotdevice.h
index bde8727..8ef03c2 100644 (file)
--- a/network-manager/nmlib/include/iotdevice.h
+++ b/network-manager/nmlib/include/iotdevice.h
@@ -19,6 +19,8 @@ public:
     
     virtual const std::string& getType() = 0;
 
+    virtual const std::string& getHost() = 0;
+
     virtual bool isOnline() = 0;
     
     virtual void ownDevice() = 0;

diff --git a/network-manager/test/test_iot_dev_manager.cpp b/network-manager/test/test_iot_dev_manager.cpp
index 5c73137..b7cc9e1 100644 (file)
--- a/network-manager/test/test_iot_dev_manager.cpp
+++ b/network-manager/test/test_iot_dev_manager.cpp
@@ -14,7 +14,6 @@ public:
 
     void TearDown() override
     {
-        std::cout << "clean up" << std::endl;
         ASSERT_NO_THROW(NM_cleanup(&ctx));
     }
 protected:
@@ -23,7 +22,6 @@ protected:
 
 void each_callback(NM_hDeviceList list, const char* uid, void* param)
 {
-    std::cout << "in call back" << std::endl;
     NM_DeviceInfo info;
     ASSERT_EQ(EC_OK, NM_getDeviceInfo(list, uid, &info));
 
@@ -38,22 +36,16 @@ void each_callback(NM_hDeviceList list, const char* uid, void* param)
 }
 
 
-TEST_F(IoTDevManagerTest, owned_dev_discovery)
+TEST_F(IoTDevManagerTest, unowned_dev_discovery)
 {
     NM_hDeviceList dev_list;
 
     ASSERT_EQ(EC_NULL_POINTER, NM_getUnownedDevices(ctx, nullptr));
 
     ASSERT_EQ(EC_OK, NM_getUnownedDevices(ctx, &dev_list));
-    std::cout << "1" << std::endl;
-    /*ASSERT_NO_THROW(NM_getListSize(dev_list));
-    std::cout << "2" << std::endl;
+    ASSERT_NO_THROW(NM_getListSize(dev_list));
     ASSERT_EQ(EC_NULL_POINTER, NM_deviceListForEach(nullptr, each_callback, nullptr));
-    std::cout << "3" << std::endl;
     ASSERT_EQ(EC_OK, NM_deviceListForEach(dev_list, each_callback, nullptr));
-    std::cout << "4" << std::endl;
     NM_freeDeviceList(nullptr);
-    std::cout << "5" << std::endl;
-    NM_freeDeviceList(&dev_list);*/
-    std::cout << "6" << std::endl;
+    NM_freeDeviceList(&dev_list);
 }