Changeset 21383 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jul 8, 2009 9:44:58 AM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

49743

Message:

Frontends/vboxshell: enhance "info" command to list attached hard disks too. also whitespace cleanup

File:

• trunk/src/VBox/Frontends/VBoxShell/vboxshell.py (modified) (9 diffs)

trunk/src/VBox/Frontends/VBoxShell/vboxshell.py

@@ -104 +104 @@
     def onExtraDataCanChange(self, id, key, value):
         print "onExtraDataCanChange: %s %s=>%s" %(id, key, value)
-        return True, ""
+        return True, ""
 
     def onExtraDataChange(self, id, key, value):
@@ -236 +236 @@
     progress = vb.openRemoteSession(session, uuid, type, "")
     progress.waitForCompletion(-1)
-    rc = long(progress.resultCode)
-    #print "Completed:", progress.completed, "rc:",hex(rc&0xffffffff)
+    completed = progress.completed
+    rc = int(progress.resultCode)
+    print "Completed:", completed, "rc:",hex(rc&0xffffffff)
     if rc == 0:
         # we ignore exceptions to allow starting VM even if
@@ -256 +257 @@
             print session.QueryErrorObject(rc)
 
-def getArray(ctx, obj, field):
-    return ctx['global'].getArray(obj, field)
-
 def getMachines(ctx):
-    return getArray(ctx, ctx['vb'], 'machines')
-
-def getArray(ctx, obj, field):
-    return ctx['global'].getArray(obj, field)
+    return ctx['global'].getArray(ctx['vb'], 'machines')
 
 def asState(var):
@@ -336 +331 @@
         return
     console=session.console    
-    ops={'pause' :     lambda: console.pause(),
-         'resume':     lambda: console.resume(),
-         'powerdown':  lambda: console.powerDown().waitForCompletion(-1),
-         'powerbutton':  lambda: console.powerButton(),
-         'stats':      lambda: guestStats(ctx, mach),
-         'guest':      lambda: guestExec(ctx, mach, console, args),
-         'monitorGuest': lambda: monitorGuest(ctx, mach, console, args),
-         'save' :     lambda: console.saveState().waitForCompletion(-1)
+    ops={'pause':           lambda: console.pause(),
+         'resume':          lambda: console.resume(),
+         'powerdown':       lambda: console.powerDown(),
+         'powerbutton':     lambda: console.powerButton(),
+         'stats':           lambda: guestStats(ctx, mach),
+         'guest':           lambda: guestExec(ctx, mach, console, args),
+         'monitorGuest':    lambda: monitorGuest(ctx, mach, console, args),
+         'save':            lambda: console.saveState().waitForCompletion(-1)
          }
     try:
@@ -409 +404 @@
     os = ctx['vb'].getGuestOSType(mach.OSTypeId)
     print " One can use setvar <mach> <var> <value> to change variable, using name in []."
-    print "  Name [name]: ",mach.name
-    print "  ID [n/a]: ",mach.id
-    print "  OS Type [n/a]: ",os.description
-    print "  CPUs [CPUCount]:  %d" %(mach.CPUCount)
-    print "  RAM [memorySize]:  %dM" %(mach.memorySize)
-    print "  VRAM [VRAMSize]:  %dM" %(mach.VRAMSize)
-    print "  Monitors [monitorCount]:  %d" %(mach.monitorCount)
-    print "  Clipboard mode [clipboardMode]:  %d" %(mach.clipboardMode)
-    print "  Machine status [n/a]: " ,mach.sessionState
-    # getArray(ctx, mach, 'hardDiskAttachments')
+    print "  Name [name]: " + mach.name
+    print "  ID [n/a]: " + mach.id
+    print "  OS Type [n/a]: " + os.description
+    print "  CPUs [CPUCount]: %d" %(mach.CPUCount)
+    print "  RAM [memorySize]: %dM" %(mach.memorySize)
+    print "  VRAM [VRAMSize]: %dM" %(mach.VRAMSize)
+    print "  Monitors [monitorCount]: %d" %(mach.monitorCount)
+    print "  Clipboard mode [clipboardMode]: %d" %(mach.clipboardMode)
+    print "  Machine status [n/a]: %d" % (mach.sessionState)
     bios = mach.BIOSSettings
     print "  ACPI [BIOSSettings.ACPIEnabled]: %s" %(asState(bios.ACPIEnabled))
     print "  APIC [BIOSSettings.IOAPICEnabled]: %s" %(asState(bios.IOAPICEnabled))
     print "  PAE [PAEEnabled]: %s" %(asState(mach.PAEEnabled))
-    print "  Hardware virtualization [HWVirtExEnabled]: ",asState(mach.HWVirtExEnabled)
-    print "  VPID support [HWVirtExVPIDEnabled]: ",asState(mach.HWVirtExVPIDEnabled)
-    print "  Hardware 3d acceleration[accelerate3DEnabled]: ",asState(mach.accelerate3DEnabled)
-    print "  Nested paging [HWVirtExNestedPagingEnabled]: ",asState(mach.HWVirtExNestedPagingEnabled)
-    print "  Last changed [n/a]: ",time.asctime(time.localtime(mach.lastStateChange/1000))
-
+    print "  Hardware virtualization [HWVirtExEnabled]: " + asState(mach.HWVirtExEnabled)
+    print "  VPID support [HWVirtExVPIDEnabled]: " + asState(mach.HWVirtExVPIDEnabled)
+    print "  Hardware 3d acceleration[accelerate3DEnabled]: " + asState(mach.accelerate3DEnabled)
+    print "  Nested paging [HWVirtExNestedPagingEnabled]: " + asState(mach.HWVirtExNestedPagingEnabled)
+    print "  Last changed [n/a]: " + time.asctime(time.localtime(mach.lastStateChange/1000))
+
+    disks = ctx['global'].getArray(mach, 'hardDiskAttachments')
+    if disks:
+        print
+    for disk in disks:
+        print "  Controller: %s port: %d device: %d:" % (disk.controller, disk.port, disk.device)
+        hd = disk.hardDisk
+        print "    id: " + hd.id
+        print "    location: " +  hd.location
+        print "    name: " +  hd.name
+        print "    format: " +  hd.format
     return 0
 
@@ -681 +685 @@
 
 def runScriptCmd(ctx, args):
-    import time
-    if (len(args) < 2 or len (args) > 4):
-        print "usage: runScript <script> <times> <pause>"
-        return 0
-
-    if len (args) >= 3:
-        times = int(args[2])
-        if g_verbose:
-            print "repeating %d times" %(times)
-    else:
-        times = 1
-
-    if len (args) >= 4:
-        pause = int(args[3])
-    else:
-        pause = 0
-    
+    if (len(args) != 2):
+        print "usage: runScript <script>"
+        return 0
     try:
         lf = open(args[1], 'r')
@@ -704 +694 @@
         return 0
 
-    script = []
     try:
         for line in lf:
-            script.append(line)
-
-        for i in range(times):
-            for line in script:
-                done = runCommand(ctx, line)
-                if done != 0: break
-            if g_verbose:
-                print "%d done" %(i)
-            if i != times - 1 and pause != 0:
-                time.sleep(pause)
+            done = runCommand(ctx, line)
+            if done != 0: break
     except Exception,e:
         print "error:",e
@@ -724 +705 @@
     return 0
 
-
-def runShellCmd(ctx, args):
-    if len (args) < 2:
-        print "usage: shell <command>"
-    expr = ' '.join(args[1:])
-    try:
-        os.system(expr)
-    except Exception,e:
-        print "error:",e
-        if g_verbose:
-                traceback.print_exc()
-    return 0
 
 aliases = {'s':'start',
@@ -769 +738 @@
             'showLog':['Show log file of the VM, : showLog Win32', showLogCmd, 0],
             'reloadExt':['Reload custom extensions: reloadExt', reloadExtCmd, 0],
-            'runScript':['Run VBox script: runScript script.vbox <times>', runScriptCmd, 0],
-            'shell':['Execute system shell command: shell ls -l', runShellCmd, 0],
+            'runScript':['Run VBox script: runScript script.vbox', runScriptCmd, 0],
             }