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

svn path=/trunk/packages/sipb-xen-www/; revision=770

diff --git a/code/main.py b/code/main.py
index f13fe0c..4627c66 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -6,12 +6,12 @@ import cPickle
 import cgi
 import datetime
 import hmac
 import cgi
 import datetime
 import hmac

+import random

 import sha
 import simplejson
 import sys
 import time
 import urllib
 import sha
 import simplejson
 import sys
 import time
 import urllib

-import random

 from StringIO import StringIO
 
 def revertStandardError():
 from StringIO import StringIO
 
 def revertStandardError():

@@ -41,6 +41,8 @@ import cache_acls
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers
 from webcommon import InvalidInput, CodeError, State
 import controls
 from getafsgroups import getAfsGroupMembers

+import invirt.config
+invirt_config = invirt.config.load()

 
 def pathSplit(path):
     if path.startswith('/'):
 
 def pathSplit(path):
     if path.startswith('/'):

@@ -255,10 +257,8 @@ def vnc(username, state, path, fields):
     token = {'data': pickled_data, 'digest': m.digest()}
     token = cPickle.dumps(token)
     token = base64.urlsafe_b64encode(token)
     token = {'data': pickled_data, 'digest': m.digest()}
     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)
     has_vnc = hasVnc(status)
 
     status = controls.statusInfo(machine)
     has_vnc = hasVnc(status)