chrome/browser/policy/test/policy_testserver.py - Issue 1266563002: Added affiliation IDs for the new affiliation determination.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/policy/test/policy_testserver.py

Issue 1266563002: Added affiliation IDs for the new affiliation determination. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('K') | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.cc ('k') | chrome/chrome_browser_chromeos.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/test/policy_testserver.py

diff --git a/chrome/browser/policy/test/policy_testserver.py b/chrome/browser/policy/test/policy_testserver.py

index 09f3c4c62d00e99405ccd20573f47f5efd235b33..68e6580b70dcf3ebe4e9b1caa11cd648d829964c 100644

--- a/chrome/browser/policy/test/policy_testserver.py

+++ b/chrome/browser/policy/test/policy_testserver.py

@@ -812,6 +812,18 @@ class PolicyRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):

# username from the configuration file or use a default.

policy_data.username = policy.get('policy_user', 'user@example.com')

policy_data.device_id = token_info['device_id']

+ # Set affiliation IDs so that user was managed on the device.

+ device_affiliation_ids = policy.get('device_affiliation_ids')

+ if device_affiliation_ids:

+ for aff_id in device_affiliation_ids:

+ policy_data.device_affiliation_ids.append(aff_id)

Mattias Nissler (ping if slow) 2015/07/29 20:08:13 Doesn't this work? policy_data.device_affiliation

peletskyi 2015/07/30 11:02:27 Done.

+ user_affiliation_ids = policy.get('user_affiliation_ids')

+ if user_affiliation_ids:

+ for aff_id in user_affiliation_ids:

Mattias Nissler (ping if slow) 2015/07/29 20:08:13 ditto

peletskyi 2015/07/30 11:02:27 Done.

+ policy_data.user_affiliation_ids.append(aff_id)

signed_data = policy_data.SerializeToString()

response.policy_data = signed_data