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

Timestamp:

May 23, 2017 5:48:32 PM (8 years ago)

Author:

vboxsync

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

115695

Message:

Main/glue/vboxapi.py: clean up, remove vbox attribute, eliminate unnecessary parameter of getSessionObject (it is a completely ignored parameter with a default parameter to make life a little simpler for API clients in Python to deal with the previous version still)
Frontends/VBoxShell: adapt to the cleanup, reduce the unnecessary variations in the code dealing with sessions
ValidationKit etc.: adapt to the cleanup

File:

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

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

@@ -267 +267 @@
     vbox = ctx['vb']
     perf = ctx['perf']
-    session = ctx['global'].getSessionObject(vbox)
+    session = ctx['global'].getSessionObject()
     progress = mach.launchVMProcess(session, vmtype, "")
     if progressBar(ctx, progress, 100) and int(progress.resultCode) == 0:
@@ -700 +700 @@
     try:
         vbox = ctx['vb']
-        session = ctx['global'].getSessionObject(vbox)
-        mach.lockMachine(session, ctx['global'].constants.LockType_Shared)
+        session = ctx['global'].openMachineSession(mach, fPermitSharing=True)
     except Exception as e:
         printErr(ctx, "Session to '%s' not open: %s" % (mach.name, str(e)))
@@ -747 +746 @@
 
 def cmdClosedVm(ctx, mach, cmd, args=[], save=True):
-    session = ctx['global'].openMachineSession(mach, True)
+    session = ctx['global'].openMachineSession(mach, fPermitSharing=True)
     mach = session.machine
     try:
@@ -767 +766 @@
 
 def cmdAnyVm(ctx, mach, cmd, args=[], save=False):
-    session = ctx['global'].openMachineSession(mach)
+    session = ctx['global'].openMachineSession(mach, fPermitSharing=True)
     mach = session.machine
     try:
@@ -1670 +1669 @@
     guestPort = int(args[4])
     proto = "TCP"
-    session = ctx['global'].openMachineSession(mach)
+    session = ctx['global'].openMachineSession(mach, fPermitSharing=True)
     mach = session.machine
 
@@ -1879 +1878 @@
 
     ctx['wsinfo'] = [url, user, passwd]
-    vbox = ctx['global'].platform.connect(url, user, passwd)
-    ctx['vb'] = vbox
+    ctx['vb'] = ctx['global'].platform.connect(url, user, passwd)
     try:
-        print("Running VirtualBox version %s" % (vbox.version))
+        print("Running VirtualBox version %s" % (ctx['vb'].version))
     except Exception as e:
         printErr(ctx, e)
@@ -1926 +1924 @@
         if g_fVerbose:
             traceback.print_exc()
+    ctx['perf'] = ctx['global'].getPerfCollector(ctx['vb'])
     return 0
 
@@ -2906 +2905 @@
     if len(cmdargs) > 1:
         rosession = 0
-        session = ctx['global'].openMachineSession(mach, False)
+        session = ctx['global'].openMachineSession(mach, fPermitSharing=False)
         mach = session.machine
 
@@ -3084 +3083 @@
     func = args[3]
     session = None
-    session = ctx['global'].openMachineSession(vm)
+    session = ctx['global'].openMachineSession(vm, fPermitSharing=True)
     vm = session.machine
     adapter = vm.getNetworkAdapter(nicnum)
@@ -3540 +3539 @@
         asLocations = [ os.getcwd(), ]
         try:    sScriptDir = os.path.dirname(os.path.abspath(__file__))
-        except: pass; # In case __file__ isn't there.
+        except: pass # In case __file__ isn't there.
         else:
             if platform.system() in [ 'SunOS', ]:
@@ -3584 +3583 @@
     ctx = {
         'global':       oVBoxMgr,
-        'vb':           oVBoxMgr.vbox,
+        'vb':           oVBoxMgr.getVirtualBox(),
         'const':        oVBoxMgr.constants,
         'remote':       oVBoxMgr.remote,
@@ -3605 +3604 @@
     #
     for sKey in list(ctx.keys()):
-        del ctx[sKey];
-    ctx = None;
-    gc.collect();
+        del ctx[sKey]
+    ctx = None
+    gc.collect()
 
     oVBoxMgr.deinit()