commit a6b2cd48b7bae328ccb511806273719064fa6942
author Timothy Jennison <tjennison@google.com> Mon Mar 14 08:38:57 2016 -0400
committer chrome-bot <chrome-bot@chromium.org> Wed Mar 30 08:18:49 2016 -0700
tree dc913f9510335661b8216803eff973ed9613f735
parent 452060bb03235f1241f5822f326f2abbc936e656

shill: expand dbus constants for DHCPv6

This allows multiple DHCPv6 addresses/prefixes and preferred lease times to be
exposed over DBus from shill.  This information is necessary to correctly assign
IPv6 addresses in some cases.

BUG=b:26778228
TEST=shill unit test

Change-Id: I179dc5fd02699f07598e6c7603f45d5d9ebdde52
Reviewed-on: https://chromium-review.googlesource.com/333963
Commit-Ready: Timothy Jennison <tjennison@google.com>
Tested-by: Timothy Jennison <tjennison@google.com>
Reviewed-by: Paul Stewart <pstew@chromium.org>

dbus/shill/dbus-constants.h

diff --git a/dbus/shill/dbus-constants.h b/dbus/shill/dbus-constants.h
index 6d18e22..f672e16 100644
--- a/dbus/shill/dbus-constants.h
+++ b/dbus/shill/dbus-constants.h
@@ -402,9 +402,21 @@
 const char kDomainNameProperty[] = "DomainName";
 const char kAcceptedHostnameProperty[] = "AcceptedHostname";
 const char kNameServersProperty[] = "NameServers";
+const char kDhcpv6AddressesProperty[] = "Dhcpv6Addresses";
+const char kDhcpv6DelegatedPrefixesProperty[] = "Dhcpv6DelegatedPrefixes";
+const char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
+
+// These constants are deprecated in favor of kDhcpv6DelegatedPrefixesProperty.
+// TODO(tjennison): Remove when shill no longer uses them b/26778228
 const char kDelegatedPrefixProperty[] = "DelegatedPrefix";
 const char kDelegatedPrefixLengthProperty[] = "DelegatedPrefixLength";
-const char kLeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
+
+// IPConfig DHCPv6 address/prefix property names.
+const char kDhcpv6AddressProperty[] = "Address";
+const char kDhcpv6LengthProperty[] = "Length";
+const char kDhcpv6LeaseDurationSecondsProperty[] = "LeaseDurationSeconds";
+const char kDhcpv6PreferredLeaseDurationSecondsProperty[] =
+    "PreferredLeaseDurationSeconds";
 
 // IPConfig type options.
 const char kTypeIPv4[] = "ipv4";