Create a transparent proxy for test programs to use, with the

image_to_live.sh

Index: image_to_live.sh
diff --git a/image_to_live.sh b/image_to_live.sh
index f18badf667639f9ab3aa4ca1fee0cee7d53fff7a..92d5c2538629c93a5125919e02297d087028890c 100755
--- a/image_to_live.sh
+++ b/image_to_live.sh
@@ -38,6 +38,8 @@ DEFINE_string image "" \
   "Update with this image path that is in this source checkout." i
 DEFINE_string payload "" \
   "Update with this update payload, ignoring specified images."
+DEFINE_string proxy_port "" \
+  "Have the client request from this porxy instead of devserver."

[sosa, 2010/12/07 03:44:36]

porxies are delicious

[dgarrett, 2010/12/07 04:08:51]

Done.

 DEFINE_string src_image "" \
   "Create a delta update by passing in the image on the remote machine."
 DEFINE_boolean update_stateful ${FLAGS_TRUE} \
@@ -139,6 +141,11 @@ function start_dev_server {
         --payload $(reinterpret_path_for_chroot ${FLAGS_payload})"
   fi
 
+  if [ -n "${FLAGS_proxy_port}" ]; then
+    devserver_flags="${devserver_flags} \
+        --proxy_port ${FLAGS_proxy_port}"
+  fi
+
   [ ${FLAGS_for_vm} -eq ${FLAGS_TRUE} ] && \
       devserver_flags="${devserver_flags} --for_vm"
 
@@ -209,9 +216,15 @@ function get_update_args {
 
 function get_devserver_url {
   local devserver_url=""
+  local port=${FLAGS_devserver_port}
+  
+  if [[ -n ${FLAGS_proxy_port} ]]; then

[sosa, 2010/12/07 03:44:36]

no need for double []

[dgarrett, 2010/12/07 04:08:51]

I had weird behavior in testing that was fixed by using the doubles, but I
couldn't figure out why. I agree that it shouldn't be needed.

+    port=${FLAGS_proxy_port}
+  fi
+  
   if [ ${FLAGS_ignore_hostname} -eq ${FLAGS_TRUE} ]; then
     if [ -z ${FLAGS_update_url} ]; then
-      devserver_url="http://$(get_hostname):${FLAGS_devserver_port}/update"
+      devserver_url="http://$(get_hostname):${port}/update"
     else
       devserver_url="${FLAGS_update_url}"
     fi