commit ebd4538fe7ee5c9266412f4a05649ba542f27c43
author Alex Vakulenko <avakulenko@google.com> Thu Apr 21 11:37:22 2016 -0700
committer Alex Vakulenko <avakulenko@google.com> Thu Apr 21 11:37:22 2016 -0700
tree cd2296e55306daea485131b575e1e1bd6b31dfed
parent 1333c63f8e0f69d7c426087502b729fa250144f7

weaved: Fix LocalAccessEnabled flags to reflect changes in libweave

On the libweave side, local_discovery_enabled and local_pairing_enabled
settings have been consolidated under one: "local_access_enabled".
Must made similar fixes in weaved for it to compile and work correctly.

Change-Id: I6b28aae80b374508419a69ea1b9e6874d61dd12e

buffet/buffet_config.cc

diff --git a/buffet/buffet_config.cc b/buffet/buffet_config.cc
index 16672f6..942cd3c 100644
--- a/buffet/buffet_config.cc
+++ b/buffet/buffet_config.cc
@@ -60,8 +60,7 @@
 const char kDescription[] = "description";
 const char kLocation[] = "location";
 const char kLocalAnonymousAccessRole[] = "local_anonymous_access_role";
-const char kLocalDiscoveryEnabled[] = "local_discovery_enabled";
-const char kLocalPairingEnabled[] = "local_pairing_enabled";
+const char kLocalAccessEnabled[] = "local_access_enabled";
 const char kOemName[] = "oem_name";
 const char kModelName[] = "model_name";
 const char kModelId[] = "model_id";
@@ -149,10 +148,8 @@
     if (!StringToEnum(role_str, &settings->local_anonymous_access_role))
       return false;
   }
-  store.GetBoolean(config_keys::kLocalDiscoveryEnabled,
-                   &settings->local_discovery_enabled);
-  store.GetBoolean(config_keys::kLocalPairingEnabled,
-                   &settings->local_pairing_enabled);
+  store.GetBoolean(config_keys::kLocalAccessEnabled,
+                   &settings->local_access_enabled);
   store.GetBoolean(config_keys::kAllowEndpointsOverride,
                    &settings->allow_endpoints_override);
   return true;

buffet/buffet_config_unittest.cc

diff --git a/buffet/buffet_config_unittest.cc b/buffet/buffet_config_unittest.cc
index 24c8a72..373a18c 100644
--- a/buffet/buffet_config_unittest.cc
+++ b/buffet/buffet_config_unittest.cc
@@ -42,8 +42,7 @@
   config_store.SetString("description", "conf_description");
   config_store.SetString("location", "conf_location");
   config_store.SetString("local_anonymous_access_role", "user");
-  config_store.SetBoolean("local_pairing_enabled", false);
-  config_store.SetBoolean("local_discovery_enabled", false);
+  config_store.SetBoolean("local_access_enabled", false);
   config_store.SetBoolean("allow_endpoints_override", true);
 
   // Following will be ignored.
@@ -74,8 +73,7 @@
   EXPECT_EQ("conf_description", settings.description);
   EXPECT_EQ("conf_location", settings.location);
   EXPECT_EQ(weave::AuthScope::kUser, settings.local_anonymous_access_role);
-  EXPECT_FALSE(settings.local_pairing_enabled);
-  EXPECT_FALSE(settings.local_discovery_enabled);
+  EXPECT_FALSE(settings.local_access_enabled);
   EXPECT_TRUE(settings.allow_endpoints_override);
 }