commit b1ade0a2d46bc22cbc109c706a165ba26c46d105
author Christopher Wiley <wiley@chromium.org> Mon Sep 16 13:09:55 2013 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Sep 20 19:44:20 2013 +0000
tree 2feecb2e91032268f7f60e2d3b6516aea01deee8
parent 9a84123a76582c977047031c1d69c2772d94985f

autotest: Expose subnet prefix in site_linux_router

This lets tests check that the IP address they have been assigned
looks like it belongs in the correct IP range.

BUG=chromium:294856
TEST=check11b still passes

Change-Id: Ifbb22a7ecb2c89c6641694238c42d0f9fd334a86
Reviewed-on: https://chromium-review.googlesource.com/170004
Tested-by: Christopher Wiley <wiley@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Commit-Queue: Christopher Wiley <wiley@chromium.org>

server/site_linux_router.py

diff --git a/server/site_linux_router.py b/server/site_linux_router.py
index 6be10ec..19b0fa0 100644
--- a/server/site_linux_router.py
+++ b/server/site_linux_router.py
@@ -39,6 +39,7 @@
     STARTUP_POLLING_INTERVAL_SECONDS = 0.5
     STARTUP_TIMEOUT_SECONDS = 10
     SUFFIX_LETTERS = string.ascii_lowercase + string.digits
+    SUBNET_PREFIX_OCTETS = (192, 168)
 
     def get_capabilities(self):
         """@return iterable object of AP capabilities for this system."""
@@ -573,12 +574,12 @@
         """Get the local server address for an interface.
 
         When we multiple local servers, we give them static IP addresses
-        like 192.158.*.254.
+        like 192.168.*.254.
 
         @param index int describing which local server this is for.
 
         """
-        return '%d.%d.%d.%d' % (192, 168, index, 254)
+        return '%d.%d.%d.%d' % (self.SUBNET_PREFIX_OCTETS + (index, 254))
 
 
     def start_local_server(self, interface):