Changeset 770 for trunk

Timestamp:

Jul 28, 2008, 8:25:01 AM (16 years ago)

Author:

geofft

Message:

sipb-xen-www: Use invirt.config to pick the VNC proxy port.

File:

• trunk/packages/sipb-xen-www/code/main.py (modified) (4 diffs)

trunk/packages/sipb-xen-www/code/main.py

@@ -7 +7 @@
 import datetime
 import hmac
+import random
 import sha
 import simplejson
@@ -12 +13 @@
 import time
 import urllib
-import random
 from StringIO import StringIO
 
@@ -42 +42 @@
 import controls
 from getafsgroups import getAfsGroupMembers
+import invirt.config
+invirt_config = invirt.config.load()
 
 def pathSplit(path):
@@ -256 +258 @@
     token = cPickle.dumps(token)
     token = base64.urlsafe_b64encode(token)
-    if controls.listHost(machine) == 'sx-blade-2.mit.edu':
-        port = 10004
-    else:
-        port = 10003
+    port = 10003 + [config_host["hostname"] for config_host in invirt_config["hosts"]
+        ].index(controls.listHost(machine))
 
     status = controls.statusInfo(machine)