Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Issue 540333002: ONC: Fix Static-/Saved-/IPConfig. (Closed)

Created:
6 years, 3 months ago by pneubeck (no reviews)
Modified:
6 years, 3 months ago
Reviewers:
stevenjb
CC:
chromium-reviews, stevenjb+watch_chromium.org, oshima+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Project:
chromium
Visibility:
Public.

Description

ONC: Fix Static-/Saved-/IPConfig. Before commit 41ec57e48ebd467c7a3b169a5598fb8038f54232, IPConfigs was the field in ONC meant for configuring ip configuration of a network. This was changed to: - IPConfigs is the set of currently active ip configurations (it can be more than one if IPv4 and IPv6 are coexisting in parallel) reported by ChromeOS - StaticIPConfig (note that it's a single configuration, not multiple as before) is the writable field that the user or policy can set - SavedIPConfig is the configuration received via DHCP and reported by ChromeOS. This change updates the different ONC functions to these new field definitions. Effectively this also allows setting the IPConfig of a network through ONC import, the networkingPrivate API, and through policy (there's no server support though). BUG=410877 Committed: https://crrev.com/faf50c40335fd2055c8beed69c0f630bd442d880 Cr-Commit-Position: refs/heads/master@{#293915}

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : Rebased. #

Total comments: 2

Patch Set 4 : Rebased. #

Patch Set 5 : Fixed another unit test. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+221 lines, -87 lines) Patch
M chromeos/network/onc/onc_merger_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M chromeos/network/onc/onc_normalizer.cc View 1 chunk +1 line, -1 line 0 comments Download
M chromeos/network/onc/onc_signature.cc View 1 2 3 4 chunks +2 lines, -6 lines 0 comments Download
M chromeos/network/onc/onc_translator_onc_to_shill.cc View 1 5 chunks +30 lines, -0 lines 0 comments Download
M chromeos/network/onc/onc_translator_shill_to_onc.cc View 1 2 3 1 chunk +6 lines, -0 lines 0 comments Download
M chromeos/network/onc/onc_validator.cc View 1 chunk +17 lines, -14 lines 0 comments Download
M chromeos/network/onc/onc_validator_unittest.cc View 1 2 chunks +5 lines, -1 line 0 comments Download
M chromeos/test/data/network/augmented_merge.json View 1 1 chunk +51 lines, -17 lines 0 comments Download
M chromeos/test/data/network/device_policy.onc View 1 chunk +4 lines, -4 lines 0 comments Download
M chromeos/test/data/network/ethernet.onc View 1 1 chunk +10 lines, -0 lines 0 comments Download
M chromeos/test/data/network/invalid_settings_with_repairs.json View 1 3 chunks +23 lines, -10 lines 0 comments Download
M chromeos/test/data/network/managed_toplevel1.onc View 1 chunk +10 lines, -5 lines 0 comments Download
M chromeos/test/data/network/managed_vpn.onc View 1 chunk +5 lines, -5 lines 0 comments Download
M chromeos/test/data/network/managed_vpn_without_recommended.onc View 1 chunk +5 lines, -5 lines 0 comments Download
M chromeos/test/data/network/repaired_toplevel_partially_invalid.onc View 1 2 3 4 1 chunk +5 lines, -5 lines 0 comments Download
M chromeos/test/data/network/shill_ethernet.json View 1 1 chunk +4 lines, -0 lines 0 comments Download
M chromeos/test/data/network/toplevel_partially_invalid.onc View 1 2 3 4 1 chunk +5 lines, -5 lines 0 comments Download
M chromeos/test/data/network/translation_of_shill_ethernet.onc View 1 1 chunk +10 lines, -0 lines 0 comments Download
M chromeos/test/data/network/translation_of_shill_ethernet_with_ipconfig.onc View 2 chunks +2 lines, -0 lines 0 comments Download
M chromeos/test/data/network/user.onc View 1 chunk +5 lines, -7 lines 0 comments Download
M chromeos/test/data/network/vpn_active_settings.onc View 1 1 chunk +20 lines, -1 line 0 comments Download

Messages

Total messages: 33 (10 generated)
pneubeck (no reviews)
6 years, 3 months ago (2014-09-05 13:29:42 UTC) #2
pneubeck (no reviews)
@Paul, is it safe to assume that the service properties StaticIPConfig* and SavedIPConfig* have always ...
6 years, 3 months ago (2014-09-05 13:34:02 UTC) #3
pneubeck (no reviews)
On 2014/09/05 13:34:02, pneubeck wrote: > @Paul, > > is it safe to assume that ...
6 years, 3 months ago (2014-09-05 13:37:46 UTC) #4
stevenjb
Thanks a ton for doing this, there are several details that I missed when I ...
6 years, 3 months ago (2014-09-05 15:44:39 UTC) #5
pneubeck (no reviews)
On 2014/09/05 15:44:39, stevenjb wrote: > Thanks a ton for doing this, there are several ...
6 years, 3 months ago (2014-09-05 16:07:05 UTC) #6
pneubeck (no reviews)
On 2014/09/05 15:44:39, stevenjb wrote: > Thanks a ton for doing this, there are several ...
6 years, 3 months ago (2014-09-05 16:07:07 UTC) #7
Paul Stewart
On 2014/09/05 13:34:02, pneubeck wrote: > @Paul, > > is it safe to assume that ...
6 years, 3 months ago (2014-09-05 18:19:27 UTC) #8
stevenjb
So, I just noticed that the Managed format is different for IPConfigs vs Saved/StaticIPConfig: "IPConfigs": ...
6 years, 3 months ago (2014-09-05 19:55:23 UTC) #9
pneubeck (no reviews)
On 2014/09/05 19:55:23, stevenjb wrote: > So, I just noticed that the Managed format is ...
6 years, 3 months ago (2014-09-08 08:23:37 UTC) #10
pneubeck (no reviews)
sorry, didn't upload my latest local changes. ptal at the opposite translation onc -> shill ...
6 years, 3 months ago (2014-09-08 08:28:17 UTC) #11
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pneubeck@chromium.org/540333002/20001
6 years, 3 months ago (2014-09-08 08:29:32 UTC) #13
commit-bot: I haz the power
Try jobs failed on following builders: chromium_presubmit on tryserver.chromium.linux (http://build.chromium.org/p/tryserver.chromium.linux/builders/chromium_presubmit/builds/9312) ios_rel_device_ninja on tryserver.chromium.mac (http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ninja/builds/8608) win_chromium_rel_swarming ...
6 years, 3 months ago (2014-09-08 08:34:21 UTC) #15
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pneubeck@chromium.org/540333002/40001
6 years, 3 months ago (2014-09-08 08:47:17 UTC) #17
commit-bot: I haz the power
Try jobs failed on following builders: ios_rel_device_ninja on tryserver.chromium.mac (http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_rel_device_ninja/builds/8611) mac_chromium_rel_swarming on tryserver.chromium.mac (http://build.chromium.org/p/tryserver.chromium.mac/builders/mac_chromium_rel_swarming/builds/11119)
6 years, 3 months ago (2014-09-08 08:54:16 UTC) #19
stevenjb
Still lgtm https://codereview.chromium.org/540333002/diff/40001/chromeos/network/onc/onc_translator_onc_to_shill.cc File chromeos/network/onc/onc_translator_onc_to_shill.cc (right): https://codereview.chromium.org/540333002/diff/40001/chromeos/network/onc/onc_translator_onc_to_shill.cc#newcode40 chromeos/network/onc/onc_translator_onc_to_shill.cc:40: } nit: Since this isn't someplace where ...
6 years, 3 months ago (2014-09-08 17:23:14 UTC) #20
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pneubeck@chromium.org/540333002/40001
6 years, 3 months ago (2014-09-08 22:05:59 UTC) #22
commit-bot: I haz the power
Try jobs failed on following builders: linux_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/linux_gpu/builds/64087) mac_gpu on tryserver.chromium.gpu (http://build.chromium.org/p/tryserver.chromium.gpu/builders/mac_gpu/builds/53062) win_gpu ...
6 years, 3 months ago (2014-09-08 22:33:27 UTC) #24
pneubeck (no reviews)
https://codereview.chromium.org/540333002/diff/40001/chromeos/network/onc/onc_translator_onc_to_shill.cc File chromeos/network/onc/onc_translator_onc_to_shill.cc (right): https://codereview.chromium.org/540333002/diff/40001/chromeos/network/onc/onc_translator_onc_to_shill.cc#newcode40 chromeos/network/onc/onc_translator_onc_to_shill.cc:40: } On 2014/09/08 17:23:14, stevenjb wrote: > nit: Since ...
6 years, 3 months ago (2014-09-09 07:36:04 UTC) #26
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pneubeck@chromium.org/540333002/60001
6 years, 3 months ago (2014-09-09 07:37:18 UTC) #27
commit-bot: I haz the power
Try jobs failed on following builders: linux_chromium_chromeos_rel_swarming on tryserver.chromium.linux (http://build.chromium.org/p/tryserver.chromium.linux/builders/linux_chromium_chromeos_rel_swarming/builds/12201)
6 years, 3 months ago (2014-09-09 08:51:58 UTC) #29
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/pneubeck@chromium.org/540333002/80001
6 years, 3 months ago (2014-09-09 09:50:10 UTC) #31
commit-bot: I haz the power
Committed patchset #5 (id:80001) as dd2c7d520f2bb61970dea94e6357883d3ea4201c
6 years, 3 months ago (2014-09-09 10:47:05 UTC) #32
commit-bot: I haz the power
6 years, 3 months ago (2014-09-10 03:52:38 UTC) #33
Message was sent while issue was closed.
Patchset 5 (id:??) landed as
https://crrev.com/faf50c40335fd2055c8beed69c0f630bd442d880
Cr-Commit-Position: refs/heads/master@{#293915}

Powered by Google App Engine
This is Rietveld 408576698