commit 26f5acb7e0ddca5732a93eac3ba3a7e9fb74b42d
author Scott Cunningham <scunningham@chromium.org> Thu Jul 07 16:08:52 2016 -0700
committer chrome-bot <chrome-bot@chromium.org> Sat Jul 09 03:52:19 2016 -0700
tree b01ebabf023d8fc441c861eb40623112195cbf3a
parent 8786a07adf9b4bc2474600852a4258ad4209c4bc

Update DMS URLs for staging: crosman-qa and crosman-alpha.

The DM Server URLs in stagaing were recently updated as follows:
- crosman-qa.sandbox.google.com replaces cros-dev.sandbox.google.com
- crosman-alpha.sandbox.google.com replaces cros-auto.sandbox.google.com

This CL updates enterprise_policy_base.py to use these new URLs. Also,
updates the 'env=' (environment) flag values to use 'cr-qa' and
'cr-alpha' (instead of cros-dev and cros-auto, respectively).

BUG=chromium:626483
TEST=Run test_that <IP> policy_EditBookmarksEnabled --args='case=True_Enabled'

Change-Id: Ic3e3b68fe3a77fead6974457357a953829557243
Reviewed-on: https://chromium-review.googlesource.com/358942
Commit-Ready: Scott Cunningham <scunningham@chromium.org>
Tested-by: Scott Cunningham <scunningham@chromium.org>
Reviewed-by: Scott Cunningham <scunningham@chromium.org>

client/cros/enterprise_policy_base.py

diff --git a/client/cros/enterprise_policy_base.py b/client/cros/enterprise_policy_base.py
index bd124e6..e76e7bd 100644
--- a/client/cros/enterprise_policy_base.py
+++ b/client/cros/enterprise_policy_base.py
@@ -13,7 +13,7 @@
 from autotest_lib.client.cros import enterprise_base
 from autotest_lib.client.cros import httpd
 
-CROSDEV_FLAGS = [
+CROSQA_FLAGS = [
     '--gaia-url=https://gaiastaging.corp.google.com',
     '--lso-url=https://gaiastaging.corp.google.com',
     '--google-apis-url=https://www-googleapis-test.sandbox.google.com',
@@ -22,7 +22,7 @@
     ('--cloud-print-url='
      'https://cloudprint-nightly-ps.sandbox.google.com/cloudprint'),
     '--ignore-urlfetcher-cert-requests']
-CROSAUTO_FLAGS = [
+CROSALPHA_FLAGS = [
     ('--cloud-print-url='
      'https://cloudprint-nightly-ps.sandbox.google.com/cloudprint'),
     '--ignore-urlfetcher-cert-requests']
@@ -31,15 +31,15 @@
     '--disable-policy-key-verification']
 FLAGS_DICT = {
     'prod': [],
-    'cr-dev': CROSDEV_FLAGS,
-    'cr-auto': CROSAUTO_FLAGS,
+    'cr-qa': CROSQA_FLAGS,
+    'cr-alpha': CROSALPHA_FLAGS,
     'dm-test': TESTDMS_FLAGS,
     'dm-fake': TESTDMS_FLAGS
 }
 DMS_URL_DICT = {
     'prod': 'http://m.google.com/devicemanagement/data/api',
-    'cr-dev': 'https://cros-dev.sandbox.google.com/devicemanagement/data/api',
-    'cr-auto': 'https://cros-auto.sandbox.google.com/devicemanagement/data/api',
+    'cr-qa': 'https://crosman-qa.sandbox.google.com/devicemanagement/data/api',
+    'cr-alpha': 'https://crosman-alpha.sandbox.google.com/devicemanagement/data/api',
     'dm-test': 'http://chromium-dm-test.appspot.com/d/%s',
     'dm-fake': 'http://127.0.0.1:%d/'
 }