shill: ipconfig: Deprecate flimflam namespace.
CL:170123 moves all DBus service constants from the flimflam namespace
to the shill namespace. This CL removes the use of the flimflam
namespace in IP configuration code.
BUG=chromium:295425
CQ-DEPEND=CL:170123
TEST=Unit tests and trybot runs on release builders.
Change-Id: I557f9d16afe5cf711c1c5db31897db483d00f719
Reviewed-on: https://chromium-review.googlesource.com/170208
Reviewed-by: Ben Chan <benchan@chromium.org>
Tested-by: Ben Chan <benchan@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/dhcp_config.cc b/dhcp_config.cc
index e14b878..ff2d3b1 100644
--- a/dhcp_config.cc
+++ b/dhcp_config.cc
@@ -372,7 +372,7 @@
bool DHCPConfig::ParseConfiguration(const Configuration &configuration,
IPConfig::Properties *properties) {
SLOG(DHCP, 2) << __func__;
- properties->method = flimflam::kTypeDHCP;
+ properties->method = kTypeDHCP;
properties->address_family = IPAddress::kFamilyIPv4;
string classless_static_routes;
bool default_gateway_parse_error = false;
diff --git a/dhcp_config_unittest.cc b/dhcp_config_unittest.cc
index 8116a65..0b2272d 100644
--- a/dhcp_config_unittest.cc
+++ b/dhcp_config_unittest.cc
@@ -671,7 +671,7 @@
::DBus::Error error;
// Ensure that an attempt to write a R/O property returns InvalidArgs error.
EXPECT_FALSE(DBusAdaptor::SetProperty(config_->mutable_store(),
- flimflam::kAddressProperty,
+ kAddressProperty,
PropertyStoreTest::kStringV,
&error));
ASSERT_TRUE(error.is_set()); // name() may be invalid otherwise
diff --git a/ipconfig.cc b/ipconfig.cc
index 5eec6de..4ff708f 100644
--- a/ipconfig.cc
+++ b/ipconfig.cc
@@ -45,21 +45,16 @@
}
void IPConfig::Init() {
- store_.RegisterConstString(flimflam::kAddressProperty,
- &properties_.address);
- store_.RegisterConstString(flimflam::kBroadcastProperty,
+ store_.RegisterConstString(kAddressProperty, &properties_.address);
+ store_.RegisterConstString(kBroadcastProperty,
&properties_.broadcast_address);
- store_.RegisterConstString(flimflam::kDomainNameProperty,
- &properties_.domain_name);
- store_.RegisterConstString(flimflam::kGatewayProperty, &properties_.gateway);
- store_.RegisterConstString(flimflam::kMethodProperty, &properties_.method);
- store_.RegisterConstInt32(flimflam::kMtuProperty, &properties_.mtu);
- store_.RegisterConstStrings(flimflam::kNameServersProperty,
- &properties_.dns_servers);
- store_.RegisterConstString(flimflam::kPeerAddressProperty,
- &properties_.peer_address);
- store_.RegisterConstInt32(flimflam::kPrefixlenProperty,
- &properties_.subnet_prefix);
+ store_.RegisterConstString(kDomainNameProperty, &properties_.domain_name);
+ store_.RegisterConstString(kGatewayProperty, &properties_.gateway);
+ store_.RegisterConstString(kMethodProperty, &properties_.method);
+ store_.RegisterConstInt32(kMtuProperty, &properties_.mtu);
+ store_.RegisterConstStrings(kNameServersProperty, &properties_.dns_servers);
+ store_.RegisterConstString(kPeerAddressProperty, &properties_.peer_address);
+ store_.RegisterConstInt32(kPrefixlenProperty, &properties_.subnet_prefix);
store_.RegisterConstStrings(kSearchDomainsProperty,
&properties_.domain_search);
store_.RegisterConstString(kWebProxyAutoDiscoveryUrlProperty,
@@ -142,10 +137,8 @@
}
void IPConfig::EmitChanges() {
- adaptor_->EmitStringChanged(flimflam::kAddressProperty,
- properties_.address);
- adaptor_->EmitStringsChanged(flimflam::kNameServersProperty,
- properties_.dns_servers);
+ adaptor_->EmitStringChanged(kAddressProperty, properties_.address);
+ adaptor_->EmitStringsChanged(kNameServersProperty, properties_.dns_servers);
}
} // namespace shill
diff --git a/ipconfig_unittest.cc b/ipconfig_unittest.cc
index 1c407aa..6d38088 100644
--- a/ipconfig_unittest.cc
+++ b/ipconfig_unittest.cc
@@ -161,19 +161,19 @@
IPConfigMockAdaptor *adaptor = GetAdaptor();
StaticIPParameters static_ip_params;
- EXPECT_CALL(*adaptor, EmitStringChanged(flimflam::kAddressProperty, _));
- EXPECT_CALL(*adaptor, EmitStringsChanged(flimflam::kNameServersProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringChanged(kAddressProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringsChanged(kNameServersProperty, _));
ipconfig_->ApplyStaticIPParameters(&static_ip_params);
Mock::VerifyAndClearExpectations(adaptor);
IPConfig::Properties ip_properties;
- EXPECT_CALL(*adaptor, EmitStringChanged(flimflam::kAddressProperty, _));
- EXPECT_CALL(*adaptor, EmitStringsChanged(flimflam::kNameServersProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringChanged(kAddressProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringsChanged(kNameServersProperty, _));
UpdateProperties(ip_properties, true);
Mock::VerifyAndClearExpectations(adaptor);
- EXPECT_CALL(*adaptor, EmitStringChanged(flimflam::kAddressProperty, _));
- EXPECT_CALL(*adaptor, EmitStringsChanged(flimflam::kNameServersProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringChanged(kAddressProperty, _));
+ EXPECT_CALL(*adaptor, EmitStringsChanged(kNameServersProperty, _));
UpdateProperties(ip_properties, false);
Mock::VerifyAndClearExpectations(adaptor);
}
diff --git a/static_ip_parameters.cc b/static_ip_parameters.cc
index 7842d85..3def6ac 100644
--- a/static_ip_parameters.cc
+++ b/static_ip_parameters.cc
@@ -28,12 +28,12 @@
const char StaticIPParameters::kSavedConfigKeyPrefix[] = "SavedIP.";
// static
const StaticIPParameters::Property StaticIPParameters::kProperties[] = {
- { flimflam::kAddressProperty, Property::kTypeString },
- { flimflam::kGatewayProperty, Property::kTypeString },
- { flimflam::kMtuProperty, Property::kTypeInt32 },
- { flimflam::kNameServersProperty, Property::kTypeStrings },
- { flimflam::kPeerAddressProperty, Property::kTypeString },
- { flimflam::kPrefixlenProperty, Property::kTypeInt32 }
+ { kAddressProperty, Property::kTypeString },
+ { kGatewayProperty, Property::kTypeString },
+ { kMtuProperty, Property::kTypeInt32 },
+ { kNameServersProperty, Property::kTypeStrings },
+ { kPeerAddressProperty, Property::kTypeString },
+ { kPrefixlenProperty, Property::kTypeInt32 }
};
StaticIPParameters::StaticIPParameters() {}
@@ -196,12 +196,12 @@
props->address_family = IPAddress::kFamilyIPv4;
}
ClearSavedParameters();
- ApplyString(flimflam::kAddressProperty, &props->address);
- ApplyString(flimflam::kGatewayProperty, &props->gateway);
- ApplyInt(flimflam::kMtuProperty, &props->mtu);
- ApplyStrings(flimflam::kNameServersProperty, &props->dns_servers);
- ApplyString(flimflam::kPeerAddressProperty, &props->peer_address);
- ApplyInt(flimflam::kPrefixlenProperty, &props->subnet_prefix);
+ ApplyString(kAddressProperty, &props->address);
+ ApplyString(kGatewayProperty, &props->gateway);
+ ApplyInt(kMtuProperty, &props->mtu);
+ ApplyStrings(kNameServersProperty, &props->dns_servers);
+ ApplyString(kPeerAddressProperty, &props->peer_address);
+ ApplyInt(kPrefixlenProperty, &props->subnet_prefix);
}
void StaticIPParameters::ClearSavedParameters() {
@@ -209,8 +209,8 @@
}
bool StaticIPParameters::ContainsAddress() const {
- return args_.ContainsString(flimflam::kAddressProperty) &&
- args_.ContainsInt(flimflam::kPrefixlenProperty);
+ return args_.ContainsString(kAddressProperty) &&
+ args_.ContainsInt(kPrefixlenProperty);
}
void StaticIPParameters::ClearMappedProperty(