Changeset 667 for trunk

Timestamp:

Jul 7, 2008, 10:40:33 PM (16 years ago)

Author:

price

Message:

web: support sx-blade-2 for VNC applet

Currently hardcodes host->port mapping.
Put in database?

Location:

trunk/packages/sipb-xen-www/code

Files:

• main.py (modified) (2 diffs)
• templates/vnc.tmpl (modified) (1 diff)

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

@@ -256 +256 @@
     token = cPickle.dumps(token)
     token = base64.urlsafe_b64encode(token)
+    if controls.listHost(machine) == 'sx-blade-2.mit.edu':
+        port = 10004
+    else:
+        port = 10003
 
     status = controls.statusInfo(machine)
@@ -265 +269 @@
              machine=machine,
              hostname=state.environ.get('SERVER_NAME', 'localhost'),
+             port=port,
              authtoken=token)
     return templates.vnc(searchList=[d])

trunk/packages/sipb-xen-www/code/templates/vnc.tmpl

@@ -17 +17 @@
         WIDTH="100%" HEIGHT="1000">
 <PARAM NAME="PASSWORD" VALUE="moocow">
-<PARAM NAME="PORT" VALUE="10003">
+<PARAM NAME="PORT" VALUE="$port">
 <PARAM NAME="HOST" VALUE="$hostname">
 <PARAM NAME="VMNAME" VALUE="$machine.name">