commit cdae79e1c6045288d4e1db7902140b5e00755ed4
author Tien Chang <tienchang@google.com> Mon Feb 01 16:04:04 2016 -0800
committer chrome-bot <chrome-bot@chromium.org> Tue Feb 02 23:48:14 2016 -0800
tree 7ca25ad21882d7f055fb34f1c5989eed48c2b8fc
parent c70916bc4e69e230d266c642bdebcba789330a6a

chaos: Prepare for AC routers by stepping up MODE_AC.

BUG=None
TEST=None

Change-Id: I103ec23573394d2d874a4a6451a384f8fa5f8fa3
Reviewed-on: https://chromium-review.googlesource.com/325016
Commit-Ready: Tien Chang <tienchang@chromium.org>
Tested-by: Tien Chang <tienchang@chromium.org>
Reviewed-by: Kris Rambish <krisr@chromium.org>

server/cros/ap_configurators/ap_configurator_config.py

diff --git a/server/cros/ap_configurators/ap_configurator_config.py b/server/cros/ap_configurators/ap_configurator_config.py
index eceed03..9b092d4 100644
--- a/server/cros/ap_configurators/ap_configurator_config.py
+++ b/server/cros/ap_configurators/ap_configurator_config.py
@@ -14,10 +14,10 @@
     MODE_B = 0x00010
     MODE_G = 0x00100
     MODE_N = 0x01000
-    MODE_AUTO = 0x10000
+    MODE_AC = 0x10000
+    MODE_AUTO = 0x100000
     MODE_M = 0x0111  # Used for standard maintenance
     MODE_D = 0x1011  # International roaming extensions
-
     SECURITY_TYPE_DISABLED = 'disabled'
     SECURITY_TYPE_WEP = 'wep'
     SECURITY_TYPE_WPAPSK = 'wpa-psk'
@@ -29,7 +29,8 @@
     VALID_BANDS = [BAND_2GHZ, BAND_5GHZ]
 
     # List of valid modes.
-    VALID_MODES = [MODE_A, MODE_AUTO, MODE_B, MODE_D, MODE_G, MODE_M, MODE_N]
+    VALID_MODES = [MODE_A, MODE_AC, MODE_AUTO, MODE_B, MODE_D, MODE_G, MODE_M,
+                   MODE_N]
 
 
     # List of valid securities.

server/cros/ap_configurators/ap_spec.py

diff --git a/server/cros/ap_configurators/ap_spec.py b/server/cros/ap_configurators/ap_spec.py
index 41f6912..9d81681 100644
--- a/server/cros/ap_configurators/ap_spec.py
+++ b/server/cros/ap_configurators/ap_spec.py
@@ -17,14 +17,16 @@
 MODE_B = 0x02
 MODE_G = 0x04
 MODE_N = 0x08
-MODE_AUTO = 0x10
+MODE_AC = 0x10
+MODE_AUTO = 0x20
 MODE_M = MODE_A | MODE_B | MODE_G # Used for standard maintenance
 MODE_D = MODE_A | MODE_B | MODE_N # International roaming extensions
 
 # List of valid modes.
-VALID_MODES = [MODE_A, MODE_AUTO, MODE_B, MODE_D, MODE_G, MODE_M, MODE_N]
+VALID_MODES = [MODE_A, MODE_AC, MODE_AUTO, MODE_B, MODE_D, MODE_G, MODE_M,
+               MODE_N]
 VALID_2GHZ_MODES = [MODE_B, MODE_G, MODE_N]
-VALID_5GHZ_MODES = [MODE_A, MODE_N]
+VALID_5GHZ_MODES = [MODE_A, MODE_AC, MODE_N]
 
 # Supported security types
 SECURITY_TYPE_DISABLED = iw_runner.SECURITY_OPEN
@@ -96,7 +98,8 @@
     @param mode: integer, the mode to convert.
     @returns: string representation of the mode
     """
-    string_table = {MODE_A:'a', MODE_B:'b', MODE_G:'g', MODE_N:'n'}
+    string_table = {MODE_A:'a', MODE_AC:'ac', MODE_B:'b', MODE_G:'g',
+                    MODE_N:'n'}
 
     if mode == MODE_AUTO:
         return 'Auto'