Remove address from device info

mdg-manager does not provide address info anymore.

Change-Id: I6ba4e738e856ae0827fe0ececd92f7b104baf5f6
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/src/client/client.cc b/src/client/client.cc
index a79a3cf3dba7912cf3d0b3bbf0df494429d9214c..adb46922f1e25f554c65963d3bcfc48d6ba5b0c2 100644 (file)
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -30,7 +30,6 @@ const char kDBPath[] = "/run/capmgr/capmgr.db";
 
 struct capmgr_device_s {
   std::string device_id;
-  std::string address;
   std::string model_name;
   std::string device_name;
   std::string platform_ver;
@@ -59,7 +58,7 @@ API int capmgr_device_foreach_devices(capmgr_device_foreach_cb cb,
       new capmgr::SQLiteConnection(kDBPath, true));
 
   const char kQueryForeachDevices[] =
-      "SELECT device_id, address, model_name, device_name, platform_ver,"
+      "SELECT device_id, model_name, device_name, platform_ver,"
       "  profile, sw_ver "
       "FROM devices";
   std::shared_ptr<capmgr::SQLStatement> stmt = sql_conn->PrepareStatement(
@@ -68,7 +67,6 @@ API int capmgr_device_foreach_devices(capmgr_device_foreach_cb cb,
     struct capmgr_device_s dev;
     int idx = 0;
     dev.device_id = stmt->GetColumnString(idx++);
-    dev.address = stmt->GetColumnString(idx++);
     dev.model_name = stmt->GetColumnString(idx++);
     dev.device_name = stmt->GetColumnString(idx++);
     dev.platform_ver = stmt->GetColumnString(idx++);
@@ -90,7 +88,6 @@ API int capmgr_device_clone(const capmgr_device_h device,
     struct capmgr_device_s* clone = new struct capmgr_device_s;
 
     clone->device_id = device->device_id;
-    clone->address = device->address;
     clone->model_name = device->model_name;
     clone->device_name = device->device_name;
     clone->platform_ver = device->platform_ver;
@@ -127,17 +124,6 @@ API int capmgr_device_get_device_id(capmgr_device_h device,
   return CAPMGR_ERROR_NONE;
 }
 
-API int capmgr_device_get_address(capmgr_device_h device, char** address) {
-  if (!device || !address)
-    return CAPMGR_ERROR_INVALID_PARAMETER;
-
-  *address = strdup(device->address.c_str());
-  if (*address == nullptr)
-    return CAPMGR_ERROR_OUT_OF_MEMORY;
-
-  return CAPMGR_ERROR_NONE;
-}
-
 API int capmgr_device_get_model_name(capmgr_device_h device,
     char** model_name) {
   if (!device || !model_name)

diff --git a/src/client/include/capmgr.h b/src/client/include/capmgr.h
index 52d54b6561b38c9868bf50b68b8d8f6411785ee1..a3a8d758d46c770d7fedf5726c4ecc1f1fd7dee3 100644 (file)
--- a/src/client/include/capmgr.h
+++ b/src/client/include/capmgr.h
@@ -74,11 +74,6 @@ int capmgr_device_destroy(capmgr_device_h device);
  */
 int capmgr_device_get_device_id(capmgr_device_h device, char** device_id);
 
-/**
- * @brief
- */
-int capmgr_device_get_address(capmgr_device_h device, char** address);
-
 /**
  * @brief
  */

diff --git a/src/common/db_manager.cc b/src/common/db_manager.cc
index 8dce347d1f9eb5e7f6aa7da9fcba1a4639650adf..80403b65b68dcfb4aee888eb831c84f4931a46dc 100644 (file)
--- a/src/common/db_manager.cc
+++ b/src/common/db_manager.cc
@@ -20,7 +20,6 @@ const char kDBPath[] = "/run/capmgr/capmgr.db";
 const char kQueryInitDevicesTable[] =
     "CREATE TABLE IF NOT EXISTS devices (\n"
     "  device_id    TEXT,\n"
-    "  address      TEXT,\n"
     "  model_name   TEXT,\n"
     "  device_name  TEXT,\n"
     "  platform_ver TEXT,\n"
@@ -49,9 +48,9 @@ const char kQueryInitRemoteAppsTable[] =
     "  FOREIGN KEY (device_id)\n"
     "  REFERENCES devices (device_id) ON DELETE CASCADE)";
 const char kQueryInsertDev[] =
-    "INSERT INTO devices (device_id, address, model_name, device_name,"
+    "INSERT INTO devices (device_id, model_name, device_name,"
     "  platform_ver, profile, sw_ver) "
-    "VALUES (?, ?, ?, ?, ?, ?, ?)";
+    "VALUES (?, ?, ?, ?, ?, ?)";
 const char kQueryDeleteDev[] =
     "DELETE FROM devices WHERE device_id=?";
 const char kQueryInsertCap[] =
@@ -81,8 +80,6 @@ bool DBManager::InsertDevice(const RemoteDevice& device) {
   int idx = 1;
   if (!stmt->BindString(idx++, device.device_id()))
     return false;
-  if (!stmt->BindString(idx++, device.address()))
-    return false;
   if (!stmt->BindString(idx++, device.model_name()))
     return false;
   if (!stmt->BindString(idx++, device.device_name()))

diff --git a/src/common/mdg_manager.cc b/src/common/mdg_manager.cc
index 695fe3a82f0a5caec33ce7e193470b3c68c35fcc..676eea952e47803fddb29f2404e4d98d695718b0 100644 (file)
--- a/src/common/mdg_manager.cc
+++ b/src/common/mdg_manager.cc
@@ -70,15 +70,6 @@ std::string GetDeviceIdFromHandle(const mdg_device_h device) {
   return device_id;
 }
 
-std::string GetAddrFromHandle(const mdg_device_h device) {
-  char* val;
-  int ret = mdg_device_info_get_addr(device, &val);
-  if (ret != MDG_ERROR_NONE)
-    return {};
-  std::string addr(val);
-  return addr;
-}
-
 std::string GetModelNameFromHandle(const mdg_device_h device) {
   char* val;
   int ret = mdg_device_info_get_model_name(device, &val);
@@ -222,7 +213,6 @@ void MDGManager::GroupInviteFinishCb(int result, mdg_device_h invited_device,
 bool MDGManager::DeviceFoundCb(mdg_device_h device, void* user_data) {
   char* device_id;
   bool is_invited;
-  char* device_addr;
   char* model_name;
 
   int ret = mdg_device_info_get_device_id(device, &device_id);
@@ -238,17 +228,9 @@ bool MDGManager::DeviceFoundCb(mdg_device_h device, void* user_data) {
     return true;
   }
 
-  ret = mdg_device_info_get_addr(device, &device_addr);
-  if (ret != MDG_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get device_addr: " << MDGErrorToString(ret);
-    free(device_id);
-    return true;
-  }
-
   ret = mdg_device_info_get_model_name(device, &model_name);
   if (ret != MDG_ERROR_NONE) {
     LOG(ERROR) << "Failed to get model_name: " << MDGErrorToString(ret);
-    free(device_addr);
     free(device_id);
     return true;
   }
@@ -256,11 +238,9 @@ bool MDGManager::DeviceFoundCb(mdg_device_h device, void* user_data) {
   LOG(INFO) << "Found not invited device. Invite this device. "
             << "device_id: " << device_id
             << ", is_invited: " << is_invited
-            << ", device_addr: " << device_addr
             << ", model_name: " << model_name;
 
   free(model_name);
-  free(device_addr);
   free(device_id);
 
   MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
@@ -294,7 +274,6 @@ void MDGManager::DeviceFinishCb(int result, void* user_data) {
 bool MDGManager::InvitedDeviceFoundCb(mdg_device_h device, void* user_data) {
   char* device_id;
   bool is_invited;
-  char* device_addr;
   char* model_name;
 
   int ret = mdg_device_info_get_device_id(device, &device_id);
@@ -310,17 +289,9 @@ bool MDGManager::InvitedDeviceFoundCb(mdg_device_h device, void* user_data) {
     return true;
   }
 
-  ret = mdg_device_info_get_addr(device, &device_addr);
-  if (ret != MDG_ERROR_NONE) {
-    LOG(ERROR) << "Failed to get device id: " << MDGErrorToString(ret);
-    free(device_id);
-    return true;
-  }
-
   ret = mdg_device_info_get_model_name(device, &model_name);
   if (ret != MDG_ERROR_NONE) {
     LOG(ERROR) << "Failed to get device id: " << MDGErrorToString(ret);
-    free(device_addr);
     free(device_id);
     return true;
   }
@@ -328,11 +299,9 @@ bool MDGManager::InvitedDeviceFoundCb(mdg_device_h device, void* user_data) {
   LOG(INFO) << "Found invited device. "
             << "device_id: " << device_id
             << ", is_invited: " << is_invited
-            << ", device_addr: " << device_addr
             << ", model_name: " << model_name;
 
   free(model_name);
-  free(device_addr);
   free(device_id);
 
   MDGManager* mdgmgr = static_cast<MDGManager*>(user_data);
@@ -378,9 +347,6 @@ bool MDGManager::AddDevice(const mdg_device_h device) {
   std::string device_id = GetDeviceIdFromHandle(device);
   if (device_id.empty())
     return false;
-  std::string address = GetAddrFromHandle(device);
-  if (address.empty())
-    return false;
   std::string model_name = GetModelNameFromHandle(device);
     if (model_name.empty())
     return false;
@@ -395,7 +361,7 @@ bool MDGManager::AddDevice(const mdg_device_h device) {
     return false;
   std::string sw_ver = "5.0";
 
-  RemoteDevice remote_device(device_id, address, model_name, device_name,
+  RemoteDevice remote_device(device_id, model_name, device_name,
       platform_ver, profile, sw_ver);
   RemoteDeviceManager::RegisterRemoteDevice(device_id, remote_device);
 

diff --git a/src/common/remote_device.h b/src/common/remote_device.h
index 5fc1fc8c838cc41bfb2fd0dcf16c4485fad75be1..5608d1430c0829d4bd741e80b1b6b305746b87c0 100644 (file)
--- a/src/common/remote_device.h
+++ b/src/common/remote_device.h
@@ -12,18 +12,16 @@ namespace capmgr {
 
 class RemoteDevice {
  public:
-  explicit RemoteDevice(const std::string& device_id, const std::string address,
+  explicit RemoteDevice(const std::string& device_id,
       const std::string& model_name, const std::string& device_name,
       const std::string& platform_ver, const std::string& profile,
       const std::string& sw_ver)
-      : device_id_(std::move(device_id)), address_(std::move(address)),
-        model_name_(std::move(model_name)),
+      : device_id_(std::move(device_id)), model_name_(std::move(model_name)),
         device_name_(std::move(device_name)),
         platform_ver_(std::move(platform_ver)), profile_(std::move(profile)),
         sw_ver_(std::move(sw_ver)) {}
 
   const std::string& device_id() const { return device_id_; }
-  const std::string& address() const { return address_; }
   const std::string& model_name() const { return model_name_; }
   const std::string& device_name() const { return device_name_; }
   const std::string& platform_ver() const { return platform_ver_; }
@@ -32,7 +30,6 @@ class RemoteDevice {
 
  private:
   std::string device_id_;
-  std::string address_;
   std::string model_name_;
   std::string device_name_;
   std::string platform_ver_;

diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 0cd003b2dfd9df5d26fbd61d35dbfd3f63b4cb3d..0b6fe390d5574ce3cd661e1d2a3e301c9972a909 100644 (file)
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -113,29 +113,25 @@ class SmokeTest : public ::testing::Test {
 };
 
 TEST_F(SmokeTest, InsertDeviceTest) {
-  RemoteDevice dev("insertdev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("insertdev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
 }
 
 TEST_F(SmokeTest, DeleteDeviceTest) {
-  RemoteDevice dev("deletedev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("deletedev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
   ASSERT_TRUE(DBManager::DeleteDevice(dev));
 }
 
 TEST_F(SmokeTest, InsertCapTest) {
-  RemoteDevice dev("insertcapdev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("insertcapdev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
   Capability cap("operation", "uri", "mime", "appid", "pkgid");
   ASSERT_TRUE(DBManager::InsertCapability("insertcapdev", cap));
 }
 
 TEST_F(SmokeTest, DeleteCapTest) {
-  RemoteDevice dev("deletecapdev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("deletecapdev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
   Capability cap("operation", "uri", "mime", "appid", "pkgid");
   ASSERT_TRUE(DBManager::InsertCapability("deletecapdev", cap));
@@ -143,8 +139,7 @@ TEST_F(SmokeTest, DeleteCapTest) {
 }
 
 TEST_F(SmokeTest, InsertPkgTest) {
-  RemoteDevice dev("insertpkgdev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("insertpkgdev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
   std::vector<std::string> v;
   v.emplace_back("hello1");
@@ -154,8 +149,7 @@ TEST_F(SmokeTest, InsertPkgTest) {
 }
 
 TEST_F(SmokeTest, DeletePkgTest) {
-  RemoteDevice dev("deletepkgdev", "addr1234", "tm1", "TM1", "5.0", "mobile",
-      "5.0");
+  RemoteDevice dev("deletepkgdev", "tm1", "TM1", "5.0", "mobile", "5.0");
   ASSERT_TRUE(DBManager::InsertDevice(dev));
   std::vector<std::string> v;
   v.emplace_back("hello1");

diff --git a/src/unit_tests/sql_test/testdb.sql b/src/unit_tests/sql_test/testdb.sql
index 32312d8bed8879a6db0861860158a1bc5cd5ee7a..f29e3b4a9240d267936dac7c0cb1e4d4a0f9c91b 100644 (file)
--- a/src/unit_tests/sql_test/testdb.sql
+++ b/src/unit_tests/sql_test/testdb.sql
@@ -8,7 +8,6 @@ CREATE TABLE IF NOT EXISTS capability (
 CREATE TABLE IF NOT EXISTS devices (
   name TEXT NOT NULL,
   profile TEXT,
-  address TEXT,
   uuid TEXT,
   sw_version TEXT,
   platform_version TEXT,