Changeset 2432 for package_branches/invirt-web/cherrypy/code

Timestamp:

Aug 11, 2009, 12:54:08 AM (15 years ago)

Author:

quentin

Message:

Add terminal page

Location:

package_branches/invirt-web/cherrypy/code

Files:

• main.py (modified) (2 diffs)
• static/ajaxterm/ajaxterm.css (modified) (1 diff)
• templates/info.mako (modified) (1 diff)
• templates/skeleton.mako (modified) (1 diff)
• templates/terminal.mako (added)

package_branches/invirt-web/cherrypy/code/main.py

@@ -47 +47 @@
 
 from view import View
+import ajaxterm
 
 class InvirtWeb(View):
@@ -278 +279 @@
             else:
                 raise InvalidInput('back', back, 'Not a known back page.')
+
+        atmulti = ajaxterm.Multiplex()
+        atsessions = {}
+
+        @cherrypy.expose
+        @cherrypy.tools.mako(filename="/terminal.mako")
+        def terminal(self, machine_id):
+            machine = validation.Validate(cherrypy.request.login, cherrypy.request.state, machine_id=machine_id).machine
+
+            status = controls.statusInfo(machine)
+            has_vnc = hasVnc(status)
+
+            d = dict(on=status,
+                     has_vnc=has_vnc,
+                     machine=machine,
+                     hostname=cherrypy.request.local.name)
+            return d
 
     machine = MachineView()

package_branches/invirt-web/cherrypy/code/static/ajaxterm/ajaxterm.css

@@ -59 +59 @@
 pre.term span.b7  { background-color: #bbb; }
 
-body { background-color: #888; }
 #term {
         float: left;

package_branches/invirt-web/cherrypy/code/templates/info.mako

@@ -18 +18 @@
 % if on:
  % if not machine.type.hvm:
-  Console access: type
+  Console access: <a href="machine/${machine.machine_id}/terminal">Web Terminal</a> or type
   <tt>ssh ${machine.name}@${config.console.hostname}</tt>
   on Athena. <a href="https://xvm.scripts.mit.edu/wiki/SerialConsole">(more info)</a>
  % elif has_vnc:
-  <strong><a href="machine/${machine.machine_id}/vnc">Get Console</a></strong>
+  <strong><a href="machine/${machine.machine_id}/vnc">Get Console</a> or <a href="machine/${machine.machine_id}/terminal">Web Terminal</a></strong>
  % else:
   VNC console not enabled; still booting?

package_branches/invirt-web/cherrypy/code/templates/skeleton.mako

@@ -58 +58 @@
 <li><a href="machine/${machine.machine_id}">Info</a></li>
 <li><a href="machine/${machine.machine_id}/vnc">Console</a></li>
+<li><a href="machine/${machine.machine_id}/terminal">Terminal</a></li>
 % endif
 <li><a href="help">Help</a></li>