commit | bb833563aff5a55777e206d0b640c7cbff5f7417 | [log] [tgz] |
---|---|---|
author | Paul Stewart <pstew@chromium.org> | Wed Jan 21 23:30:46 2015 -0800 |
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | Thu Jan 22 21:14:51 2015 +0000 |
tree | b8c1259cbd4018002ec6c13dd6574538175f5eb4 | |
parent | 07dfabcb55d74e254f4722926a997959dc4c6393 [diff] |
shill: Service: Accept variant dict in Configure Service::Configure is called indirectly through the Service D-Bus adaptor "SetProperties" method as well as the Manager D-Bus adaptor "ConfigureService" methods. They both use ArgsToKeyValueStore to convert D-Bus string/variant dicts into a KeyValueStore object. In order for the StaticIPConfig property to be configured using either of these methods, we must allow an element of the KeyValueValueStore (the properties bundle) to contain another KeyValueStore (Static IP properties). This CL adds a "key_value_store_properties_" to KeyValueStore. It allows DBusAdaptor to unbundle such a data member, and enables this to be used in Service::Configure and Service::DoPropertiesMatch(). BUG=chromium:450833 TEST=Unit tests Change-Id: I7bd698fc685f56902fea3c3c8a2bbdf324e2b5ce Reviewed-on: https://chromium-review.googlesource.com/242491 Reviewed-by: Paul Stewart <pstew@chromium.org> Commit-Queue: Paul Stewart <pstew@chromium.org> Tested-by: Paul Stewart <pstew@chromium.org> Reviewed-by: Steven Bennetts <stevenjb@chromium.org>