commit 468f7f3cba125e69ae29a44b55b1f3008a4aa215
author Alex Vakulenko <avakulenko@chromium.org> Wed Apr 08 10:42:45 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Apr 09 22:33:43 2015 +0000
tree 241ff6aa6de6f7e4a83264d2a79705ff0dc28e64
parent 9e2f8cda5fb177d7dc8d43011eea3829427e34cd

buffet: Deprecate "displayName" in favor of "name" in device resource

GCD spec deprecated "displayName" and "systemName" and now requires
to use just "name" in device resource. Make the corresponding change
to buffet to match the spec.

BUG=brillo:778
TEST=`FEATURES=test emerge-link buffet`
     `test_that -b link --fast 100.96.48.244 e:buffet_.*`
CQ-DEPEND=CL:264751

Change-Id: Iffc7d2ac2d5fa57282e607ff801f0d4b04e58e28
Reviewed-on: https://chromium-review.googlesource.com/264577
Trybot-Ready: Alex Vakulenko <avakulenko@chromium.org>
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: Vitaly Buka <vitalybuka@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>

buffet/device_registration_info.cc

diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc
index a87436d..c9da52b 100644
--- a/buffet/device_registration_info.cc
+++ b/buffet/device_registration_info.cc
@@ -39,7 +39,7 @@
 const char kRefreshToken[]  = "refresh_token";
 const char kDeviceId[]      = "device_id";
 const char kRobotAccount[]  = "robot_account";
-const char kDisplayName[]   = "display_name";
+const char kName[]          = "name";
 const char kDescription[]   = "description";
 const char kLocation[]      = "location";
 
@@ -183,20 +183,20 @@
   std::string refresh_token;
   std::string device_id;
   std::string device_robot_account;
-  std::string display_name;
+  std::string name;
   std::string description;
   std::string location;
   if (!dict->GetString(storage_keys::kRefreshToken, &refresh_token) ||
       !dict->GetString(storage_keys::kDeviceId, &device_id) ||
       !dict->GetString(storage_keys::kRobotAccount, &device_robot_account) ||
-      !dict->GetString(storage_keys::kDisplayName, &display_name) ||
+      !dict->GetString(storage_keys::kName, &name) ||
       !dict->GetString(storage_keys::kDescription, &description) ||
       !dict->GetString(storage_keys::kLocation, &location)) {
     return false;
   }
   refresh_token_        = refresh_token;
   device_robot_account_ = device_robot_account;
-  display_name_         = display_name;
+  name_                 = name;
   description_          = description;
   location_             = location;
 
@@ -220,7 +220,7 @@
   dict.SetString(storage_keys::kRefreshToken, refresh_token_);
   dict.SetString(storage_keys::kDeviceId,     device_id_);
   dict.SetString(storage_keys::kRobotAccount, device_robot_account_);
-  dict.SetString(storage_keys::kDisplayName,  display_name_);
+  dict.SetString(storage_keys::kName,         name_);
   dict.SetString(storage_keys::kDescription,  description_);
   dict.SetString(storage_keys::kLocation,     location_);
 
@@ -401,9 +401,7 @@
   if (!device_id_.empty())
     resource->SetString("id", device_id_);
   resource->SetString("deviceKind", config_->device_kind());
-  resource->SetString("name", config_->name());
-  if (!display_name_.empty())
-    resource->SetString("displayName", display_name_);
+  resource->SetString("name", name_.empty() ? config_->name() : name_);
   if (!description_.empty())
     resource->SetString("description", description_);
   if (!location_.empty())
@@ -468,8 +466,7 @@
   }
   // These fields are optional, and will default to values from the manufacturer
   // supplied config.
-  GetWithDefault(params, storage_keys::kDisplayName,
-                 config_->default_display_name(), &display_name_);
+  GetWithDefault(params, storage_keys::kName, config_->name(), &name_);
   GetWithDefault(params, storage_keys::kDescription,
                  config_->default_description(), &description_);
   GetWithDefault(params, storage_keys::kLocation,